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 ec3d715..3be2eb1 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 @@ -44,6 +44,7 @@ import static org.junit.Assert.fail; import static org.powermock.api.easymock.PowerMock.mockStatic; import java.util.Locale; +import java.util.Properties; import javax.validation.constraints.NotNull; @@ -72,6 +73,20 @@ public class ConfigurationLoaderTest { private CoreBootstrap coreBootstrap; @Configuration + public class ConfigurationSuccessfulPropertiesWithClassField { + + protected Class classe; + + } + + @Configuration + public class ConfigurationSuccessfulPropertiesWithPropertiesField { + + protected Properties properties; + + } + + @Configuration public class ConfigurationSuccessfulProperties { @Name("frameworkdemoiselle.configurationtest.nameConfiguration") @@ -295,6 +310,27 @@ public class ConfigurationLoaderTest { } @Test + public void testConfigurationSuccessfulPropertiesWithClassField() { + ConfigurationSuccessfulPropertiesWithClassField config = new ConfigurationSuccessfulPropertiesWithClassField(); + expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); + PowerMock.replayAll(CoreBootstrap.class,Beans.class); + configurationLoader.load(config); + 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); + configurationLoader.load(config); + 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); diff --git a/impl/core/src/test/resources/demoiselle.properties b/impl/core/src/test/resources/demoiselle.properties index eb43e88..7330774 100644 --- a/impl/core/src/test/resources/demoiselle.properties +++ b/impl/core/src/test/resources/demoiselle.properties @@ -75,4 +75,7 @@ convention_underline=Convention Underline convention.dot=Convention Dot conventionalllowercase=All LowerCase CONVENTIONALLUPPERCASE=ALL UPPERCASE -complexObject=null \ No newline at end of file +complexObject=null +properties.1=teste1 +properties.2=teste2 +classe=br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoaderTest \ No newline at end of file -- libgit2 0.21.2