Commit cb21fdc9f67aea1aaf317942a868d5ba91604d1b

Authored by Cleverson Sacramento
1 parent 765af464
Exists in master

Refatoração no ConfigurationLoader para considerar atributos do

tipo Class e refatoração do seletor de estratégia utilizando esta nova
funcionalidade do ConfigurationLoader
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java
... ... @@ -64,6 +64,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
64 64 import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
65 65 import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
66 66 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
  67 +import br.gov.frameworkdemoiselle.util.Beans;
67 68 import br.gov.frameworkdemoiselle.util.Reflections;
68 69 import br.gov.frameworkdemoiselle.util.ResourceBundle;
69 70 import br.gov.frameworkdemoiselle.util.Strings;
... ... @@ -91,8 +92,9 @@ public class ConfigurationLoader implements Serializable {
91 92 */
92 93 public void load(Object object) throws ConfigurationException {
93 94 Class<?> config = object.getClass();
94   -
95   - if (!CoreBootstrap.isAnnotatedType(config)) {
  95 + CoreBootstrap bootstrap = Beans.getReference(CoreBootstrap.class);
  96 +
  97 + if (!bootstrap.isAnnotatedType(config)) {
96 98 config = config.getSuperclass();
97 99 getLogger().debug(getBundle().getString("proxy-detected", config, config.getClass().getSuperclass()));
98 100 }
... ... @@ -209,24 +211,24 @@ public class ConfigurationLoader implements Serializable {
209 211 * @return a configuration
210 212 */
211 213 private org.apache.commons.configuration.Configuration getConfiguration(String resource, ConfigType type) {
212   - org.apache.commons.configuration.Configuration config = null;
  214 + org.apache.commons.configuration.Configuration result = null;
213 215  
214 216 try {
215 217 URL url;
216 218  
217 219 switch (type) {
218 220 case SYSTEM:
219   - config = new SystemConfiguration();
  221 + result = new SystemConfiguration();
220 222 break;
221 223  
222 224 case PROPERTIES:
223 225 url = getResourceAsURL(resource + ".properties");
224   - config = new DataConfiguration(new PropertiesConfiguration(url));
  226 + result = new DataConfiguration(new PropertiesConfiguration(url));
225 227 break;
226 228  
227 229 case XML:
228 230 url = getResourceAsURL(resource + ".xml");
229   - config = new DataConfiguration(new XMLConfiguration(url));
  231 + result = new DataConfiguration(new XMLConfiguration(url));
230 232 break;
231 233  
232 234 default:
... ... @@ -239,7 +241,7 @@ public class ConfigurationLoader implements Serializable {
239 241 resource), cause);
240 242 }
241 243  
242   - return config;
  244 + return result;
243 245 }
244 246  
245 247 @SuppressWarnings("unchecked")
... ... @@ -250,9 +252,13 @@ public class ConfigurationLoader implements Serializable {
250 252  
251 253 if (fieldClass.isArray()) {
252 254 value = getArray(key, field, config);
  255 +
253 256 } else if (fieldClass.equals(Properties.class)) {
254 257 value = getProperty(key, config);
255 258  
  259 + } else if (fieldClass.equals(Class.class)) {
  260 + value = getClass(key, field, config);
  261 +
256 262 } else {
257 263 value = getBasic(key, field, config);
258 264 }
... ... @@ -267,7 +273,6 @@ public class ConfigurationLoader implements Serializable {
267 273  
268 274 try {
269 275 Method method;
270   -
271 276 String methodName = "get";
272 277  
273 278 methodName += Strings.firstToUpper(fieldClass.getSimpleName());
... ... @@ -293,11 +298,9 @@ public class ConfigurationLoader implements Serializable {
293 298  
294 299 try {
295 300 Method method;
296   -
297 301 String methodName = "get";
298 302  
299 303 methodName += discoveryGenericType(field);
300   -
301 304 methodName += Strings.firstToUpper(fieldClass.getSimpleName());
302 305  
303 306 if (!fieldClass.isPrimitive()) {
... ... @@ -317,6 +320,25 @@ public class ConfigurationLoader implements Serializable {
317 320 return value;
318 321 }
319 322  
  323 + private <T> Object getClass(String key, Field field, org.apache.commons.configuration.Configuration config) {
  324 + Object value = null;
  325 +
  326 + try {
  327 + String canonicalName = config.getString(key);
  328 +
  329 + if (canonicalName != null) {
  330 + ClassLoader classLoader = getClassLoaderForClass(canonicalName);
  331 + value = Class.forName(canonicalName, true, classLoader);
  332 + }
  333 +
  334 + } catch (Exception cause) {
  335 + // TODO Lançar a mensagem correta
  336 + throw new ConfigurationException(null, cause);
  337 + }
  338 +
  339 + return value;
  340 + }
  341 +
320 342 /**
321 343 * Discovery the Generic's type. for example: the generic's type of List<Integer> list is an Integer type
322 344 *
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java
... ... @@ -38,8 +38,11 @@ package br.gov.frameworkdemoiselle.internal.configuration;
38 38  
39 39 import java.io.Serializable;
40 40  
41   -import br.gov.frameworkdemoiselle.annotation.Name;
42 41 import br.gov.frameworkdemoiselle.configuration.Configuration;
  42 +import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator;
  43 +import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthorizer;
  44 +import br.gov.frameworkdemoiselle.security.Authenticator;
  45 +import br.gov.frameworkdemoiselle.security.Authorizer;
43 46  
44 47 /**
45 48 * A <code>SecurityConfig</code> object is responsible for specifying which security configurations should be used for a
... ... @@ -52,9 +55,12 @@ public class SecurityConfig implements Serializable {
52 55  
53 56 private static final long serialVersionUID = 1L;
54 57  
55   - @Name("enabled")
56 58 private boolean enabled = true;
57 59  
  60 + private Class<? extends Authenticator> authenticatorClass = DefaultAuthenticator.class;
  61 +
  62 + private Class<? extends Authorizer> authorizerClass = DefaultAuthorizer.class;
  63 +
58 64 /**
59 65 * Tells whether or not the security is enabled for the current application. This value could be defined in the
60 66 * <b>demoiselle.properties</b> file, using the key <i>frameworkdemoiselle.security.enabled</i>.
... ... @@ -65,4 +71,12 @@ public class SecurityConfig implements Serializable {
65 71 public boolean isEnabled() {
66 72 return enabled;
67 73 }
  74 +
  75 + public Class<? extends Authenticator> getAuthenticatorClass() {
  76 + return authenticatorClass;
  77 + }
  78 +
  79 + public Class<? extends Authorizer> getAuthorizerClass() {
  80 + return authorizerClass;
  81 + }
68 82 }
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/TransactionConfig.java 0 → 100644
... ... @@ -0,0 +1,55 @@
  1 +/*
  2 + * Demoiselle Framework
  3 + * Copyright (C) 2010 SERPRO
  4 + * ----------------------------------------------------------------------------
  5 + * This file is part of Demoiselle Framework.
  6 + *
  7 + * Demoiselle Framework is free software; you can redistribute it and/or
  8 + * modify it under the terms of the GNU Lesser General Public License version 3
  9 + * as published by the Free Software Foundation.
  10 + *
  11 + * This program is distributed in the hope that it will be useful,
  12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 + * GNU General Public License for more details.
  15 + *
  16 + * You should have received a copy of the GNU Lesser General Public License version 3
  17 + * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 + * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 + * Fifth Floor, Boston, MA 02110-1301, USA.
  20 + * ----------------------------------------------------------------------------
  21 + * Este arquivo é parte do Framework Demoiselle.
  22 + *
  23 + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 + * do Software Livre (FSF).
  26 + *
  27 + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 + * para maiores detalhes.
  31 + *
  32 + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 + * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 + * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 + */
  37 +package br.gov.frameworkdemoiselle.internal.configuration;
  38 +
  39 +import java.io.Serializable;
  40 +
  41 +import br.gov.frameworkdemoiselle.configuration.Configuration;
  42 +import br.gov.frameworkdemoiselle.internal.implementation.DefaultTransaction;
  43 +import br.gov.frameworkdemoiselle.transaction.Transaction;
  44 +
  45 +@Configuration(prefix = "frameworkdemoiselle.transaction")
  46 +public class TransactionConfig implements Serializable {
  47 +
  48 + private static final long serialVersionUID = 1L;
  49 +
  50 + private Class<? extends Transaction> transactionClass = DefaultTransaction.class;
  51 +
  52 + public Class<? extends Transaction> getTransactionClass() {
  53 + return transactionClass;
  54 + }
  55 +}
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java
... ... @@ -67,25 +67,27 @@ public class SecurityContextImpl implements SecurityContext {
67 67 private Authorizer authorizer;
68 68  
69 69 private Authenticator getAuthenticator() {
70   - if (authenticator == null) {
  70 + if (this.authenticator == null) {
71 71 AuthenticatorBootstrap bootstrap = Beans.getReference(AuthenticatorBootstrap.class);
  72 + Class<? extends Authenticator> clazz = getConfig().getAuthenticatorClass();
  73 + clazz = StrategySelector.getClass(clazz, bootstrap.getCache());
72 74  
73   - authenticator = StrategySelector.getReference("frameworkdemoiselle.security.authenticator.class",
74   - Authenticator.class, DefaultAuthenticator.class, bootstrap.getCache());
  75 + this.authenticator = Beans.getReference(clazz);
75 76 }
76 77  
77   - return authenticator;
  78 + return this.authenticator;
78 79 }
79 80  
80 81 private Authorizer getAuthorizer() {
81   - if (authorizer == null) {
  82 + if (this.authorizer == null) {
82 83 AuthorizerBootstrap bootstrap = Beans.getReference(AuthorizerBootstrap.class);
  84 + Class<? extends Authorizer> clazz = getConfig().getAuthorizerClass();
  85 + clazz = StrategySelector.getClass(clazz, bootstrap.getCache());
83 86  
84   - authorizer = StrategySelector.getReference("frameworkdemoiselle.security.authorizer.class",
85   - Authorizer.class, DefaultAuthorizer.class, bootstrap.getCache());
  87 + this.authorizer = Beans.getReference(clazz);
86 88 }
87 89  
88   - return authorizer;
  90 + return this.authorizer;
89 91 }
90 92  
91 93 /**
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java
... ... @@ -38,22 +38,10 @@ package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39 39 import static br.gov.frameworkdemoiselle.annotation.Priority.MIN_PRIORITY;
40 40  
41   -import java.io.FileNotFoundException;
42 41 import java.io.Serializable;
43   -import java.net.URL;
44 42 import java.util.List;
45   -import java.util.Locale;
46   -
47   -import org.apache.commons.configuration.Configuration;
48   -import org.apache.commons.configuration.PropertiesConfiguration;
49 43  
50 44 import br.gov.frameworkdemoiselle.annotation.Priority;
51   -import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
52   -import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
53   -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
54   -import br.gov.frameworkdemoiselle.util.Beans;
55   -import br.gov.frameworkdemoiselle.util.ResourceBundle;
56   -import br.gov.frameworkdemoiselle.util.Strings;
57 45  
58 46 public final class StrategySelector implements Serializable {
59 47  
... ... @@ -70,27 +58,48 @@ public final class StrategySelector implements Serializable {
70 58 private StrategySelector() {
71 59 }
72 60  
73   - public static <T> T getReference(String configKey, Class<T> strategyType, Class<? extends T> defaultType,
74   - List<Class<T>> options) {
75   - T result = getExplicitReference(configKey, strategyType, defaultType);
  61 + public static <T> Class<? extends T> getClass(Class<? extends T> configClass/* , Class<T> defaultClass */,
  62 + List<Class<? extends T>> optionalClasses) {
  63 + Class<? extends T> result = configClass;
76 64  
77   - if (result.getClass() == defaultType) {
78   - result = getPriorityReference(options);
  65 + if (configClass == getDefaultClass(optionalClasses)) {
  66 + result = getPriorityReference(optionalClasses);
79 67 }
80 68  
81 69 return result;
82 70 }
83 71  
84   - public static <T> T getPriorityReference(List<Class<T>> options) {
85   - Class<T> selected = null;
  72 + public static <T> Class<? extends T> getDefaultClass(List<Class<? extends T>> optionalClasses) {
  73 + Class<? extends T> result = null;
  74 +
  75 + for (Class<? extends T> optionalClass : optionalClasses) {
  76 + Priority priority = optionalClass.getAnnotation(Priority.class);
86 77  
87   - for (Class<T> option : options) {
  78 + if (priority != null && priority.value() == CORE_PRIORITY) {
  79 + result = optionalClass;
  80 + break;
  81 + }
  82 + }
  83 +
  84 + return result;
  85 + }
  86 +
  87 + /*
  88 + * public static <T> T getReference(String configKey, Class<T> strategyType, Class<T> defaultType, List<Class<T>>
  89 + * options) { T result = getExplicitReference(configKey, strategyType, defaultType); if (result.getClass() ==
  90 + * defaultType) { result = getPriorityReference(options); } return result; }
  91 + */
  92 +
  93 + public static <T> Class<? extends T> getPriorityReference(List<Class<? extends T>> options) {
  94 + Class<? extends T> selected = null;
  95 +
  96 + for (Class<? extends T> option : options) {
88 97 if (selected == null || getPriority(option) < getPriority(selected)) {
89 98 selected = option;
90 99 }
91 100 }
92 101  
93   - return Beans.getReference(selected);
  102 + return selected;
94 103 }
95 104  
96 105 private static <T> int getPriority(Class<T> type) {
... ... @@ -104,49 +113,28 @@ public final class StrategySelector implements Serializable {
104 113 return result;
105 114 }
106 115  
107   - public static <T> T getExplicitReference(String configKey, Class<T> strategyType, Class<? extends T> defaultType) {
108   - Class<T> selectedType = loadSelected(configKey, strategyType, defaultType);
109   - return Beans.getReference(selectedType);
110   - }
111   -
112   - @SuppressWarnings("unchecked")
113   - private static <T> Class<T> loadSelected(String configKey, Class<T> strategyType, Class<? extends T> defaultType) {
114   - ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle",
115   - Beans.getReference(Locale.class));
116   -
117   - Class<T> result = null;
118   - String canonicalName = null;
119   - String typeName = strategyType.getSimpleName().toLowerCase();
120   - String key = null;
121   -
122   - try {
123   - URL url = ConfigurationLoader.getResourceAsURL("demoiselle.properties");
124   - Configuration config = new PropertiesConfiguration(url);
125   - canonicalName = config.getString(configKey, defaultType.getCanonicalName());
126   -
127   - ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(canonicalName);
128   - if (classLoader == null) {
129   - classLoader = Thread.currentThread().getContextClassLoader();
130   - }
131   -
132   - result = (Class<T>) Class.forName(canonicalName, false, classLoader);
133   - result.asSubclass(strategyType);
134   -
135   - } catch (org.apache.commons.configuration.ConfigurationException cause) {
136   - throw new ConfigurationException(bundle.getString("file-not-found", "demoiselle.properties"));
137   -
138   - } catch (ClassNotFoundException cause) {
139   - key = Strings.getString("{0}-class-not-found", typeName);
140   - throw new ConfigurationException(bundle.getString(key, canonicalName));
141   -
142   - } catch (FileNotFoundException e) {
143   - throw new ConfigurationException(bundle.getString("file-not-found", "demoiselle.properties"));
144   -
145   - } catch (ClassCastException cause) {
146   - key = Strings.getString("{0}-class-must-be-of-type", typeName);
147   - throw new ConfigurationException(bundle.getString(key, canonicalName, strategyType));
148   - }
149   -
150   - return result;
151   - }
  116 + /*
  117 + * public static <T> T getExplicitReference(String configKey, Class<T> strategyType, Class<T> defaultType) {
  118 + * Class<T> selectedType = loadSelected(configKey, strategyType, defaultType); return
  119 + * Beans.getReference(selectedType); }
  120 + */
  121 +
  122 + /*
  123 + * @SuppressWarnings("unchecked") private static <T> Class<T> loadSelected(String configKey, Class<T> strategyType,
  124 + * Class<T> defaultType) { ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle",
  125 + * Beans.getReference(Locale.class)); Class<T> result = null; String canonicalName = null; String typeName =
  126 + * strategyType.getSimpleName().toLowerCase(); String key = null; try { URL url =
  127 + * ConfigurationLoader.getResourceAsURL("demoiselle.properties"); Configuration config = new
  128 + * PropertiesConfiguration(url); canonicalName = config.getString(configKey, defaultType.getCanonicalName());
  129 + * ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(canonicalName); if (classLoader == null) {
  130 + * classLoader = Thread.currentThread().getContextClassLoader(); } result = (Class<T>) Class.forName(canonicalName,
  131 + * false, classLoader); result.asSubclass(strategyType); } catch
  132 + * (org.apache.commons.configuration.ConfigurationException cause) { throw new
  133 + * ConfigurationException(bundle.getString("file-not-found", "demoiselle.properties")); } catch
  134 + * (ClassNotFoundException cause) { key = Strings.getString("{0}-class-not-found", typeName); throw new
  135 + * ConfigurationException(bundle.getString(key, canonicalName)); } catch (FileNotFoundException e) { throw new
  136 + * ConfigurationException(bundle.getString("file-not-found", "demoiselle.properties")); } catch (ClassCastException
  137 + * cause) { key = Strings.getString("{0}-class-must-be-of-type", typeName); throw new
  138 + * ConfigurationException(bundle.getString(key, canonicalName, strategyType)); } return result; }
  139 + */
152 140 }
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionContextImpl.java
... ... @@ -39,6 +39,7 @@ package br.gov.frameworkdemoiselle.internal.implementation;
39 39 import javax.inject.Named;
40 40  
41 41 import br.gov.frameworkdemoiselle.internal.bootstrap.TransactionBootstrap;
  42 +import br.gov.frameworkdemoiselle.internal.configuration.TransactionConfig;
42 43 import br.gov.frameworkdemoiselle.transaction.Transaction;
43 44 import br.gov.frameworkdemoiselle.transaction.TransactionContext;
44 45 import br.gov.frameworkdemoiselle.util.Beans;
... ... @@ -58,9 +59,10 @@ public class TransactionContextImpl implements TransactionContext {
58 59 private Transaction getTransaction() {
59 60 if (this.transaction == null) {
60 61 TransactionBootstrap bootstrap = Beans.getReference(TransactionBootstrap.class);
  62 + Class<? extends Transaction> clazz = getConfig().getTransactionClass();
  63 + clazz = StrategySelector.getClass(clazz, bootstrap.getCache());
61 64  
62   - this.transaction = StrategySelector.getReference("frameworkdemoiselle.transaction.class",
63   - Transaction.class, DefaultTransaction.class, bootstrap.getCache());
  65 + this.transaction = Beans.getReference(clazz);
64 66 }
65 67  
66 68 return this.transaction;
... ... @@ -70,4 +72,8 @@ public class TransactionContextImpl implements TransactionContext {
70 72 public Transaction getCurrentTransaction() {
71 73 return getTransaction();
72 74 }
  75 +
  76 + private TransactionConfig getConfig() {
  77 + return Beans.getReference(TransactionConfig.class);
  78 + }
73 79 }
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithArrayTest.java
... ... @@ -35,10 +35,11 @@
35 35 * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.configuration;
38   -import org.junit.Ignore;
  38 +
  39 +import static org.easymock.EasyMock.createMock;
39 40 import static org.easymock.EasyMock.expect;
40 41 import static org.junit.Assert.assertEquals;
41   -import static org.powermock.api.easymock.PowerMock.mockStatic;
  42 +import static org.powermock.api.easymock.PowerMock.replay;
42 43  
43 44 import java.awt.Color;
44 45 import java.math.BigDecimal;
... ... @@ -54,7 +55,6 @@ import org.junit.Before;
54 55 import org.junit.Test;
55 56 import org.junit.runner.RunWith;
56 57 import org.powermock.api.easymock.PowerMock;
57   -import org.powermock.core.classloader.annotations.PrepareForTest;
58 58 import org.powermock.modules.junit4.PowerMockRunner;
59 59 import org.powermock.reflect.Whitebox;
60 60 import org.slf4j.Logger;
... ... @@ -64,63 +64,88 @@ import br.gov.frameworkdemoiselle.configuration.Configuration;
64 64 import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
65 65 import br.gov.frameworkdemoiselle.util.ResourceBundle;
66 66  
67   -@Ignore
68 67 @RunWith(PowerMockRunner.class)
69   -@PrepareForTest(CoreBootstrap.class)
70 68 public class ConfigurationLoaderWithArrayTest {
71 69  
72 70 private ConfigurationLoader configurationLoader;
73 71  
74   - @Configuration(type = ConfigType.PROPERTIES , resource = "configuration-with-array")
  72 + @Configuration(type = ConfigType.PROPERTIES, resource = "configuration-with-array")
75 73 public class ConfigurationPropertiesWithArray {
76   -
  74 +
77 75 /*
78 76 * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
79 77 */
80   -
  78 +
81 79 protected BigDecimal[] bigDecimalArray;
  80 +
82 81 protected BigInteger[] bigIntegerArray;
  82 +
83 83 protected boolean[] booleanArray;
  84 +
84 85 protected byte[] byteArray;
  86 +
85 87 protected Calendar[] calendarArray;
  88 +
86 89 protected Color[] colorArray;
  90 +
87 91 protected Date[] dateArray;
  92 +
88 93 protected double[] doubleArray;
  94 +
89 95 protected float[] floatArray;
  96 +
90 97 protected int[] integerArray;
  98 +
91 99 protected Locale[] localeArray;
  100 +
92 101 protected long[] longArray;
  102 +
93 103 protected short[] shortArray;
  104 +
94 105 protected URL[] urlArray;
  106 +
95 107 protected String[] stringArray;
96   -
  108 +
97 109 }
98   -
  110 +
99 111 @Configuration(type = ConfigType.XML, resource = "configuration-with-array")
100 112 public class ConfigurationXMLWithArray {
101   -
  113 +
102 114 /*
103 115 * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
104 116 */
105   -
  117 +
106 118 protected BigDecimal[] bigDecimalArray;
  119 +
107 120 protected BigInteger[] bigIntegerArray;
  121 +
108 122 protected boolean[] booleanArray;
  123 +
109 124 protected byte[] byteArray;
  125 +
110 126 protected Calendar[] calendarArray;
  127 +
111 128 protected Color[] colorArray;
  129 +
112 130 protected Date[] dateArray;
  131 +
113 132 protected double[] doubleArray;
  133 +
114 134 protected float[] floatArray;
  135 +
115 136 protected int[] integerArray;
  137 +
116 138 protected Locale[] localeArray;
  139 +
117 140 protected long[] longArray;
  141 +
118 142 protected short[] shortArray;
  143 +
119 144 protected URL[] urlArray;
  145 +
120 146 protected String[] stringArray;
121   -
  147 +
122 148 }
123   -
124 149  
125 150 @Before
126 151 public void setUp() throws Exception {
... ... @@ -140,178 +165,176 @@ public class ConfigurationLoaderWithArrayTest {
140 165 @Test
141 166 public void testConfigurationPropertiesWithIntegerArray() {
142 167 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
143   -
  168 +
144 169 Integer integerValue = config.integerArray[0];
145   -
  170 +
146 171 assertEquals(Integer.class, integerValue.getClass());
147 172 assertEquals(Integer.MAX_VALUE, integerValue.intValue());
148 173 assertEquals(4, config.integerArray.length);
149 174 }
150   -
151   -
  175 +
152 176 @Test
153 177 public void testConfigurationPropertiesWithShortArray() {
154 178 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
155   -
  179 +
156 180 Short shortValue = config.shortArray[0];
157   -
  181 +
158 182 assertEquals(Short.class, shortValue.getClass());
159 183 assertEquals(Short.MAX_VALUE, shortValue.shortValue());
160 184 assertEquals(4, config.shortArray.length);
161 185 }
162   -
  186 +
163 187 @Test
164 188 public void testConfigurationPropertiesWithByteArray() {
165 189 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
166   -
  190 +
167 191 Byte byteValue = config.byteArray[0];
168   -
  192 +
169 193 assertEquals(Byte.class, byteValue.getClass());
170 194 assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
171 195 assertEquals(8, config.byteArray.length);
172 196 }
173   -
  197 +
174 198 @Test
175 199 public void testConfigurationPropertiesWithBooleanArray() {
176 200 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
177   -
  201 +
178 202 Boolean booleanValue = config.booleanArray[0];
179   -
  203 +
180 204 assertEquals(Boolean.class, booleanValue.getClass());
181 205 assertEquals(2, config.booleanArray.length);
182 206 }
183   -
  207 +
184 208 @Test
185 209 public void testConfigurationPropertiesWithLongArray() {
186 210 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
187   -
  211 +
188 212 Long longValue = config.longArray[0];
189   -
  213 +
190 214 assertEquals(Long.class, longValue.getClass());
191 215 assertEquals(Long.MAX_VALUE, longValue.longValue());
192 216 assertEquals(5, config.longArray.length);
193 217 }
194   -
  218 +
195 219 @Test
196 220 public void testConfigurationPropertiesWithFloatArray() {
197 221 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
198   -
  222 +
199 223 Float floatValue = config.floatArray[0];
200   -
  224 +
201 225 assertEquals(Float.class, floatValue.getClass());
202 226 assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
203 227 assertEquals(5, config.floatArray.length);
204 228 }
205   -
  229 +
206 230 @Test
207 231 public void testConfigurationPropertiesWithDoubleArray() {
208 232 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
209   -
  233 +
210 234 Double doubleValue = config.doubleArray[0];
211   -
  235 +
212 236 assertEquals(Double.class, doubleValue.getClass());
213 237 assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
214 238 assertEquals(3, config.doubleArray.length);
215 239 }
216   -
  240 +
217 241 @Test
218 242 public void testConfigurationPropertiesWithBigDecimalArray() {
219 243 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
220   -
  244 +
221 245 BigDecimal bigDecimalValue = config.bigDecimalArray[0];
222   -
  246 +
223 247 assertEquals(BigDecimal.class, bigDecimalValue.getClass());
224 248 assertEquals(3, config.bigDecimalArray.length);
225 249 }
226   -
  250 +
227 251 @Test
228 252 public void testConfigurationPropertiesWithBigIntegerArray() {
229 253 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
230   -
  254 +
231 255 BigInteger bigIntegerValue = config.bigIntegerArray[0];
232   -
  256 +
233 257 assertEquals(BigInteger.class, bigIntegerValue.getClass());
234 258 assertEquals(3, config.bigIntegerArray.length);
235 259 }
236   -
  260 +
237 261 @Test
238 262 public void testConfigurationPropertiesWithCalendarArray() {
239 263 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
240   -
  264 +
241 265 Calendar calendarValue = config.calendarArray[0];
242   -
  266 +
243 267 GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
244   -
  268 +
245 269 assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
246 270 assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
247 271 assertEquals(3, config.calendarArray.length);
248 272 }
249   -
  273 +
250 274 @Test
251 275 public void testConfigurationPropertiesWithDateArray() {
252 276 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
253   -
  277 +
254 278 Date dateValue = config.dateArray[0];
255   -
  279 +
256 280 GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
257   -
  281 +
258 282 Date date = new Date(calendar.getTimeInMillis());
259   -
  283 +
260 284 assertEquals(Date.class, dateValue.getClass());
261 285 assertEquals(date.getTime(), dateValue.getTime());
262 286 assertEquals(3, config.dateArray.length);
263 287 }
264   -
  288 +
265 289 @Test
266 290 public void testConfigurationPropertiesWithColorArray() {
267 291 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
268   -
  292 +
269 293 Color colorValue = config.colorArray[0];
270   -
  294 +
271 295 assertEquals(Color.class, colorValue.getClass());
272 296 assertEquals(Color.gray, colorValue);
273 297 assertEquals(3, config.colorArray.length);
274 298 }
275   -
  299 +
276 300 @Test
277 301 public void testConfigurationPropertiesWithLocaleArray() {
278 302 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
279   -
  303 +
280 304 Locale localeValue = config.localeArray[0];
281 305 Locale localeValue2 = config.localeArray[1];
282   -
  306 +
283 307 assertEquals(Locale.class, localeValue.getClass());
284 308 assertEquals(Locale.ENGLISH, localeValue);
285 309 assertEquals("BR", localeValue2.getCountry());
286 310 assertEquals(3, config.localeArray.length);
287 311 }
288   -
  312 +
289 313 @Test
290 314 public void testConfigurationPropertiesWithURLArray() {
291 315 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
292   -
  316 +
293 317 URL urlValue = config.urlArray[0];
294   -
  318 +
295 319 URL otherURL = null;
296   -
  320 +
297 321 try {
298 322 otherURL = new URL("http://www.test.com");
  323 + } catch (Exception e) {
  324 +
299 325 }
300   - catch(Exception e) {
301   -
302   - }
303   -
  326 +
304 327 assertEquals(URL.class, urlValue.getClass());
305 328 assertEquals(otherURL, urlValue);
306 329 assertEquals(3, config.urlArray.length);
307 330 }
308   -
  331 +
309 332 @Test
310 333 public void testConfigurationPropertiesWithStringArray() {
311 334 ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
312   -
  335 +
313 336 String stringValue = config.stringArray[0];
314   -
  337 +
315 338 assertEquals(String.class, stringValue.getClass());
316 339 assertEquals("Test", stringValue);
317 340 assertEquals(3, config.stringArray.length);
... ... @@ -320,189 +343,188 @@ public class ConfigurationLoaderWithArrayTest {
320 343 private ConfigurationPropertiesWithArray prepareConfigurationPropertiesWithArray() {
321 344 ConfigurationPropertiesWithArray config = new ConfigurationPropertiesWithArray();
322 345  
323   - mockStatic(CoreBootstrap.class);
324   - expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
325   - PowerMock.replay(CoreBootstrap.class);
  346 + CoreBootstrap coreBootstrap = createMock(CoreBootstrap.class);
  347 + expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
  348 +
  349 + replay(coreBootstrap);
326 350  
327 351 configurationLoader.load(config);
328 352 return config;
329 353 }
330   -
  354 +
331 355 @Test
332 356 public void testConfigurationXMLWithIntegerArray() {
333 357 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
334   -
  358 +
335 359 Integer integerValue = config.integerArray[0];
336   -
  360 +
337 361 assertEquals(Integer.class, integerValue.getClass());
338 362 assertEquals(Integer.MAX_VALUE, integerValue.intValue());
339 363 assertEquals(4, config.integerArray.length);
340 364 }
341   -
342   -
  365 +
343 366 @Test
344 367 public void testConfigurationXMLWithShortArray() {
345 368 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
346   -
  369 +
347 370 Short shortValue = config.shortArray[0];
348   -
  371 +
349 372 assertEquals(Short.class, shortValue.getClass());
350 373 assertEquals(Short.MAX_VALUE, shortValue.shortValue());
351 374 assertEquals(4, config.shortArray.length);
352 375 }
353   -
  376 +
354 377 @Test
355 378 public void testConfigurationXMLWithByteArray() {
356 379 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
357   -
  380 +
358 381 Byte byteValue = config.byteArray[0];
359   -
  382 +
360 383 assertEquals(Byte.class, byteValue.getClass());
361 384 assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
362 385 assertEquals(8, config.byteArray.length);
363 386 }
364   -
  387 +
365 388 @Test
366 389 public void testConfigurationXMLWithBooleanArray() {
367 390 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
368   -
  391 +
369 392 Boolean booleanValue = config.booleanArray[0];
370   -
  393 +
371 394 assertEquals(Boolean.class, booleanValue.getClass());
372 395 assertEquals(2, config.booleanArray.length);
373 396 }
374   -
  397 +
375 398 @Test
376 399 public void testConfigurationXMLWithLongArray() {
377 400 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
378   -
  401 +
379 402 Long longValue = config.longArray[0];
380   -
  403 +
381 404 assertEquals(Long.class, longValue.getClass());
382 405 assertEquals(Long.MAX_VALUE, longValue.longValue());
383 406 assertEquals(5, config.longArray.length);
384 407 }
385   -
  408 +
386 409 @Test
387 410 public void testConfigurationXMLWithFloatArray() {
388 411 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
389   -
  412 +
390 413 Float floatValue = config.floatArray[0];
391   -
  414 +
392 415 assertEquals(Float.class, floatValue.getClass());
393 416 assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
394 417 assertEquals(5, config.floatArray.length);
395 418 }
396   -
  419 +
397 420 @Test
398 421 public void testConfigurationXMLWithDoubleArray() {
399 422 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
400   -
  423 +
401 424 Double doubleValue = config.doubleArray[0];
402   -
  425 +
403 426 assertEquals(Double.class, doubleValue.getClass());
404 427 assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
405 428 assertEquals(3, config.doubleArray.length);
406 429 }
407   -
  430 +
408 431 @Test
409 432 public void testConfigurationXMLWithBigDecimalArray() {
410 433 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
411   -
  434 +
412 435 BigDecimal bigDecimalValue = config.bigDecimalArray[0];
413   -
  436 +
414 437 assertEquals(BigDecimal.class, bigDecimalValue.getClass());
415 438 assertEquals(3, config.bigDecimalArray.length);
416 439 }
417   -
  440 +
418 441 @Test
419 442 public void testConfigurationXMLWithBigIntegerArray() {
420 443 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
421   -
  444 +
422 445 BigInteger bigIntegerValue = config.bigIntegerArray[0];
423   -
  446 +
424 447 assertEquals(BigInteger.class, bigIntegerValue.getClass());
425 448 assertEquals(3, config.bigIntegerArray.length);
426 449 }
427   -
  450 +
428 451 @Test
429 452 public void testConfigurationXMLWithCalendarArray() {
430 453 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
431   -
  454 +
432 455 Calendar calendarValue = config.calendarArray[0];
433   -
  456 +
434 457 GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
435   -
  458 +
436 459 assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
437 460 assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
438 461 assertEquals(3, config.calendarArray.length);
439 462 }
440   -
  463 +
441 464 @Test
442 465 public void testConfigurationXMLWithDateArray() {
443 466 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
444   -
  467 +
445 468 Date dateValue = config.dateArray[0];
446   -
  469 +
447 470 GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
448   -
  471 +
449 472 Date date = new Date(calendar.getTimeInMillis());
450   -
  473 +
451 474 assertEquals(Date.class, dateValue.getClass());
452 475 assertEquals(date.getTime(), dateValue.getTime());
453 476 assertEquals(3, config.dateArray.length);
454 477 }
455   -
  478 +
456 479 @Test
457 480 public void testConfigurationXMLWithColorArray() {
458 481 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
459   -
  482 +
460 483 Color colorValue = config.colorArray[0];
461   -
  484 +
462 485 assertEquals(Color.class, colorValue.getClass());
463 486 assertEquals(Color.gray, colorValue);
464 487 assertEquals(3, config.colorArray.length);
465 488 }
466   -
  489 +
467 490 @Test
468 491 public void testConfigurationXMLWithLocaleArray() {
469 492 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
470   -
  493 +
471 494 Locale localeValue = config.localeArray[0];
472 495 Locale localeValue2 = config.localeArray[1];
473   -
  496 +
474 497 assertEquals(Locale.class, localeValue.getClass());
475 498 assertEquals(Locale.ENGLISH, localeValue);
476 499 assertEquals("BR", localeValue2.getCountry());
477 500 assertEquals(3, config.localeArray.length);
478 501 }
479   -
  502 +
480 503 @Test
481 504 public void testConfigurationXMLWithURLArray() {
482 505 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
483   -
  506 +
484 507 URL urlValue = config.urlArray[0];
485   -
  508 +
486 509 URL otherURL = null;
487   -
  510 +
488 511 try {
489 512 otherURL = new URL("http://www.test.com");
  513 + } catch (Exception e) {
  514 +
490 515 }
491   - catch(Exception e) {
492   -
493   - }
494   -
  516 +
495 517 assertEquals(URL.class, urlValue.getClass());
496 518 assertEquals(otherURL, urlValue);
497 519 assertEquals(3, config.urlArray.length);
498 520 }
499   -
  521 +
500 522 @Test
501 523 public void testConfigurationXMLWithStringArray() {
502 524 ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
503   -
  525 +
504 526 String stringValue = config.stringArray[0];
505   -
  527 +
506 528 assertEquals(String.class, stringValue.getClass());
507 529 assertEquals("Test", stringValue);
508 530 assertEquals(3, config.stringArray.length);
... ... @@ -511,9 +533,10 @@ public class ConfigurationLoaderWithArrayTest {
511 533 private ConfigurationXMLWithArray prepareConfigurationXMLWithArray() {
512 534 ConfigurationXMLWithArray config = new ConfigurationXMLWithArray();
513 535  
514   - mockStatic(CoreBootstrap.class);
515   - expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
516   - PowerMock.replay(CoreBootstrap.class);
  536 + CoreBootstrap coreBootstrap = createMock(CoreBootstrap.class);
  537 + expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
  538 +
  539 + replay(CoreBootstrap.class);
517 540  
518 541 configurationLoader.load(config);
519 542 return config;
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithListTest.java
... ... @@ -35,10 +35,11 @@
35 35 * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.configuration;
38   -import org.junit.Ignore;
  38 +
  39 +import static org.easymock.EasyMock.createMock;
39 40 import static org.easymock.EasyMock.expect;
40 41 import static org.junit.Assert.assertEquals;
41   -import static org.powermock.api.easymock.PowerMock.mockStatic;
  42 +import static org.powermock.api.easymock.PowerMock.replay;
42 43  
43 44 import java.awt.Color;
44 45 import java.math.BigDecimal;
... ... @@ -52,10 +53,10 @@ import java.util.Locale;
52 53  
53 54 import org.junit.After;
54 55 import org.junit.Before;
  56 +import org.junit.Ignore;
55 57 import org.junit.Test;
56 58 import org.junit.runner.RunWith;
57 59 import org.powermock.api.easymock.PowerMock;
58   -import org.powermock.core.classloader.annotations.PrepareForTest;
59 60 import org.powermock.modules.junit4.PowerMockRunner;
60 61 import org.powermock.reflect.Whitebox;
61 62 import org.slf4j.Logger;
... ... @@ -67,7 +68,6 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
67 68  
68 69 @Ignore
69 70 @RunWith(PowerMockRunner.class)
70   -@PrepareForTest(CoreBootstrap.class)
71 71 public class ConfigurationLoaderWithListTest {
72 72  
73 73 private ConfigurationLoader configurationLoader;
... ... @@ -344,9 +344,10 @@ public class ConfigurationLoaderWithListTest {
344 344 private ConfigurationPropertiesWithList prepareConfigurationPropertiesWithList() {
345 345 ConfigurationPropertiesWithList config = new ConfigurationPropertiesWithList();
346 346  
347   - mockStatic(CoreBootstrap.class);
348   - expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
349   - PowerMock.replay(CoreBootstrap.class);
  347 + CoreBootstrap coreBootstrap = createMock(CoreBootstrap.class);
  348 + expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
  349 +
  350 + replay(coreBootstrap);
350 351  
351 352 configurationLoader.load(config);
352 353 return config;
... ... @@ -533,9 +534,10 @@ public class ConfigurationLoaderWithListTest {
533 534 private ConfigurationXMLWithList prepareConfigurationXMLWithList() {
534 535 ConfigurationXMLWithList config = new ConfigurationXMLWithList();
535 536  
536   - mockStatic(CoreBootstrap.class);
537   - expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
538   - PowerMock.replay(CoreBootstrap.class);
  537 + CoreBootstrap coreBootstrap = createMock(CoreBootstrap.class);
  538 + expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
  539 +
  540 + replay(coreBootstrap);
539 541  
540 542 configurationLoader.load(config);
541 543 return config;
... ...
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfigTest.java
1   -/*
2   - * Demoiselle Framework
3   - * Copyright (C) 2010 SERPRO
4   - * ----------------------------------------------------------------------------
5   - * This file is part of Demoiselle Framework.
6   - *
7   - * Demoiselle Framework is free software; you can redistribute it and/or
8   - * modify it under the terms of the GNU Lesser General Public License version 3
9   - * as published by the Free Software Foundation.
10   - *
11   - * This program is distributed in the hope that it will be useful,
12   - * but WITHOUT ANY WARRANTY; without even the implied warranty of
13   - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14   - * GNU General Public License for more details.
15   - *
16   - * You should have received a copy of the GNU Lesser General Public License version 3
17   - * along with this program; if not, see <http://www.gnu.org/licenses/>
18   - * or write to the Free Software Foundation, Inc., 51 Franklin Street,
19   - * Fifth Floor, Boston, MA 02110-1301, USA.
20   - * ----------------------------------------------------------------------------
21   - * Este arquivo é parte do Framework Demoiselle.
22   - *
23   - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
24   - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
25   - * do Software Livre (FSF).
26   - *
27   - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
28   - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
29   - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
30   - * para maiores detalhes.
31   - *
32   - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
33   - * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
34   - * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35   - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36   - */
37   -package br.gov.frameworkdemoiselle.internal.configuration;
38   -import org.junit.Ignore;
39   -import static org.easymock.EasyMock.expect;
40   -import static org.junit.Assert.assertEquals;
41   -import static org.powermock.api.easymock.PowerMock.mockStatic;
42   -
43   -import java.util.Locale;
44   -
45   -import org.junit.After;
46   -import org.junit.Before;
47   -import org.junit.Test;
48   -import org.junit.runner.RunWith;
49   -import org.powermock.api.easymock.PowerMock;
50   -import org.powermock.core.classloader.annotations.PrepareForTest;
51   -import org.powermock.modules.junit4.PowerMockRunner;
52   -import org.powermock.reflect.Whitebox;
53   -import org.slf4j.Logger;
54   -
55   -import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
56   -import br.gov.frameworkdemoiselle.util.ResourceBundle;
57   -
58   -/**
59   - * @author e-saito
60   - */
61   -/**
62   - * @author 80342167553
63   - */
64   -@Ignore
65   -@RunWith(PowerMockRunner.class)
66   -@PrepareForTest(CoreBootstrap.class)
67   -public class EntityManagerConfigTest {
68   -
69   - private EntityManagerConfig config = new EntityManagerConfig();
70   -
71   - @Before
72   - public void setUp() throws Exception {
73   - Logger logger = PowerMock.createMock(Logger.class);
74   - ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
75   -
76   - ConfigurationLoader configurationLoader = new ConfigurationLoader();
77   -
78   - Whitebox.setInternalState(configurationLoader, "bundle", bundle);
79   - Whitebox.setInternalState(configurationLoader, "logger", logger);
80   -
81   - mockStatic(CoreBootstrap.class);
82   - expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
83   - PowerMock.replay(CoreBootstrap.class);
84   -
85   - configurationLoader.load(config);
86   - }
87   -
88   - @After
89   - public void tearDown() throws Exception {
90   - config = null;
91   - }
92   -
93   - /**
94   - * Test method for
95   - * {@link br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig#getPersistenceUnitName()}.
96   - */
97   - @Test
98   - public void testGetPersistenceUnitName() {
99   - assertEquals("PersistenceUnitName", config.getPersistenceUnitName());
100   - }
101   -}
  1 +///*
  2 +// * Demoiselle Framework
  3 +// * Copyright (C) 2010 SERPRO
  4 +// * ----------------------------------------------------------------------------
  5 +// * This file is part of Demoiselle Framework.
  6 +// *
  7 +// * Demoiselle Framework is free software; you can redistribute it and/or
  8 +// * modify it under the terms of the GNU Lesser General Public License version 3
  9 +// * as published by the Free Software Foundation.
  10 +// *
  11 +// * This program is distributed in the hope that it will be useful,
  12 +// * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 +// * GNU General Public License for more details.
  15 +// *
  16 +// * You should have received a copy of the GNU Lesser General Public License version 3
  17 +// * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 +// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 +// * Fifth Floor, Boston, MA 02110-1301, USA.
  20 +// * ----------------------------------------------------------------------------
  21 +// * Este arquivo é parte do Framework Demoiselle.
  22 +// *
  23 +// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 +// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 +// * do Software Livre (FSF).
  26 +// *
  27 +// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 +// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 +// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 +// * para maiores detalhes.
  31 +// *
  32 +// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 +// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 +// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 +// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 +// */
  37 +//package br.gov.frameworkdemoiselle.internal.configuration;
  38 +//import org.junit.Ignore;
  39 +//import static org.easymock.EasyMock.expect;
  40 +//import static org.junit.Assert.assertEquals;
  41 +//import static org.powermock.api.easymock.PowerMock.mockStatic;
  42 +//
  43 +//import java.util.Locale;
  44 +//
  45 +//import org.junit.After;
  46 +//import org.junit.Before;
  47 +//import org.junit.Test;
  48 +//import org.junit.runner.RunWith;
  49 +//import org.powermock.api.easymock.PowerMock;
  50 +//import org.powermock.core.classloader.annotations.PrepareForTest;
  51 +//import org.powermock.modules.junit4.PowerMockRunner;
  52 +//import org.powermock.reflect.Whitebox;
  53 +//import org.slf4j.Logger;
  54 +//
  55 +//import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
  56 +//import br.gov.frameworkdemoiselle.util.ResourceBundle;
  57 +//
  58 +///**
  59 +// * @author e-saito
  60 +// */
  61 +///**
  62 +// * @author 80342167553
  63 +// */
  64 +//@Ignore
  65 +//@RunWith(PowerMockRunner.class)
  66 +//@PrepareForTest(CoreBootstrap.class)
  67 +//public class EntityManagerConfigTest {
  68 +//
  69 +// private EntityManagerConfig config = new EntityManagerConfig();
  70 +//
  71 +// @Before
  72 +// public void setUp() throws Exception {
  73 +// Logger logger = PowerMock.createMock(Logger.class);
  74 +// ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
  75 +//
  76 +// ConfigurationLoader configurationLoader = new ConfigurationLoader();
  77 +//
  78 +// Whitebox.setInternalState(configurationLoader, "bundle", bundle);
  79 +// Whitebox.setInternalState(configurationLoader, "logger", logger);
  80 +//
  81 +// mockStatic(CoreBootstrap.class);
  82 +// expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
  83 +// PowerMock.replay(CoreBootstrap.class);
  84 +//
  85 +// configurationLoader.load(config);
  86 +// }
  87 +//
  88 +// @After
  89 +// public void tearDown() throws Exception {
  90 +// config = null;
  91 +// }
  92 +//
  93 +// /**
  94 +// * Test method for
  95 +// * {@link br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig#getPersistenceUnitName()}.
  96 +// */
  97 +// @Test
  98 +// public void testGetPersistenceUnitName() {
  99 +// assertEquals("PersistenceUnitName", config.getPersistenceUnitName());
  100 +// }
  101 +//}
... ...