From 6eb182ad0b20c2242902335ea38e1d1451299d3e Mon Sep 17 00:00:00 2001 From: Ednara Oliveira Date: Thu, 11 Apr 2013 12:49:37 -0300 Subject: [PATCH] Teste com arquivo XML --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/ConfigurationMapFieldTest.java | 21 +++++++++++++++------ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/XMLMapFieldConfig.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ impl/core/src/test/resources/configuration/field/map/demoiselle.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/XMLMapFieldConfig.java create mode 100644 impl/core/src/test/resources/configuration/field/map/demoiselle.xml diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/ConfigurationMapFieldTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/ConfigurationMapFieldTest.java index 9789c40..58159b9 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/ConfigurationMapFieldTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/ConfigurationMapFieldTest.java @@ -60,13 +60,19 @@ public class ConfigurationMapFieldTest extends AbstractConfigurationTest { @Inject private PropertiesMapFieldConfig propertiesConfig; + @Inject + private XMLMapFieldConfig xmlConfig; + @Deployment public static JavaArchive createDeployment() { JavaArchive deployment = createConfigurationDeployment(); deployment.addPackages(true, ConfigurationMapFieldTest.class.getPackage()); - deployment.addAsResource(new FileAsset(new File( - "src/test/resources/configuration/field/map/demoiselle.properties")), "demoiselle.properties"); + deployment + .addAsResource( + new FileAsset(new File("src/test/resources/configuration/field/map/demoiselle.properties")), "demoiselle.properties") + .addAsResource( + new FileAsset(new File("src/test/resources/configuration/field/map/demoiselle.xml")), "demoiselle.xml"); return deployment; } @@ -78,6 +84,7 @@ public class ConfigurationMapFieldTest extends AbstractConfigurationTest { expected.put("item2", "framework"); assertEquals(expected, propertiesConfig.getStringWithDefinedKeyMap()); + assertEquals(expected, xmlConfig.getStringWithDefinedKeyMap()); } @Test @@ -86,13 +93,15 @@ public class ConfigurationMapFieldTest extends AbstractConfigurationTest { expected.put("default", "undefined"); assertEquals(expected, propertiesConfig.getStringWithUndefinedKeyMap()); + assertEquals(expected, xmlConfig.getStringWithUndefinedKeyMap()); } - + @Test public void loadEmptyKeyMapString() { Map expected = new HashMap(); - + assertEquals(expected, propertiesConfig.getEmptyValueMap()); - } - + assertEquals(expected, xmlConfig.getEmptyValueMap()); + } + } diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/XMLMapFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/XMLMapFieldConfig.java new file mode 100644 index 0000000..090e37e --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/map/XMLMapFieldConfig.java @@ -0,0 +1,44 @@ +/* + * 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 br.gov.frameworkdemoiselle.configuration.field.map; + +import br.gov.frameworkdemoiselle.configuration.ConfigType; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = ConfigType.XML) +public class XMLMapFieldConfig extends AbstractMapFieldConfig { +} diff --git a/impl/core/src/test/resources/configuration/field/map/demoiselle.xml b/impl/core/src/test/resources/configuration/field/map/demoiselle.xml new file mode 100644 index 0000000..b56d7e5 --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/map/demoiselle.xml @@ -0,0 +1,54 @@ + + + + + demoiselle + + + framework + + undefined + + + + + + + + + -- libgit2 0.21.2