From a5fd4ba2f3f3708979e53db2cc3064698f44fdac Mon Sep 17 00:00:00 2001 From: Emerson Oliveira Date: Wed, 3 Apr 2013 17:01:25 -0300 Subject: [PATCH] Adicionados mais testes para carregamento de valores default de configurações --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/AbstractDefaultValueConfig.java | 4 ++-- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java | 13 +++++-------- impl/core/src/test/resources/configuration/field/default/demoiselle.properties | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/AbstractDefaultValueConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/AbstractDefaultValueConfig.java index 39c47a4..e1f599f 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/AbstractDefaultValueConfig.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/AbstractDefaultValueConfig.java @@ -39,9 +39,9 @@ package br.gov.frameworkdemoiselle.configuration.defaultvalue; public abstract class AbstractDefaultValueConfig { - private String stringDefaultWithoutKey = "Valor inicializado e sem chave em arquivo de propriedade"; + private String stringDefaultWithoutKey = "Initialized value and without key in the property file"; - private String stringDefaultWithKey = "Valor inicializado e com chave em arquivo de propriedade"; + private String stringDefaultWithKey = "Initialized value and key in the property file"; public String getStringDefaultWithoutKey() { return stringDefaultWithoutKey; 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 e412e30..9c1cb9b 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 @@ -81,20 +81,17 @@ public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { @Test public void loadDefaultValueWithoutKey(){ - String expected = "Valor inicializado e sem chave em arquivo de propriedade"; + String expected = "Initialized value and without key in the property file"; assertEquals(expected, filledFieldConfig.getStringDefaultWithoutKey()); assertEquals(expected, emptyFieldsConfig.getStringDefaultWithoutKey()); assertEquals(expected, noFileConfig.getStringDefaultWithoutKey()); } - @Ignore - @Test(expected = ConfigurationException.class) - /*TODO: Lançar exceção quando uma chave adicionada em arquivo de configuração não - * tiver valor associado*/ + @Test public void loadDefaultValueWithKey(){ - assertEquals("Valor inicializado do arquivo de propriedade", filledFieldConfig.getStringDefaultWithKey()); - assertEquals("Valor inicializado e com chave em arquivo de propriedade", noFileConfig.getStringDefaultWithKey()); - emptyFieldsConfig.getStringDefaultWithKey(); + assertEquals("Initialized value of the property file", filledFieldConfig.getStringDefaultWithKey()); + assertEquals("Initialized value and key in the property file", noFileConfig.getStringDefaultWithKey()); + assertEquals("", emptyFieldsConfig.getStringDefaultWithKey()); } } diff --git a/impl/core/src/test/resources/configuration/field/default/demoiselle.properties b/impl/core/src/test/resources/configuration/field/default/demoiselle.properties index 7db3348..1ca0377 100644 --- a/impl/core/src/test/resources/configuration/field/default/demoiselle.properties +++ b/impl/core/src/test/resources/configuration/field/default/demoiselle.properties @@ -33,4 +33,4 @@ # ou escreva para a Fundação do Software Livre (FSF) Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. -stringDefaultWithKey=Valor inicializado do arquivo de propriedade +stringDefaultWithKey=Initialized value of the property file -- libgit2 0.21.2