From e82afb17964491f6cbc1617d87dcce2a96749bee Mon Sep 17 00:00:00 2001 From: Ednara Oliveira Date: Thu, 11 Apr 2013 15:49:12 -0300 Subject: [PATCH] Correção dos testes para chaves com valor vazio --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java | 2 +- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java | 24 ++++++------------------ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java | 12 ------------ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java | 66 +++++++++++++++++++++++++++++++++++++++++++----------------------- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/string/ConfigurationStringFieldTest.java | 2 +- impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties | 4 ++-- 6 files changed, 53 insertions(+), 57 deletions(-) diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java index 40b0caf..3d58ab1 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java @@ -90,6 +90,6 @@ public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { public void loadDefaultValueWithKey() { assertEquals("Initialized value of the property file", filledFieldConfig.getStringDefaultWithKey()); assertEquals("Initialized value and key in the property file", noFileConfig.getStringDefaultWithKey()); - assertEquals("Initialized value and key in the property file", emptyFieldsConfig.getStringDefaultWithKey()); + assertEquals("", emptyFieldsConfig.getStringDefaultWithKey()); } } diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java index 9d44309..ccd2507 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java @@ -38,32 +38,20 @@ package br.gov.frameworkdemoiselle.configuration.field.primitiveorwrapper; public abstract class AbstractPrimitiveOrWrapperErrorFieldConfig { - private int primitiveInteger; - - private int nullPrimitiveInteger; + private int emptyPrimitiveInteger; private int errorPrimitiveInteger; - private Integer wrappedInteger; - - private Integer nullWrappedInteger; + private Integer emptyWrappedInteger; private Integer errorWrappedInteger; - public Integer getWrappedInteger() { - return wrappedInteger; - } - - public int getPrimitiveInteger() { - return primitiveInteger; - } - - public int getNullPrimitiveInteger() { - return nullPrimitiveInteger; + public int getEmptyPrimitiveInteger() { + return emptyPrimitiveInteger; } - public Integer getNullWrappedInteger() { - return nullWrappedInteger; + public Integer getEmptyWrappedInteger() { + return emptyWrappedInteger; } public int getErrorPrimitiveInteger() { diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java index 0eb6ffb..6fb1128 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java @@ -40,12 +40,8 @@ public abstract class AbstractPrimitiveOrWrapperFieldConfig { private int primitiveInteger; - private int nullPrimitiveInteger; - private Integer wrappedInteger; - private Integer nullWrappedInteger; - public Integer getWrappedInteger() { return wrappedInteger; } @@ -53,12 +49,4 @@ public abstract class AbstractPrimitiveOrWrapperFieldConfig { public int getPrimitiveInteger() { return primitiveInteger; } - - public int getNullPrimitiveInteger() { - return nullPrimitiveInteger; - } - - public Integer getNullWrappedInteger() { - return nullWrappedInteger; - } } diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java index c3a4657..fa7b627 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java @@ -94,10 +94,10 @@ public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurat @BeforeClass public static void afterClass() { System.setProperty("primitiveInteger", String.valueOf(1)); - System.setProperty("nullPrimitiveInteger", String.valueOf("")); + System.setProperty("emptyPrimitiveInteger", String.valueOf("")); System.setProperty("errorPrimitiveInteger", String.valueOf("a")); System.setProperty("wrappedInteger", String.valueOf(2)); - System.setProperty("nullWrappedInteger", String.valueOf("")); + System.setProperty("emptyWrappedInteger", String.valueOf("")); System.setProperty("errorWrappedInteger", String.valueOf("a")); } @@ -120,43 +120,65 @@ public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurat } @Test - public void loadNullPrimitiveInteger() { - int expected = 0; - - assertEquals(expected, systemConfig.getNullPrimitiveInteger()); - assertEquals(expected, propertiesConfig.getNullPrimitiveInteger()); - assertEquals(expected, xmlConfig.getNullPrimitiveInteger()); + public void loadEmptyPrimitiveInteger() { + try { + systemErrorConfig.getEmptyPrimitiveInteger(); + } catch (ConfigurationException cause) { + assertEquals(ConversionException.class, cause.getCause().getClass()); + } + + try { + propertiesErrorConfig.getEmptyPrimitiveInteger(); + } catch (ConfigurationException cause) { + assertEquals(ConversionException.class, cause.getCause().getClass()); + } + + try { + propertiesErrorConfig.getEmptyPrimitiveInteger(); + } catch (ConfigurationException cause) { + assertEquals(ConversionException.class, cause.getCause().getClass()); + } } @Test public void loadNullWrappedInteger() { - Integer expected = null; - - assertEquals(expected, systemConfig.getNullWrappedInteger()); - assertEquals(expected, propertiesConfig.getNullWrappedInteger()); - assertEquals(expected, xmlConfig.getNullWrappedInteger()); + try { + systemErrorConfig.getEmptyWrappedInteger(); + } catch (ConfigurationException cause) { + assertEquals(ConversionException.class, cause.getCause().getClass()); + } + + try { + propertiesErrorConfig.getEmptyWrappedInteger(); + } catch (ConfigurationException cause) { + assertEquals(ConversionException.class, cause.getCause().getClass()); + } + + try { + propertiesErrorConfig.getEmptyWrappedInteger(); + } catch (ConfigurationException cause) { + assertEquals(ConversionException.class, cause.getCause().getClass()); + } } @Test public void loadErrorPrimitiveInteger() { - int expected = 0; - try { - assertEquals(expected, propertiesErrorConfig.getErrorPrimitiveInteger()); + propertiesErrorConfig.getErrorPrimitiveInteger(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - assertEquals(expected, propertiesErrorConfig.getErrorPrimitiveInteger()); + propertiesErrorConfig.getErrorPrimitiveInteger(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - assertEquals(expected, xmlErrorConfig.getErrorPrimitiveInteger()); + xmlErrorConfig.getErrorPrimitiveInteger(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); @@ -165,24 +187,22 @@ public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurat @Test public void loadErrorWrappedInteger() { - Integer expected = 2; - try { - assertEquals(expected, propertiesErrorConfig.getErrorWrappedInteger()); + propertiesErrorConfig.getErrorWrappedInteger(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - assertEquals(expected, propertiesErrorConfig.getErrorWrappedInteger()); + propertiesErrorConfig.getErrorWrappedInteger(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - assertEquals(expected, xmlErrorConfig.getErrorWrappedInteger()); + xmlErrorConfig.getErrorWrappedInteger(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/string/ConfigurationStringFieldTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/string/ConfigurationStringFieldTest.java index e2a1d97..7d707ee 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/string/ConfigurationStringFieldTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/string/ConfigurationStringFieldTest.java @@ -105,7 +105,7 @@ public class ConfigurationStringFieldTest extends AbstractConfigurationTest { @Test public void loadEmptyString() { - String expected = null; + String expected = ""; assertEquals(expected, systemConfig.getEmptyString()); assertEquals(expected, propertiesConfig.getEmptyString()); assertEquals(expected, xmlConfig.getEmptyString()); diff --git a/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties b/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties index a861db1..8fb4170 100644 --- a/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties +++ b/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties @@ -34,8 +34,8 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. primitiveInteger=1 -nullPrimitiveInteger= +emptyPrimitiveInteger= errorPrimitiveInteger=a wrappedInteger=2 -nullWrappedInteger= +aemptyWrappedInteger= errorWrappedInteger=a \ No newline at end of file -- libgit2 0.21.2