From 93579178ba1896924aface6816e4a0d5f9880e69 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Fri, 22 Mar 2013 11:05:13 -0300 Subject: [PATCH] Merge --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java | 1 - impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/AbstractBasicFieldConfig.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/ConfigurationBasicFieldTest.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/PropertiesBasicFieldConfig.java | 8 ++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/SystemBasicFieldConfig.java | 9 +++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/XMLBasicFieldConfig.java | 9 +++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/AbstractBasicFieldsConfig.java | 44 -------------------------------------------- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/ConfigurationBasicFieldsTest.java | 53 ----------------------------------------------------- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/PropertiesBasicFieldsConfig.java | 8 -------- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/SystemBasicFieldsConfig.java | 9 --------- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/XMLBasicFieldsConfig.java | 9 --------- impl/core/src/test/resources/configuration/field/basic/demoiselle.properties | 4 ++++ impl/core/src/test/resources/configuration/field/basic/demoiselle.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ impl/core/src/test/resources/configuration/fields/basic/demoiselle.properties | 4 ---- 14 files changed, 176 insertions(+), 128 deletions(-) create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/AbstractBasicFieldConfig.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/ConfigurationBasicFieldTest.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/PropertiesBasicFieldConfig.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/SystemBasicFieldConfig.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/XMLBasicFieldConfig.java delete mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/AbstractBasicFieldsConfig.java delete mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/ConfigurationBasicFieldsTest.java delete mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/PropertiesBasicFieldsConfig.java delete mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/SystemBasicFieldsConfig.java delete mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/XMLBasicFieldsConfig.java create mode 100644 impl/core/src/test/resources/configuration/field/basic/demoiselle.properties create mode 100644 impl/core/src/test/resources/configuration/field/basic/demoiselle.xml delete mode 100644 impl/core/src/test/resources/configuration/fields/basic/demoiselle.properties diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java index b1d72a6..14a0156 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java @@ -6,7 +6,6 @@ import java.util.List; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.asset.FileAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import br.gov.frameworkdemoiselle.annotation.Ignore; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/AbstractBasicFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/AbstractBasicFieldConfig.java new file mode 100644 index 0000000..d621852 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/AbstractBasicFieldConfig.java @@ -0,0 +1,44 @@ +package br.gov.frameworkdemoiselle.configuration.field.basic; + +public abstract class AbstractBasicFieldConfig { + + private int primitiveInteger; + + private Integer wrappedInteger; + + private String stringWithSpace; + + private String stringWithComma; + + public Integer getWrappedInteger() { + return wrappedInteger; + } + + public void setWrappedInteger(Integer wrappedInteger) { + this.wrappedInteger = wrappedInteger; + } + + public int getPrimitiveInteger() { + return primitiveInteger; + } + + public void setPrimitiveInteger(int primitiveInteger) { + this.primitiveInteger = primitiveInteger; + } + + public String getStringWithSpace() { + return stringWithSpace; + } + + public void setStringWithSpace(String stringWithSpace) { + this.stringWithSpace = stringWithSpace; + } + + public String getStringWithComma() { + return stringWithComma; + } + + public void setStringWithComma(String stringWithComma) { + this.stringWithComma = stringWithComma; + } +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/ConfigurationBasicFieldTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/ConfigurationBasicFieldTest.java new file mode 100644 index 0000000..4ffc3c8 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/ConfigurationBasicFieldTest.java @@ -0,0 +1,60 @@ +package br.gov.frameworkdemoiselle.configuration.field.basic; + +import static junit.framework.Assert.assertEquals; + +import javax.inject.Inject; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest; + +@RunWith(Arquillian.class) +public class ConfigurationBasicFieldTest extends AbstractConfigurationTest { + + @Inject + private PropertiesBasicFieldConfig propertiesConfig; + + @Inject + private XMLBasicFieldConfig xmlConfig; + + @Deployment + public static JavaArchive createDeployment() { + return createConfigurationDeployment().addPackages(true, ConfigurationBasicFieldTest.class.getPackage()); + } + + @Test + public void loadPrimitiveInteger() { + int expected = 1; + + assertEquals(expected, propertiesConfig.getPrimitiveInteger()); + assertEquals(expected, xmlConfig.getPrimitiveInteger()); + } + + @Test + public void loadWrappedInteger() { + Integer expected = 2; + + assertEquals(expected, propertiesConfig.getWrappedInteger()); + assertEquals(expected, xmlConfig.getWrappedInteger()); + } + + @Test + public void loadStringWithSpace() { + String expected = "demoiselle framework"; + + assertEquals(expected, propertiesConfig.getStringWithSpace()); + assertEquals(expected, xmlConfig.getStringWithSpace()); + } + +// @Test + public void loadStringWithComma() { + String expected = "demoiselle,framework"; + + assertEquals(expected, propertiesConfig.getStringWithComma()); + assertEquals(expected, xmlConfig.getStringWithComma()); + } +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/PropertiesBasicFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/PropertiesBasicFieldConfig.java new file mode 100644 index 0000000..a18619a --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/PropertiesBasicFieldConfig.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.basic; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.PROPERTIES; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = PROPERTIES) +public class PropertiesBasicFieldConfig extends AbstractBasicFieldConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/SystemBasicFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/SystemBasicFieldConfig.java new file mode 100644 index 0000000..0cefc0b --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/SystemBasicFieldConfig.java @@ -0,0 +1,9 @@ +package br.gov.frameworkdemoiselle.configuration.field.basic; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.SYSTEM; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = SYSTEM) +public class SystemBasicFieldConfig extends AbstractBasicFieldConfig { + +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/XMLBasicFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/XMLBasicFieldConfig.java new file mode 100644 index 0000000..8813748 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/basic/XMLBasicFieldConfig.java @@ -0,0 +1,9 @@ +package br.gov.frameworkdemoiselle.configuration.field.basic; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = XML) +public class XMLBasicFieldConfig extends AbstractBasicFieldConfig { + +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/AbstractBasicFieldsConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/AbstractBasicFieldsConfig.java deleted file mode 100644 index 83665d5..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/AbstractBasicFieldsConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.fields.basic; - -public abstract class AbstractBasicFieldsConfig { - - private int primitiveInteger; - - private Integer wrappedInteger; - - private String stringWithSpace; - - private String stringWithComma; - - public Integer getWrappedInteger() { - return wrappedInteger; - } - - public void setWrappedInteger(Integer wrappedInteger) { - this.wrappedInteger = wrappedInteger; - } - - public int getPrimitiveInteger() { - return primitiveInteger; - } - - public void setPrimitiveInteger(int primitiveInteger) { - this.primitiveInteger = primitiveInteger; - } - - public String getStringWithSpace() { - return stringWithSpace; - } - - public void setStringWithSpace(String stringWithSpace) { - this.stringWithSpace = stringWithSpace; - } - - public String getStringWithComma() { - return stringWithComma; - } - - public void setStringWithComma(String stringWithComma) { - this.stringWithComma = stringWithComma; - } -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/ConfigurationBasicFieldsTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/ConfigurationBasicFieldsTest.java deleted file mode 100644 index 179389e..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/ConfigurationBasicFieldsTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.fields.basic; - -import static junit.framework.Assert.assertEquals; - -import javax.inject.Inject; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest; - -@RunWith(Arquillian.class) -public class ConfigurationBasicFieldsTest extends AbstractConfigurationTest { - - @Inject - private PropertiesBasicFieldsConfig propertiesConfig; - - @Deployment - public static JavaArchive createDeployment() { - return createConfigurationDeployment().addPackages(true, ConfigurationBasicFieldsTest.class.getPackage()); - } - - @Test - public void loadPrimitiveInteger() { - int expected = 1; - - assertEquals(expected, propertiesConfig.getPrimitiveInteger()); - } - - @Test - public void loadWrappedInteger() { - Integer expected = 2; - - assertEquals(expected, propertiesConfig.getWrappedInteger()); - } - - @Test - public void loadStringWithSpace() { - String expected = "demoiselle framework"; - - assertEquals(expected, propertiesConfig.getStringWithSpace()); - } - -// @Test - public void loadStringWithComma() { - String expected = "demoiselle,framework"; - - assertEquals(expected, propertiesConfig.getStringWithComma()); - } -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/PropertiesBasicFieldsConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/PropertiesBasicFieldsConfig.java deleted file mode 100644 index 17f79c3..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/PropertiesBasicFieldsConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.fields.basic; - -import static br.gov.frameworkdemoiselle.configuration.ConfigType.PROPERTIES; -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration(type = PROPERTIES) -public class PropertiesBasicFieldsConfig extends AbstractBasicFieldsConfig { -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/SystemBasicFieldsConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/SystemBasicFieldsConfig.java deleted file mode 100644 index 8fa8241..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/SystemBasicFieldsConfig.java +++ /dev/null @@ -1,9 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.fields.basic; - -import static br.gov.frameworkdemoiselle.configuration.ConfigType.SYSTEM; -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration(type = SYSTEM) -public class SystemBasicFieldsConfig extends AbstractBasicFieldsConfig { - -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/XMLBasicFieldsConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/XMLBasicFieldsConfig.java deleted file mode 100644 index 12a2de7..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/fields/basic/XMLBasicFieldsConfig.java +++ /dev/null @@ -1,9 +0,0 @@ -package br.gov.frameworkdemoiselle.configuration.fields.basic; - -import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration(type = XML) -public class XMLBasicFieldsConfig extends AbstractBasicFieldsConfig { - -} diff --git a/impl/core/src/test/resources/configuration/field/basic/demoiselle.properties b/impl/core/src/test/resources/configuration/field/basic/demoiselle.properties new file mode 100644 index 0000000..2804f98 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/basic/demoiselle.properties @@ -0,0 +1,4 @@ +primitiveInteger=1 +wrappedInteger=2 +stringWithSpace=demoiselle framework +stringWithComma=demoiselle,framework diff --git a/impl/core/src/test/resources/configuration/field/basic/demoiselle.xml b/impl/core/src/test/resources/configuration/field/basic/demoiselle.xml new file mode 100644 index 0000000..e308f11 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/basic/demoiselle.xml @@ -0,0 +1,42 @@ + + + 1 + 2 + demoiselle framework + demoiselle,framework + \ No newline at end of file diff --git a/impl/core/src/test/resources/configuration/fields/basic/demoiselle.properties b/impl/core/src/test/resources/configuration/fields/basic/demoiselle.properties deleted file mode 100644 index 2804f98..0000000 --- a/impl/core/src/test/resources/configuration/fields/basic/demoiselle.properties +++ /dev/null @@ -1,4 +0,0 @@ -primitiveInteger=1 -wrappedInteger=2 -stringWithSpace=demoiselle framework -stringWithComma=demoiselle,framework -- libgit2 0.21.2