From 6af81f592daff4268fe1d770ee004b7247e1a940 Mon Sep 17 00:00:00 2001 From: Thiago Mariano Date: Wed, 5 Sep 2012 17:01:12 -0300 Subject: [PATCH] Refatoração dos testes unitários do Configuration --- impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithArrayTest.java | 5 ----- impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithListTest.java | 35 ++++++++++++++++++----------------- impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfigTest.java | 2 +- impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java | 1 - 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithArrayTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithArrayTest.java index 36243fa..0143ff0 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithArrayTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithArrayTest.java @@ -36,11 +36,9 @@ */ package br.gov.frameworkdemoiselle.internal.configuration; -import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replay; import java.awt.Color; import java.math.BigDecimal; @@ -58,14 +56,11 @@ import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; -import org.slf4j.Logger; import br.gov.frameworkdemoiselle.configuration.ConfigType; import br.gov.frameworkdemoiselle.configuration.Configuration; import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap; import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.ResourceBundle; @RunWith(PowerMockRunner.class) @PrepareForTest(Beans.class) diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithListTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithListTest.java index 96b23ef..cb07e96 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithListTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithListTest.java @@ -36,10 +36,9 @@ */ package br.gov.frameworkdemoiselle.internal.configuration; -import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; -import static org.powermock.api.easymock.PowerMock.replay; +import static org.powermock.api.easymock.PowerMock.mockStatic; import java.awt.Color; import java.math.BigDecimal; @@ -53,21 +52,19 @@ import java.util.Locale; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; 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; -import org.powermock.reflect.Whitebox; -import org.slf4j.Logger; import br.gov.frameworkdemoiselle.configuration.ConfigType; import br.gov.frameworkdemoiselle.configuration.Configuration; import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap; -import br.gov.frameworkdemoiselle.util.ResourceBundle; +import br.gov.frameworkdemoiselle.util.Beans; -@Ignore @RunWith(PowerMockRunner.class) +@PrepareForTest(Beans.class) public class ConfigurationLoaderWithListTest { private ConfigurationLoader configurationLoader; @@ -150,13 +147,7 @@ public class ConfigurationLoaderWithListTest { @Before public void setUp() throws Exception { - Logger logger; - ResourceBundle bundle; - logger = PowerMock.createMock(Logger.class); - bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault()); configurationLoader = new ConfigurationLoader(); - Whitebox.setInternalState(this.configurationLoader, "bundle", bundle); - Whitebox.setInternalState(this.configurationLoader, "logger", logger); } @After @@ -342,12 +333,17 @@ public class ConfigurationLoaderWithListTest { } private ConfigurationPropertiesWithList prepareConfigurationPropertiesWithList() { + mockStatic(Beans.class); + CoreBootstrap coreBootstrap = PowerMock.createMock(CoreBootstrap.class); + + expect(Beans.getReference(CoreBootstrap.class)).andReturn(coreBootstrap); + expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()); + ConfigurationPropertiesWithList config = new ConfigurationPropertiesWithList(); - CoreBootstrap coreBootstrap = createMock(CoreBootstrap.class); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - replay(coreBootstrap); + PowerMock.replayAll(CoreBootstrap.class,Beans.class); configurationLoader.load(config); return config; @@ -532,12 +528,17 @@ public class ConfigurationLoaderWithListTest { } private ConfigurationXMLWithList prepareConfigurationXMLWithList() { + mockStatic(Beans.class); + CoreBootstrap coreBootstrap = PowerMock.createMock(CoreBootstrap.class); + + expect(Beans.getReference(CoreBootstrap.class)).andReturn(coreBootstrap); + expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()); + ConfigurationXMLWithList config = new ConfigurationXMLWithList(); - CoreBootstrap coreBootstrap = createMock(CoreBootstrap.class); expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); - replay(coreBootstrap); + PowerMock.replayAll(CoreBootstrap.class,Beans.class); configurationLoader.load(config); return config; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfigTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfigTest.java index 33e8127..1110081 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfigTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfigTest.java @@ -37,7 +37,7 @@ package br.gov.frameworkdemoiselle.internal.configuration; import static org.junit.Assert.assertEquals; -import org.junit.Ignore; + import org.junit.Before; import org.junit.Test; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java index b4962c5..deb56a1 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java @@ -1,6 +1,5 @@ package br.gov.frameworkdemoiselle.internal.configuration; -import org.junit.Ignore; import static org.junit.Assert.assertEquals; import org.junit.Before; -- libgit2 0.21.2