diff --git a/archetype/jsf-jpa/pom.xml b/archetype/jsf-jpa/pom.xml index 84f9722..ef3b14d 100755 --- a/archetype/jsf-jpa/pom.xml +++ b/archetype/jsf-jpa/pom.xml @@ -49,7 +49,7 @@ ../../parent/archetype - JSF and JPA Archetype + Demoiselle Framework JSF and JPA Archetype Archetype for web applications (JSF/JPA) diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml b/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml index 077587f..75e46f3 100755 --- a/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml +++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml @@ -50,16 +50,4 @@ test - - - - demoiselle.sourceforge.net-release - http://demoiselle.sourceforge.net/repository/release - - - snapshot.sourceforge.net-release - http://demoiselle.sourceforge.net/repository/snapshot - - - - \ No newline at end of file + diff --git a/archetype/minimal/pom.xml b/archetype/minimal/pom.xml index 2ddd39d..aadddb0 100755 --- a/archetype/minimal/pom.xml +++ b/archetype/minimal/pom.xml @@ -49,7 +49,7 @@ ../../parent/archetype - Minimal Archetype + Demoiselle Framework Minimal Archetype Basic archetype for generic applications diff --git a/documentation/quickstart/pom.xml b/documentation/quickstart/pom.xml index 812cf54..1082b66 100755 --- a/documentation/quickstart/pom.xml +++ b/documentation/quickstart/pom.xml @@ -49,7 +49,7 @@ ../../../internal/parent/documentation - Quickstart Documentation + Demoiselle Framework Quickstart Documentation diff --git a/documentation/reference/pom.xml b/documentation/reference/pom.xml index 0b92e66..4b0582c 100755 --- a/documentation/reference/pom.xml +++ b/documentation/reference/pom.xml @@ -49,7 +49,7 @@ ../../../internal/parent/documentation - Reference Documentation + Demoiselle Framework Reference Documentation diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java index 2dccf89..8a00157 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java @@ -71,21 +71,21 @@ public class ConfigurationLoaderTest { private ConfigurationLoader configurationLoader; private CoreBootstrap coreBootstrap; - + @Configuration public class ConfigurationSuccessfulPropertiesWithClassField { - protected Class classe; + protected Class classe; } - + @Configuration public class ConfigurationSuccessfulPropertiesWithPropertiesField { protected Properties properties; } - + @Configuration public class ConfigurationSuccessfulProperties { @@ -300,7 +300,7 @@ public class ConfigurationLoaderTest { this.configurationLoader = new ConfigurationLoader(); mockStatic(Beans.class); this.coreBootstrap = PowerMock.createMock(CoreBootstrap.class); - + expect(Beans.getReference(CoreBootstrap.class)).andReturn(coreBootstrap); expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()); } @@ -313,28 +313,28 @@ public class ConfigurationLoaderTest { public void testConfigurationSuccessfulPropertiesWithClassField() { ConfigurationSuccessfulPropertiesWithClassField config = new ConfigurationSuccessfulPropertiesWithClassField(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); - assertEquals(ConfigurationLoaderTest.class,config.classe); + assertEquals(ConfigurationLoaderTest.class, config.classe); } - + @Test public void testConfigurationSuccessfulPropertiesWithPropertiesField() { ConfigurationSuccessfulPropertiesWithPropertiesField config = new ConfigurationSuccessfulPropertiesWithPropertiesField(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); - assertEquals("teste1",config.properties.getProperty("1")); - assertEquals("teste2",config.properties.getProperty("2")); + assertEquals("teste1", config.properties.getProperty("1")); + assertEquals("teste2", config.properties.getProperty("2")); assertTrue(config.properties.containsKey("1")); assertTrue(config.properties.containsKey("2")); } - + @Test public void testConfigurationSuccessfulPropertiesPossibleConventions() { ConfigurationSuccessfulProperties config = new ConfigurationSuccessfulProperties(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("ConfigurationTest", config.nameConfiguration); @@ -344,31 +344,31 @@ public class ConfigurationLoaderTest { public void testConfigurationSuccessfulPropertiesNoConventions() { ConfigurationSuccessfulProperties2 config = new ConfigurationSuccessfulProperties2(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("ConfigurationTest2", config.name); } -// @Test -// public void ConfigurationPropertiesWithAbsentFile() { -// ConfigurationPropertiesWithAbsentFile config = new ConfigurationPropertiesWithAbsentFile(); -// -// expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); -// PowerMock.replayAll(CoreBootstrap.class,Beans.class); -// -// try { -// configurationLoader.load(config); -// fail(); -// } catch (Exception e) { -// } -// } + // @Test + // public void ConfigurationPropertiesWithAbsentFile() { + // ConfigurationPropertiesWithAbsentFile config = new ConfigurationPropertiesWithAbsentFile(); + // + // expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); + // PowerMock.replayAll(CoreBootstrap.class,Beans.class); + // + // try { + // configurationLoader.load(config); + // fail(); + // } catch (Exception e) { + // } + // } @Test public void testConfigurationProcessorWithNameEmpty() { ConfigurationWithEmptyName config = new ConfigurationWithEmptyName(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); try { configurationLoader.load(config); @@ -382,7 +382,7 @@ public class ConfigurationLoaderTest { ConfigurationWithoutNameAnnotation config = new ConfigurationWithoutNameAnnotation(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("ConfigurationTest", config.nameConfiguration); @@ -393,8 +393,8 @@ public class ConfigurationLoaderTest { ConfigurationWithIgnoreAnnotation config = new ConfigurationWithIgnoreAnnotation(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertNull(config.nameConfiguration); } @@ -404,7 +404,7 @@ public class ConfigurationLoaderTest { ConfigurationWithPrefix config = new ConfigurationWithPrefix(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("ConfigurationTest", config.nameConfiguration); @@ -415,8 +415,8 @@ public class ConfigurationLoaderTest { ConfigurationWithKeyNotFoundInProperties config = new ConfigurationWithKeyNotFoundInProperties(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertNull(config.notExistKey); } @@ -426,7 +426,7 @@ public class ConfigurationLoaderTest { ConfigurationWithNotNullFieldButValueIsNull config = new ConfigurationWithNotNullFieldButValueIsNull(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); try { configurationLoader.load(config); @@ -441,7 +441,7 @@ public class ConfigurationLoaderTest { ConfigurationWithNotNullFieldAndValueIsNotNull config = new ConfigurationWithNotNullFieldAndValueIsNotNull(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("ConfigurationTest", config.nameConfiguration); @@ -452,8 +452,8 @@ public class ConfigurationLoaderTest { ConfigurationWithNonPrimitiveFieldValueNull config = new ConfigurationWithNonPrimitiveFieldValueNull(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertNull(config.nameConfiguration); } @@ -463,8 +463,8 @@ public class ConfigurationLoaderTest { ConfigurationWithPrimitiveFieldValueNull config = new ConfigurationWithPrimitiveFieldValueNull(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertEquals(1, config.nameConfiguration); } @@ -474,7 +474,7 @@ public class ConfigurationLoaderTest { ConfigurationWithKeyFromSystem config = new ConfigurationWithKeyFromSystem(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals(System.getProperty("os.name"), config.nameConfiguration); @@ -485,7 +485,7 @@ public class ConfigurationLoaderTest { ConfigurationWithKeyFromXML config = new ConfigurationWithKeyFromXML(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("ConfigurationTest", config.nameConfiguration); @@ -496,7 +496,7 @@ public class ConfigurationLoaderTest { ConfigurationPropertiesWithTwoAmbiguousKey config = new ConfigurationPropertiesWithTwoAmbiguousKey(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); try { configurationLoader.load(config); @@ -512,7 +512,7 @@ public class ConfigurationLoaderTest { ConfigurationPropertiesWithThreeAmbiguousKey config = new ConfigurationPropertiesWithThreeAmbiguousKey(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); try { configurationLoader.load(config); @@ -528,7 +528,7 @@ public class ConfigurationLoaderTest { ConfigurationPropertiesWithFourAmbiguousKey config = new ConfigurationPropertiesWithFourAmbiguousKey(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); try { configurationLoader.load(config); @@ -544,7 +544,7 @@ public class ConfigurationLoaderTest { ConfigurationPropertiesSuccessWithPrefixNonAmbiguous config = new ConfigurationPropertiesSuccessWithPrefixNonAmbiguous(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("Success", config.success); @@ -555,7 +555,7 @@ public class ConfigurationLoaderTest { ConfigurationWithConventionUnderline config = new ConfigurationWithConventionUnderline(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("Convention Underline", config.conventionUnderline); @@ -566,7 +566,7 @@ public class ConfigurationLoaderTest { ConfigurationWithConventionDot config = new ConfigurationWithConventionDot(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("Convention Dot", config.conventionDot); @@ -577,7 +577,7 @@ public class ConfigurationLoaderTest { ConfigurationWithConventionAllLowerCase config = new ConfigurationWithConventionAllLowerCase(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("All LowerCase", config.conventionAllLowerCase); @@ -588,7 +588,7 @@ public class ConfigurationLoaderTest { ConfigurationWithConventionAllUpperCase config = new ConfigurationWithConventionAllUpperCase(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); + PowerMock.replayAll(CoreBootstrap.class, Beans.class); configurationLoader.load(config); assertEquals("ALL UPPERCASE", config.conventionAllUpperCase); @@ -599,8 +599,8 @@ public class ConfigurationLoaderTest { ConfigurationPropertiesErrorWithComplexObject config = new ConfigurationPropertiesErrorWithComplexObject(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + try { configurationLoader.load(config); fail(); @@ -613,8 +613,8 @@ public class ConfigurationLoaderTest { ConfigurationFromXMLWithPrefix config = new ConfigurationFromXMLWithPrefix(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertEquals("ConfigurationTest", config.nameConfiguration); } @@ -624,8 +624,8 @@ public class ConfigurationLoaderTest { ConfigurationXMLWithConventionDot config = new ConfigurationXMLWithConventionDot(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertEquals("convention.dot", config.conventionDot); } @@ -635,8 +635,8 @@ public class ConfigurationLoaderTest { ConfigurationXMLWithConventionUnderline config = new ConfigurationXMLWithConventionUnderline(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertEquals("Convention_Underline", config.conventionUnderline); } @@ -646,8 +646,8 @@ public class ConfigurationLoaderTest { ConfigurationXMLWithConventionAllUpperCase config = new ConfigurationXMLWithConventionAllUpperCase(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertEquals("ALL UPPERCASE", config.conventionAllUpperCase); } @@ -657,10 +657,10 @@ public class ConfigurationLoaderTest { ConfigurationXMLWithConventionAllLowerCase config = new ConfigurationXMLWithConventionAllLowerCase(); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - PowerMock.replayAll(CoreBootstrap.class,Beans.class); - + PowerMock.replayAll(CoreBootstrap.class, Beans.class); + configurationLoader.load(config); assertEquals("All LowerCase", config.conventionAllLowerCase); } -} \ No newline at end of file +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextStoreTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextStoreTest.java index f9c3dd1..913a2fd 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextStoreTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextStoreTest.java @@ -36,7 +36,6 @@ */ package br.gov.frameworkdemoiselle.internal.context; -import org.junit.Ignore; import java.util.Map; import java.util.TreeMap; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextsTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextsTest.java index 6ba64c5..59f7072 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextsTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextsTest.java @@ -39,12 +39,11 @@ package br.gov.frameworkdemoiselle.internal.context; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; -//import static org.easymock.EasyMock.replay; -import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replay; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.powermock.api.easymock.PowerMock.mockStatic; +import static org.powermock.api.easymock.PowerMock.replay; import java.util.ArrayList; import java.util.List; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContextTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContextTest.java index aebf688..21220e6 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContextTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContextTest.java @@ -36,7 +36,6 @@ */ package br.gov.frameworkdemoiselle.internal.context; -import org.junit.Ignore; import static org.easymock.EasyMock.expect; import static org.junit.Assert.fail; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java index ff47af5..f673bca 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java @@ -1,7 +1,6 @@ package br.gov.frameworkdemoiselle.internal.implementation; import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertTrue; import static org.powermock.api.easymock.PowerMock.mockStatic; import static org.powermock.api.easymock.PowerMock.replay; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java index 3bc93ac..9031ef8 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java @@ -37,7 +37,6 @@ package br.gov.frameworkdemoiselle.internal.implementation; import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertTrue; import static org.powermock.api.easymock.PowerMock.mockStatic; import static org.powermock.api.easymock.PowerMock.replay; @@ -52,7 +51,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.ResourceBundle; /** * @author SERPRO diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationContextImplTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationContextImplTest.java index 3968682..2d53ab4 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationContextImplTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationContextImplTest.java @@ -36,7 +36,6 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import org.junit.Ignore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationImplTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationImplTest.java index 4e7ad71..932f2b7 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationImplTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationImplTest.java @@ -36,7 +36,6 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import org.junit.Ignore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptorTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptorTest.java index b5546ed..4668a31 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptorTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptorTest.java @@ -64,7 +64,6 @@ import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.exception.ExceptionHandler; import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap; import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.ResourceBundle; @RunWith(PowerMockRunner.class) @PrepareForTest(Beans.class) diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java index 2ca6252..1f07ab8 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java @@ -35,7 +35,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. */ package br.gov.frameworkdemoiselle.internal.interceptor; -import org.junit.Ignore; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @@ -46,6 +45,7 @@ import static org.junit.Assert.fail; import javax.interceptor.InvocationContext; import org.easymock.EasyMock; +import org.junit.Ignore; import org.junit.Test; import br.gov.frameworkdemoiselle.DemoiselleException; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LoggerProducerTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LoggerProducerTest.java index 127603a..6038e41 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LoggerProducerTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LoggerProducerTest.java @@ -36,7 +36,6 @@ */ package br.gov.frameworkdemoiselle.internal.producer; -import org.junit.Ignore; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java index 232a9ad..0705bb8 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java @@ -37,7 +37,6 @@ package br.gov.frameworkdemoiselle.internal.producer; import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertTrue; import static org.powermock.api.easymock.PowerMock.mockStatic; import static org.powermock.api.easymock.PowerMock.replay; @@ -57,7 +56,6 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.ResourceBundle; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/message/DefaultMessageTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/message/DefaultMessageTest.java index 1de8900..186d17d 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/message/DefaultMessageTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/message/DefaultMessageTest.java @@ -22,8 +22,8 @@ import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replayAll; import static org.powermock.api.easymock.PowerMock.replay; +import static org.powermock.api.easymock.PowerMock.replayAll; import static org.powermock.api.easymock.PowerMock.verifyAll; import java.util.Arrays; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ExceptionsTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ExceptionsTest.java index ff66a02..62cc596 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ExceptionsTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ExceptionsTest.java @@ -35,7 +35,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. */ package br.gov.frameworkdemoiselle.util; -import org.junit.Ignore; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/impl/core/src/test/resources/configuration-with-array.xml b/impl/core/src/test/resources/configuration-with-array.xml index d88ff3c..4232a25 100644 --- a/impl/core/src/test/resources/configuration-with-array.xml +++ b/impl/core/src/test/resources/configuration-with-array.xml @@ -1,4 +1,3 @@ - - @@ -44,14 +42,14 @@ 12330 129399 - + 32767 123 5512 4212 - + 127 12 @@ -62,12 +60,12 @@ 1 -12 - + true false - + 9223372036854775807 0901920390123 @@ -75,7 +73,7 @@ 134230094 66123413423 - + 3.4028235E38 34.244 @@ -83,13 +81,13 @@ 513.234 10000.000 - + 1.7976931348623157E308 1231234.00120349192348123 1234123512341.9134828348238 - + 16578.69899 @@ -97,7 +95,7 @@ 4487787.559 - + 1998987987897 @@ -105,37 +103,37 @@ 21474836475 - + 2012-06-14 10:10:00 2012-07-14 10:10:00 2012-06-15 18:10:00 - + 2012-08-14 18:10:50 2012-07-14 10:10:00 2012-06-15 18:10:00 - + #808080 #cccccc #ABCCCC - + en pt_br ca - + http://www.test.com https://test.of.test.com ftp://192.168.0.1 - + Test One diff --git a/impl/core/src/test/resources/configuration-with-list.xml b/impl/core/src/test/resources/configuration-with-list.xml index 38154d3..8565809 100644 --- a/impl/core/src/test/resources/configuration-with-list.xml +++ b/impl/core/src/test/resources/configuration-with-list.xml @@ -1,4 +1,3 @@ - -- libgit2 0.21.2