From c602e2d98daf4a84dfce9a1fb438a14a4406e787 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Fri, 22 Mar 2013 10:58:55 -0300 Subject: [PATCH] Implementando os testes de configurações do tipo Array --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java | 3 --- impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/AbstractArrayFieldConfig.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/ConfigurationArrayFieldTest.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/PropertiesArrayFieldConfig.java | 8 ++++++++ impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java | 120 ------------------------------------------------------------------------------------------------------------------------ impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java | 1 - impl/core/src/test/resources/configuration/field/array/demoiselle.properties | 1 + 7 files changed, 114 insertions(+), 124 deletions(-) create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/AbstractArrayFieldConfig.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/ConfigurationArrayFieldTest.java create mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/PropertiesArrayFieldConfig.java delete mode 100644 impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java create mode 100644 impl/core/src/test/resources/configuration/field/array/demoiselle.properties diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java index abf530a..b1d72a6 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/AbstractConfigurationTest.java @@ -43,9 +43,6 @@ public abstract class AbstractConfigurationTest { .create(JavaArchive.class) .addClasses(getConfigurationClasses()) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsResource( - new FileAsset(new File("src/test/resources/configuration/fields/basic/demoiselle.properties")), - "demoiselle.properties") .addAsManifestResource( new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), "services/javax.enterprise.inject.spi.Extension"); diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/AbstractArrayFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/AbstractArrayFieldConfig.java new file mode 100644 index 0000000..1303df5 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/AbstractArrayFieldConfig.java @@ -0,0 +1,54 @@ +package br.gov.frameworkdemoiselle.configuration.field.array; + +public abstract class AbstractArrayFieldConfig { + + private int[] primitiveIntegers; + + private Integer[] wrappedIntegers; + + private String[] strings; + + private double[] primitiveDoubles; + + private Double[] wrappedDoubles; + + public int[] getPrimitiveIntegers() { + return primitiveIntegers; + } + + public void setPrimitiveIntegers(int[] primitiveIntegers) { + this.primitiveIntegers = primitiveIntegers; + } + + public Integer[] getWrappedIntegers() { + return wrappedIntegers; + } + + public void setWrappedIntegers(Integer[] wrappedIntegers) { + this.wrappedIntegers = wrappedIntegers; + } + + public String[] getStrings() { + return strings; + } + + public void setStrings(String[] strings) { + this.strings = strings; + } + + public double[] getPrimitiveDoubles() { + return primitiveDoubles; + } + + public void setPrimitiveDoubles(double[] primitiveDoubles) { + this.primitiveDoubles = primitiveDoubles; + } + + public Double[] getWrappedDoubles() { + return wrappedDoubles; + } + + public void setWrappedDoubles(Double[] wrappedDoubles) { + this.wrappedDoubles = wrappedDoubles; + } +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/ConfigurationArrayFieldTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/ConfigurationArrayFieldTest.java new file mode 100644 index 0000000..641c3f0 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/ConfigurationArrayFieldTest.java @@ -0,0 +1,51 @@ +package br.gov.frameworkdemoiselle.configuration.field.array; + +import static org.junit.Assert.assertArrayEquals; + +import java.io.File; + +import javax.inject.Inject; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.asset.FileAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest; + +@RunWith(Arquillian.class) +public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { + + @Inject + private PropertiesArrayFieldConfig propertiesConfig; + + @Deployment + public static JavaArchive createDeployment() { + JavaArchive deployment = createConfigurationDeployment(); + + deployment.addPackages(true, ConfigurationArrayFieldTest.class.getPackage()); + deployment.addAsResource(new FileAsset(new File( + "src/test/resources/configuration/field/array/demoiselle.properties")), "demoiselle.properties"); + + return deployment; + } + + @Test + public void loadPrimitiveInteger() { + int[] expected = { 1, 20, 0 }; + + assertArrayEquals(expected, propertiesConfig.getPrimitiveIntegers()); + } + + // private int[] primitiveIntegers; + + // private Integer[] wrappedIntegers; + // + // private String[] strings; + // + // private double[] primitiveDoubles; + // + // private Double[] wrappedDoubles; +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/PropertiesArrayFieldConfig.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/PropertiesArrayFieldConfig.java new file mode 100644 index 0000000..1eea0c1 --- /dev/null +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/array/PropertiesArrayFieldConfig.java @@ -0,0 +1,8 @@ +package br.gov.frameworkdemoiselle.configuration.field.array; + +import static br.gov.frameworkdemoiselle.configuration.ConfigType.PROPERTIES; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(type = PROPERTIES) +public class PropertiesArrayFieldConfig extends AbstractArrayFieldConfig { +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java deleted file mode 100644 index 9fcd0af..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java +++ /dev/null @@ -1,120 +0,0 @@ -package br.gov.frameworkdemoiselle.util; -///* -// * 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.util; -// -//import static junit.framework.Assert.assertEquals; -//import static org.easymock.EasyMock.expect; -//import static org.powermock.api.easymock.PowerMock.replayAll; -//import static org.powermock.api.easymock.PowerMock.verifyAll; -// -//import java.util.HashSet; -//import java.util.Set; -// -//import javax.enterprise.context.spi.Contextual; -//import javax.enterprise.context.spi.CreationalContext; -//import javax.enterprise.inject.spi.Bean; -//import javax.enterprise.inject.spi.BeanManager; -// -//import org.easymock.EasyMock; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.powermock.api.easymock.PowerMock; -//import org.powermock.core.classloader.annotations.PrepareForTest; -//import org.powermock.modules.junit4.PowerMockRunner; -// -//@RunWith(PowerMockRunner.class) -//@PrepareForTest({ BeanManager.class, Bean.class }) -//public class BeansTest { -// -// @SuppressWarnings("unchecked") -// @Test -// public void testGetReferenceByClass() { -// BeanManager beanManager = PowerMock.createMock(BeanManager.class); -// -// Set> collection = new HashSet>(); -// Bean bean = PowerMock.createMock(Bean.class); -// collection.add(bean); -// -// String object = "object"; -// -// expect(beanManager.createCreationalContext(EasyMock.anyObject(Contextual.class))).andReturn(null); -// expect(beanManager.getBeans(EasyMock.anyObject(Class.class))).andReturn(collection); -// expect( -// beanManager.getReference(EasyMock.anyObject(Bean.class), EasyMock.anyObject(Class.class), -// EasyMock.anyObject(CreationalContext.class))).andReturn(object); -// -// replayAll(beanManager, bean); -// -// Beans.setBeanManager(beanManager); -// String returned = Beans.getReference(String.class); -// -// assertEquals(returned, object); -// assertEquals(beanManager, Beans.getBeanManager()); -// -// verifyAll(); -// } -// -// @Test -// @SuppressWarnings("unchecked") -// public void testGetReferenceByString() { -// BeanManager beanManager = PowerMock.createMock(BeanManager.class); -// -// Set> collection = new HashSet>(); -// Bean bean = PowerMock.createMock(Bean.class); -// collection.add(bean); -// -// String object = "object"; -// -// expect(bean.getBeanClass()).andReturn(null); -// expect(beanManager.createCreationalContext(EasyMock.anyObject(Contextual.class))).andReturn(null); -// expect(beanManager.getBeans("something")).andReturn(collection); -// expect( -// beanManager.getReference(EasyMock.anyObject(Bean.class), EasyMock.anyObject(Class.class), -// EasyMock.anyObject(CreationalContext.class))).andReturn(object); -// -// replayAll(beanManager, bean); -// -// Beans.setBeanManager(beanManager); -// String returned = Beans.getReference("something"); -// -// assertEquals(returned, object); -// assertEquals(beanManager, Beans.getBeanManager()); -// -// verifyAll(); -// } -//} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java index 006b00c..24d7a7d 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java @@ -199,5 +199,4 @@ public class StringsTest { assertEquals("0" + string, Strings.insertZeros(string, string.length() + 1)); assertEquals("00" + string, Strings.insertZeros(string, string.length() + 2)); } - } diff --git a/impl/core/src/test/resources/configuration/field/array/demoiselle.properties b/impl/core/src/test/resources/configuration/field/array/demoiselle.properties new file mode 100644 index 0000000..cc02bfd --- /dev/null +++ b/impl/core/src/test/resources/configuration/field/array/demoiselle.properties @@ -0,0 +1 @@ +primitiveIntegers=1,20,0 -- libgit2 0.21.2