From ebd26f7231dcc2404080cc6847a6c656007817d3 Mon Sep 17 00:00:00 2001 From: Emerson Oliveira Date: Thu, 18 Apr 2013 16:28:38 -0300 Subject: [PATCH] Refatoração e adição de testes para os atributos de configuração dos tipos primitivo e wrapped --- impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperEmptyFieldConfig.java | 76 ---------------------------------------------------------------------------- impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java | 26 +++++++++++++------------- impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java | 12 ++++++------ impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java | 75 +++++++++++++++++++++++++++++++++++++++++++++------------------------------ impl/core/src/test/java/configuration/field/primitiveorwrapper/PropertiesNullWrappedField.java | 13 +++++++++++++ impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties | 12 ++++++------ impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.xml | 12 ++++++------ 7 files changed, 89 insertions(+), 137 deletions(-) delete mode 100644 impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperEmptyFieldConfig.java create mode 100644 impl/core/src/test/java/configuration/field/primitiveorwrapper/PropertiesNullWrappedField.java diff --git a/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperEmptyFieldConfig.java b/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperEmptyFieldConfig.java deleted file mode 100644 index e8938bd..0000000 --- a/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperEmptyFieldConfig.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package configuration.field.primitiveorwrapper; - -public abstract class AbstractPrimitiveOrWrapperEmptyFieldConfig { - - private int primitiveInteger; - - private int nullPrimitiveInteger; - - private int errorPrimitiveInteger; - - private Integer wrappedInteger; - - private Integer nullWrappedInteger; - - private Integer errorWrappedInteger; - - public Integer getWrappedInteger() { - return wrappedInteger; - } - - public int getPrimitiveInteger() { - return primitiveInteger; - } - - public int getNullPrimitiveInteger() { - return nullPrimitiveInteger; - } - - public Integer getNullWrappedInteger() { - return nullWrappedInteger; - } - - public int getErrorPrimitiveInteger() { - return errorPrimitiveInteger; - } - - public Integer getErrorWrappedInteger() { - return errorWrappedInteger; - } -} diff --git a/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java b/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java index dcf1956..420f927 100644 --- a/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java +++ b/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperErrorFieldConfig.java @@ -38,27 +38,27 @@ package configuration.field.primitiveorwrapper; public abstract class AbstractPrimitiveOrWrapperErrorFieldConfig { - private int emptyPrimitiveInteger; + private int emptyPrimitiveField; - private int errorPrimitiveInteger; + private int conversionErrorPrimitiveField; - private Integer emptyWrappedInteger; + private Integer emptyWrappedField; - private Integer errorWrappedInteger; - - public int getEmptyPrimitiveInteger() { - return emptyPrimitiveInteger; + private Integer conversionErrorWrappedField; + + public int getEmptyPrimitiveField() { + return emptyPrimitiveField; } - public Integer getEmptyWrappedInteger() { - return emptyWrappedInteger; + public Integer getEmptyWrappedField() { + return emptyWrappedField; } - public int getErrorPrimitiveInteger() { - return errorPrimitiveInteger; + public int getConversionErrorPrimitiveField() { + return conversionErrorPrimitiveField; } - public Integer getErrorWrappedInteger() { - return errorWrappedInteger; + public Integer getConversionErrorWrappedField() { + return conversionErrorWrappedField; } } diff --git a/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java b/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java index 1a1301c..aa5e138 100644 --- a/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java +++ b/impl/core/src/test/java/configuration/field/primitiveorwrapper/AbstractPrimitiveOrWrapperFieldConfig.java @@ -38,15 +38,15 @@ package configuration.field.primitiveorwrapper; public abstract class AbstractPrimitiveOrWrapperFieldConfig { - private int primitiveInteger; + private int primitiveField; - private Integer wrappedInteger; + private Integer wrappedField; - public Integer getWrappedInteger() { - return wrappedInteger; + public Integer getWrappedField() { + return wrappedField; } - public int getPrimitiveInteger() { - return primitiveInteger; + public int getPrimitiveField() { + return primitiveField; } } diff --git a/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java b/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java index 452d5c2..ea0af44 100644 --- a/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java +++ b/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java @@ -38,6 +38,7 @@ package configuration.field.primitiveorwrapper; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.fail; +import static org.junit.Assert.assertNull; import javax.inject.Inject; @@ -75,6 +76,9 @@ public class ConfigurationPrimitiveOrWrapperFieldTest { @Inject private SystemPrimitiveOrWrapperErrorFieldConfig systemErrorConfig; + @Inject + private PropertiesNullWrappedField nullWrappedField; + @Deployment public static JavaArchive createDeployment() { JavaArchive deployment = Tests.createDeployment(ConfigurationPrimitiveOrWrapperFieldTest.class); @@ -85,92 +89,98 @@ public class ConfigurationPrimitiveOrWrapperFieldTest { @BeforeClass public static void afterClass() { - System.setProperty("primitiveInteger", String.valueOf(1)); - System.setProperty("emptyPrimitiveInteger", String.valueOf("")); - System.setProperty("errorPrimitiveInteger", String.valueOf("a")); - System.setProperty("wrappedInteger", String.valueOf(2)); - System.setProperty("emptyWrappedInteger", String.valueOf("")); - System.setProperty("errorWrappedInteger", String.valueOf("a")); + System.setProperty("primitiveField", String.valueOf(1)); + System.setProperty("emptyPrimitiveField", String.valueOf("")); + System.setProperty("errorPrimitiveField", String.valueOf("a")); + System.setProperty("wrappedField", String.valueOf(2)); + System.setProperty("emptyWrappedField", String.valueOf("")); + System.setProperty("errorWrappedField", String.valueOf("a")); } @Test - public void loadPrimitiveInteger() { + public void loadPrimitiveField() { int expected = 1; - assertEquals(expected, systemConfig.getPrimitiveInteger()); - assertEquals(expected, propertiesConfig.getPrimitiveInteger()); - assertEquals(expected, xmlConfig.getPrimitiveInteger()); + assertEquals(expected, systemConfig.getPrimitiveField()); + assertEquals(expected, propertiesConfig.getPrimitiveField()); + assertEquals(expected, xmlConfig.getPrimitiveField()); } @Test - public void loadWrappedInteger() { + public void loadWrappedField() { Integer expected = 2; - assertEquals(expected, systemConfig.getWrappedInteger()); - assertEquals(expected, propertiesConfig.getWrappedInteger()); - assertEquals(expected, xmlConfig.getWrappedInteger()); + assertEquals(expected, systemConfig.getWrappedField()); + assertEquals(expected, propertiesConfig.getWrappedField()); + assertEquals(expected, xmlConfig.getWrappedField()); } @Test - public void loadEmptyPrimitiveInteger() { + public void loadEmptyPrimitiveField() { try { - systemErrorConfig.getEmptyPrimitiveInteger(); + systemErrorConfig.getEmptyPrimitiveField(); + fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - propertiesErrorConfig.getEmptyPrimitiveInteger(); + propertiesErrorConfig.getEmptyPrimitiveField(); + fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - propertiesErrorConfig.getEmptyPrimitiveInteger(); + propertiesErrorConfig.getEmptyPrimitiveField(); + fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } } @Test - public void loadNullWrappedInteger() { + public void loadEmptyWrappedField() { try { - systemErrorConfig.getEmptyWrappedInteger(); + systemErrorConfig.getEmptyWrappedField(); + fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - propertiesErrorConfig.getEmptyWrappedInteger(); + propertiesErrorConfig.getEmptyWrappedField(); + fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - propertiesErrorConfig.getEmptyWrappedInteger(); + propertiesErrorConfig.getEmptyWrappedField(); + fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } } @Test - public void loadErrorPrimitiveInteger() { + public void loadErrorPrimitiveField() { try { - propertiesErrorConfig.getErrorPrimitiveInteger(); + propertiesErrorConfig.getConversionErrorPrimitiveField(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - propertiesErrorConfig.getErrorPrimitiveInteger(); + propertiesErrorConfig.getConversionErrorPrimitiveField(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - xmlErrorConfig.getErrorPrimitiveInteger(); + xmlErrorConfig.getConversionErrorPrimitiveField(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); @@ -178,26 +188,31 @@ public class ConfigurationPrimitiveOrWrapperFieldTest { } @Test - public void loadErrorWrappedInteger() { + public void loadErrorWrappedField() { try { - propertiesErrorConfig.getErrorWrappedInteger(); + propertiesErrorConfig.getConversionErrorWrappedField(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - propertiesErrorConfig.getErrorWrappedInteger(); + propertiesErrorConfig.getConversionErrorWrappedField(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } try { - xmlErrorConfig.getErrorWrappedInteger(); + xmlErrorConfig.getConversionErrorWrappedField(); fail(); } catch (ConfigurationException cause) { assertEquals(ConversionException.class, cause.getCause().getClass()); } } + + @Test + public void loadNullWrappedField(){ + assertNull(nullWrappedField.getNullWrappedField()); + } } diff --git a/impl/core/src/test/java/configuration/field/primitiveorwrapper/PropertiesNullWrappedField.java b/impl/core/src/test/java/configuration/field/primitiveorwrapper/PropertiesNullWrappedField.java new file mode 100644 index 0000000..85656ad --- /dev/null +++ b/impl/core/src/test/java/configuration/field/primitiveorwrapper/PropertiesNullWrappedField.java @@ -0,0 +1,13 @@ +package configuration.field.primitiveorwrapper; + +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration +public class PropertiesNullWrappedField { + + private Integer nullWrappedField; + + public Integer getNullWrappedField() { + return nullWrappedField; + } +} 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 8fb4170..ec0e73f 100644 --- a/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties +++ b/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties @@ -33,9 +33,9 @@ # ou escreva para a Fundação do Software Livre (FSF) Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. -primitiveInteger=1 -emptyPrimitiveInteger= -errorPrimitiveInteger=a -wrappedInteger=2 -aemptyWrappedInteger= -errorWrappedInteger=a \ No newline at end of file +primitiveField=1 +emptyPrimitiveField= +conversionErrorPrimitiveField=a +wrappedField=2 +emptyWrappedField= +conversionErrorWrappedField=a \ No newline at end of file diff --git a/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.xml b/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.xml index c4417be..8372539 100644 --- a/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.xml +++ b/impl/core/src/test/resources/configuration/field/primitiveorwrapper/demoiselle.xml @@ -36,10 +36,10 @@ --> - 1 - - a - 2 - - a + 1 + + a + 2 + + a -- libgit2 0.21.2