diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/ConfigurationPrefixTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/ConfigurationPrefixTest.java index 2737f30..ee6041f 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/ConfigurationPrefixTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/ConfigurationPrefixTest.java @@ -56,37 +56,57 @@ import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest; public class ConfigurationPrefixTest extends AbstractConfigurationTest { @Inject - private PrefixEndindWithoutDot endingWithoutDotPrefix; + private PropertyPrefixEndingWithoutDot propertyEndingWithoutDotPrefix; @Inject - private MissingPrefix missingPrefix; + private PropertyMissingPrefix propertyMissingPrefix; @Inject - private PrefixEndingWithDot endingWithDotPrefix; + private PropertyPrefixEndingWithDot propertyEndingWithDotPrefix; + + + @Inject + private XMLPrefixEndingWithoutDot xmlEndingWithoutDotPrefix; + + @Inject + private XMLMissingPrefix xmlMissingPrefix; + + @Inject + private XMLPrefixEndingWithDot xmlEndingWithDotPrefix; @Deployment public static JavaArchive createDeployment() { JavaArchive deployment = createConfigurationDeployment(); deployment.addPackages(true, ConfigurationPrefixTest.class.getPackage()); - deployment.addAsResource(new FileAsset( - new File("src/test/resources/configuration/prefix/demoiselle.properties")), "demoiselle.properties"); + deployment.addAsResource( + new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")), + "demoiselle.properties").addAsResource( + new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.xml")), + "demoiselle.xml"); return deployment; } @Test public void loadFromPrefixedExistentProperty() { - assertEquals("prefix ending without dot", endingWithoutDotPrefix.getPrefixedAttribute()); + String expected = "prefix ending without dot"; + + assertEquals(expected, propertyEndingWithoutDotPrefix.getPrefixedAttribute()); + assertEquals(expected, xmlEndingWithoutDotPrefix.getPrefixedAttribute()); } @Test public void loadFromPrefixedWithouPrefixOnProperty() { - assertNull(missingPrefix.getPrefixedAttribute()); + assertNull(propertyMissingPrefix.getPrefixedAttribute()); + assertNull(xmlMissingPrefix.getPrefixedAttribute()); } @Test public void loadPrefixEndingWithDot() { - assertEquals("prefix ending with dot", endingWithDotPrefix.getPrefixedAttribute()); + String expected = "prefix ending with dot"; + + assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute()); + assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute()); } } diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/MissingPrefix.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/MissingPrefix.java deleted file mode 100644 index ce1b8f6..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/MissingPrefix.java +++ /dev/null @@ -1,7 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.prefix; - -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration(prefix = "missing.prefix") -public class MissingPrefix extends AbstractPrefixConfig { -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PrefixEndindWithoutDot.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PrefixEndindWithoutDot.java deleted file mode 100644 index b117b3e..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PrefixEndindWithoutDot.java +++ /dev/null @@ -1,7 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.prefix; - -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration(prefix = "prefix") -public class PrefixEndindWithoutDot extends AbstractPrefixConfig { -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PrefixEndingWithDot.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PrefixEndingWithDot.java deleted file mode 100644 index 1ad7e38..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PrefixEndingWithDot.java +++ /dev/null @@ -1,7 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.prefix; - -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration(prefix = "endingWithDot.") -public class PrefixEndingWithDot extends AbstractPrefixConfig { -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyMissingPrefix.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyMissingPrefix.java new file mode 100644 index 0000000..1b28878 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyMissingPrefix.java @@ -0,0 +1,7 @@ +package br.gov.frameworkdemoiselle.configuration.prefix; + +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(prefix = "missing.prefix") +public class PropertyMissingPrefix extends AbstractPrefixConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithDot.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithDot.java new file mode 100644 index 0000000..afd07c2 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithDot.java @@ -0,0 +1,7 @@ +package br.gov.frameworkdemoiselle.configuration.prefix; + +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(prefix = "endingWithDot.") +public class PropertyPrefixEndingWithDot extends AbstractPrefixConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithoutDot.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithoutDot.java new file mode 100644 index 0000000..c1eb40c --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithoutDot.java @@ -0,0 +1,7 @@ +package br.gov.frameworkdemoiselle.configuration.prefix; + +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(prefix = "prefix") +public class PropertyPrefixEndingWithoutDot extends AbstractPrefixConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLMissingPrefix.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLMissingPrefix.java new file mode 100644 index 0000000..d57f953 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLMissingPrefix.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.prefix; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = XML, prefix = "missing.prefix") +public class XMLMissingPrefix extends AbstractPrefixConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLPrefixEndingWithDot.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLPrefixEndingWithDot.java new file mode 100644 index 0000000..ca7def5 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLPrefixEndingWithDot.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.prefix; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = XML, prefix = "endingWithDot.") +public class XMLPrefixEndingWithDot extends AbstractPrefixConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLPrefixEndingWithoutDot.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLPrefixEndingWithoutDot.java new file mode 100644 index 0000000..d671a2d --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLPrefixEndingWithoutDot.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.prefix; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = XML, prefix = "prefix") +public class XMLPrefixEndingWithoutDot extends AbstractPrefixConfig { +} diff --git a/impl/core/src/test/resources/configuration/prefix/demoiselle.xml b/impl/core/src/test/resources/configuration/prefix/demoiselle.xml new file mode 100644 index 0000000..a33fee8 --- /dev/null +++ b/impl/core/src/test/resources/configuration/prefix/demoiselle.xml @@ -0,0 +1,46 @@ + + + + + prefix ending without dot + + without prefix + + prefix ending with dot + + -- libgit2 0.21.2