From 340200a3f465edc4de25a418c0c160ec2593f0e1 Mon Sep 17 00:00:00 2001 From: Emerson Oliveira Date: Thu, 4 Apr 2013 14:13:47 -0300 Subject: [PATCH] Incremento dos testes com atributos anotados com @NotNull, adicionando propriedades sendo carregadas a partir de arquivo xml e refatoração com modificação do nome da variável anotada --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/AbstractNotNullFieldConfig.java | 6 +++--- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/ConfigurationNotNullFieldTest.java | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/PropertyWithoutFileConfig.java | 3 ++- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithEmptyFieldConfig.java | 8 ++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithFilledFieldConfig.java | 8 ++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutFileConfig.java | 8 ++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutNotNullField.java | 8 ++++++++ impl/core/src/test/resources/configuration/field/notnull/demoiselle.properties | 10 +--------- impl/core/src/test/resources/configuration/field/notnull/demoiselle.xml | 40 ++++++++++++++++++++++++++++++++++++++++ impl/core/src/test/resources/configuration/field/notnull/empty-field.xml | 39 +++++++++++++++++++++++++++++++++++++++ impl/core/src/test/resources/configuration/field/notnull/without-field.xml | 39 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 210 insertions(+), 23 deletions(-) create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithEmptyFieldConfig.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithFilledFieldConfig.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutFileConfig.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutNotNullField.java create mode 100644 impl/core/src/test/resources/configuration/field/notnull/demoiselle.xml create mode 100644 impl/core/src/test/resources/configuration/field/notnull/empty-field.xml create mode 100644 impl/core/src/test/resources/configuration/field/notnull/without-field.xml diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/AbstractNotNullFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/AbstractNotNullFieldConfig.java index f0514d3..0602301 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/AbstractNotNullFieldConfig.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/AbstractNotNullFieldConfig.java @@ -41,9 +41,9 @@ import javax.validation.constraints.NotNull; public abstract class AbstractNotNullFieldConfig { @NotNull - private Integer integerNotNull; + private Integer attibuteNotNull; - public Integer getIntegerNotNull() { - return integerNotNull; + public Integer getAttributeNotNull() { + return attibuteNotNull; } } diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/ConfigurationNotNullFieldTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/ConfigurationNotNullFieldTest.java index ff37b93..b606f52 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/ConfigurationNotNullFieldTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/ConfigurationNotNullFieldTest.java @@ -59,16 +59,28 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException; public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { @Inject - private PropertyWithFilledFieldConfig filledFieldConfig; + private PropertyWithFilledFieldConfig propertyFilledFieldConfig; @Inject - private PropertyWithEmptyFieldConfig emptyFieldsConfig; + private PropertyWithEmptyFieldConfig propertyEmptyFieldsConfig; @Inject - private PropertyWithoutNotNullField withoutNotNullField; + private PropertyWithoutNotNullField propertyWithoutNotNullField; @Inject - private PropertyWithoutFileConfig noFileConfig; + private PropertyWithoutFileConfig propertyNoFileConfig; + + @Inject + private XMLWithFilledFieldConfig xmlFilledFieldConfig; + + @Inject + private XMLWithEmptyFieldConfig xmlEmptyFieldsConfig; + + @Inject + private XMLWithoutNotNullField xmlWithoutNotNullField; + + @Inject + private XMLWithoutFileConfig xmlNoFileConfig; @Deployment public static JavaArchive createDeployment() { @@ -85,22 +97,40 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { .addAsResource( new FileAsset(new File( "src/test/resources/configuration/field/notnull/without-field.properties")), - "without-field.properties"); + "without-field.properties") + .addAsResource( + new FileAsset(new File("src/test/resources/configuration/field/notnull/demoiselle.xml")), + "demoiselle.xml") + .addAsResource( + new FileAsset(new File("src/test/resources/configuration/field/notnull/empty-field.xml")), + "empty-field.xml") + .addAsResource( + new FileAsset(new File( + "src/test/resources/configuration/field/notnull/without-field.xml")), + "without-field.xml"); return deployment; } @Test - public void loadFieldNotNullFromFilledProperty() { + public void loadFieldNotNullFromFilledFile() { Integer expected = 1; - assertEquals(expected, filledFieldConfig.getIntegerNotNull()); + assertEquals(expected, propertyFilledFieldConfig.getAttributeNotNull()); + assertEquals(expected, xmlFilledFieldConfig.getAttributeNotNull()); } @Test public void loadFieldNotNullFromEmptyProperty() { try { - emptyFieldsConfig.getIntegerNotNull(); + propertyEmptyFieldsConfig.getAttributeNotNull(); + fail(); + } catch (ConfigurationException cause) { + Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); + } + + try { + xmlEmptyFieldsConfig.getAttributeNotNull(); fail(); } catch (ConfigurationException cause) { Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); @@ -110,7 +140,14 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { @Test public void loadFieldFromPropertyFileWithoutNotNullField() { try { - withoutNotNullField.getIntegerNotNull(); + propertyWithoutNotNullField.getAttributeNotNull(); + fail(); + } catch (ConfigurationException cause) { + Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); + } + + try { + xmlWithoutNotNullField.getAttributeNotNull(); fail(); } catch (ConfigurationException cause) { Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); @@ -120,7 +157,14 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { @Test public void loadFieldNotNullFromInexistentPropertyFile() { try { - noFileConfig.getIntegerNotNull(); + propertyNoFileConfig.getAttributeNotNull(); + fail(); + } catch (ConfigurationException cause) { + Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); + } + + try { + xmlNoFileConfig.getAttributeNotNull(); fail(); } catch (ConfigurationException cause) { Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/PropertyWithoutFileConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/PropertyWithoutFileConfig.java index f0aaea4..a5547ce 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/PropertyWithoutFileConfig.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/PropertyWithoutFileConfig.java @@ -36,8 +36,9 @@ */ package br.gov.frameworkdemoiselle.configuration.field.notnull; +import static br.gov.frameworkdemoiselle.configuration.ConfigType.PROPERTIES; import br.gov.frameworkdemoiselle.configuration.Configuration; -@Configuration(resource = "nofile") +@Configuration(resource = "nofile", type = PROPERTIES) public class PropertyWithoutFileConfig extends AbstractNotNullFieldConfig { } diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithEmptyFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithEmptyFieldConfig.java new file mode 100644 index 0000000..2ae06ba --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithEmptyFieldConfig.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.notnull; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(resource = "empty-field", type = XML) +public class XMLWithEmptyFieldConfig extends AbstractNotNullFieldConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithFilledFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithFilledFieldConfig.java new file mode 100644 index 0000000..ab9c997 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithFilledFieldConfig.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.notnull; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(resource = "demoiselle", type = XML) +public class XMLWithFilledFieldConfig extends AbstractNotNullFieldConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutFileConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutFileConfig.java new file mode 100644 index 0000000..5056936 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutFileConfig.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.notnull; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(resource = "nofile", type = XML) +public class XMLWithoutFileConfig extends AbstractNotNullFieldConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutNotNullField.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutNotNullField.java new file mode 100644 index 0000000..c5e931b --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutNotNullField.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.notnull; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(resource = "without-field", type = XML) +public class XMLWithoutNotNullField extends AbstractNotNullFieldConfig { +} diff --git a/impl/core/src/test/resources/configuration/field/notnull/demoiselle.properties b/impl/core/src/test/resources/configuration/field/notnull/demoiselle.properties index 3a3e39b..a938519 100644 --- a/impl/core/src/test/resources/configuration/field/notnull/demoiselle.properties +++ b/impl/core/src/test/resources/configuration/field/notnull/demoiselle.properties @@ -33,12 +33,4 @@ # ou escreva para a Fundação do Software Livre (FSF) Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. -integerNotNull=1 -byteNotNull=2 -shortNotNull=3 -intNotNull=4 -longNotNull=5 -charNotNull=a -floatNotNull=6.6 -doubleNotNull=7.7 -booleanNotNull=true +attibuteNotNull=1 diff --git a/impl/core/src/test/resources/configuration/field/notnull/demoiselle.xml b/impl/core/src/test/resources/configuration/field/notnull/demoiselle.xml new file mode 100644 index 0000000..762f4ee --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/notnull/demoiselle.xml @@ -0,0 +1,40 @@ + + + + 1 + diff --git a/impl/core/src/test/resources/configuration/field/notnull/empty-field.xml b/impl/core/src/test/resources/configuration/field/notnull/empty-field.xml new file mode 100644 index 0000000..84b4b18 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/notnull/empty-field.xml @@ -0,0 +1,39 @@ + + + + diff --git a/impl/core/src/test/resources/configuration/field/notnull/without-field.xml b/impl/core/src/test/resources/configuration/field/notnull/without-field.xml new file mode 100644 index 0000000..b6b0983 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/notnull/without-field.xml @@ -0,0 +1,39 @@ + + + 1 + -- libgit2 0.21.2