From 14aefe365931f6859ddf0f12a1b912160a5e9ccd Mon Sep 17 00:00:00 2001 From: Emerson Oliveira Date: Mon, 25 Mar 2013 13:49:59 -0300 Subject: [PATCH] Ajustes nos arquivos de propriedades utilizados pelos testes de valor padrão das configurações --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java | 9 +++++---- impl/core/src/test/resources/configuration/field/basic/demoiselle.properties | 1 - impl/core/src/test/resources/configuration/field/basic/demoiselle.xml | 1 - impl/core/src/test/resources/configuration/field/default/demoiselle.properties | 35 +++++++++++++++++++++++++++++++++++ impl/core/src/test/resources/configuration/field/default/demoiselle.xml | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 impl/core/src/test/resources/configuration/field/default/demoiselle.properties create mode 100644 impl/core/src/test/resources/configuration/field/default/demoiselle.xml 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 9047a6d..2bff9ca 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 @@ -50,6 +50,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest; +import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { @@ -69,9 +70,9 @@ public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { deployment.addPackages(true, ConfigurationDefaultValueTest.class.getPackage()); deployment.addAsResource( - new FileAsset(new File("src/test/resources/configuration/field/basic/demoiselle.properties")), + new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.properties")), "demoiselle.properties").addAsResource( - new FileAsset(new File("src/test/resources/configuration/field/basic/demoiselle.xml")), + new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.xml")), "demoiselle.xml"); return deployment; @@ -86,7 +87,7 @@ public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { assertEquals(expected, noFileConfig.getStringDefaultWithoutKey()); } - //@Test(expected = ConfigurationException.class) + @Test//(expected = ConfigurationException.class) /*TODO: Lançar exceção quando uma chave adicionada em arquivo de configuração não * tiver valor associado*/ public void loadDefaultValueWithKey(){ @@ -95,6 +96,6 @@ public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { assertEquals(expectedFilled, filledFieldConfig.getStringDefaultWithKey()); assertEquals(expectedNoFile, noFileConfig.getStringDefaultWithKey()); - emptyFieldsConfig.getStringDefaultWithKey(); + //emptyFieldsConfig.getStringDefaultWithKey(); } } diff --git a/impl/core/src/test/resources/configuration/field/basic/demoiselle.properties b/impl/core/src/test/resources/configuration/field/basic/demoiselle.properties index 15c358e..d923a9b 100644 --- a/impl/core/src/test/resources/configuration/field/basic/demoiselle.properties +++ b/impl/core/src/test/resources/configuration/field/basic/demoiselle.properties @@ -37,4 +37,3 @@ primitiveInteger=1 wrappedInteger=2 stringWithSpace=demoiselle framework stringWithComma=demoiselle,framework -stringDefaultWithKey=Valor inicializado do arquivo de propriedade diff --git a/impl/core/src/test/resources/configuration/field/basic/demoiselle.xml b/impl/core/src/test/resources/configuration/field/basic/demoiselle.xml index 7ea200a..4396b91 100644 --- a/impl/core/src/test/resources/configuration/field/basic/demoiselle.xml +++ b/impl/core/src/test/resources/configuration/field/basic/demoiselle.xml @@ -39,5 +39,4 @@ 2 demoiselle framework demoiselle,framework - \ No newline at end of file diff --git a/impl/core/src/test/resources/configuration/field/default/demoiselle.properties b/impl/core/src/test/resources/configuration/field/default/demoiselle.properties new file mode 100644 index 0000000..15a2a22 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/default/demoiselle.properties @@ -0,0 +1,35 @@ +# 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. +stringDefaultWithKey=Valor inicializado do arquivo de propriedade diff --git a/impl/core/src/test/resources/configuration/field/default/demoiselle.xml b/impl/core/src/test/resources/configuration/field/default/demoiselle.xml new file mode 100644 index 0000000..2ba37e1 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/default/demoiselle.xml @@ -0,0 +1,39 @@ + + + + \ No newline at end of file -- libgit2 0.21.2