diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/ConfigurationNamedFieldTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/ConfigurationNamedFieldTest.java index e2b240d..c30b5d0 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/ConfigurationNamedFieldTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/ConfigurationNamedFieldTest.java @@ -55,8 +55,11 @@ import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest; public class ConfigurationNamedFieldTest extends AbstractConfigurationTest { @Inject - private PropertyDefault propertyDefault; - + private PropertyNamed propertyNamed; + + @Inject + private XMLNamed xmlNamed; + @Deployment public static JavaArchive createDeployment() { JavaArchive deployment = createConfigurationDeployment(); @@ -64,23 +67,28 @@ public class ConfigurationNamedFieldTest extends AbstractConfigurationTest { deployment.addPackages(true, ConfigurationNamedFieldTest.class.getPackage()); deployment.addAsResource( new FileAsset(new File("src/test/resources/configuration/field/named/demoiselle.properties")), - "demoiselle.properties"); + "demoiselle.properties").addAsResource( + new FileAsset(new File("src/test/resources/configuration/field/named/demoiselle.xml")), + "demoiselle.xml"); return deployment; } - + @Test - public void loadNamedConfigFromPropertyWithName(){ - assertEquals(1, propertyDefault.getIntUniqueName()); + public void loadNamedConfigFromPropertyWithName() { + assertEquals(1, propertyNamed.getIntUniqueName()); + assertEquals(1, xmlNamed.getIntUniqueName()); } @Test - public void loadNamedConfigFromNonexistentProperty(){ - assertEquals(0, propertyDefault.getIntNotPresent()); + public void loadNamedConfigFromNonexistentProperty() { + assertEquals(0, propertyNamed.getIntNotPresent()); + assertEquals(0, xmlNamed.getIntNotPresent()); } - + @Test - public void loadNamedConfigFromPropertyWithoutField(){ - assertEquals(0, propertyDefault.getIntNamedWithoutFile()); + public void loadNamedConfigFromPropertyWithoutField() { + assertEquals(0, propertyNamed.getIntNamedWithoutFile()); + assertEquals(0, xmlNamed.getIntNamedWithoutFile()); } } diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/PropertyDefault.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/PropertyDefault.java deleted file mode 100644 index 8d9b32d..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/PropertyDefault.java +++ /dev/null @@ -1,7 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.field.named; - -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration -public class PropertyDefault extends AbstractNamedFieldConfig { -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/PropertyNamed.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/PropertyNamed.java new file mode 100644 index 0000000..4c93b60 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/PropertyNamed.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.named; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.PROPERTIES; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = PROPERTIES) +public class PropertyNamed extends AbstractNamedFieldConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/XMLNamed.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/XMLNamed.java new file mode 100644 index 0000000..3682f90 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/XMLNamed.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.named; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = XML) +public class XMLNamed extends AbstractNamedFieldConfig { +} diff --git a/impl/core/src/test/resources/configuration/field/named/demoiselle.xml b/impl/core/src/test/resources/configuration/field/named/demoiselle.xml new file mode 100644 index 0000000..7595c27 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/named/demoiselle.xml @@ -0,0 +1,42 @@ + + +
+ 1 +
+ 1 +
-- libgit2 0.21.2