You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/03/21 15:12:11 UTC
svn commit: r1083792 - in
/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test:
./ junit4/
Author: gpetracek
Date: Mon Mar 21 14:12:11 2011
New Revision: 1083792
URL: http://svn.apache.org/viewvc?rev=1083792&view=rev
Log:
EXTCDI-157 TestContainerFactory refactoring
Modified:
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java?rev=1083792&r1=1083791&r2=1083792&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java Mon Mar 21 14:12:11 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.ConfiguredValueDescriptor;
import org.apache.myfaces.extensions.cdi.core.impl.config.ServiceLoaderResolver;
+import org.apache.myfaces.extensions.cdi.test.spi.TestContainer;
import org.apache.myfaces.extensions.cdi.test.spi.WebAppAwareCdiTestContainer;
import org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer;
import org.apache.myfaces.extensions.cdi.test.spi.WebAppTestContainer;
@@ -31,7 +32,20 @@ import java.util.List;
*/
public class TestContainerFactory
{
- public static WebAppTestContainer getNewJsfTestContainer()
+ public static <T extends TestContainer> T createTestContainer(Class<T> expectedContainer)
+ {
+ if(WebAppTestContainer.class.isAssignableFrom(expectedContainer))
+ {
+ return (T)getNewJsfTestContainer();
+ }
+ if(WebAppAwareCdiTestContainer.class.isAssignableFrom(expectedContainer))
+ {
+ return (T)getNewCdiTestContainer(true);
+ }
+ return (T)getNewCdiTestContainer(false);
+ }
+
+ private static WebAppTestContainer getNewJsfTestContainer()
{
List<WebAppTestContainer> testContainers =
new ServiceLoaderResolver()
@@ -69,7 +83,7 @@ public class TestContainerFactory
return testContainers.iterator().next();
}
- public static CdiTestContainer getNewCdiTestContainer(boolean createServletContext /*TODO*/)
+ private static CdiTestContainer getNewCdiTestContainer(boolean createServletContext /*TODO*/)
{
List<CdiTestContainer> testContainers =
new ServiceLoaderResolver().resolveInstances(new ConfiguredValueDescriptor<String, CdiTestContainer>()
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java?rev=1083792&r1=1083791&r2=1083792&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java Mon Mar 21 14:12:11 2011
@@ -35,7 +35,7 @@ public abstract class AbstractCdiAwareTe
@Before
public void before() throws Exception
{
- this.testContainer = TestContainerFactory.getNewCdiTestContainer(false);
+ this.testContainer = TestContainerFactory.createTestContainer(CdiTestContainer.class);
this.testContainer.initEnvironment();
this.testContainer.startContainer();
this.testContainer.startContexts();
@@ -47,6 +47,6 @@ public abstract class AbstractCdiAwareTe
public void after() throws Exception
{
this.testContainer.stopContexts();
- this.testContainer.startContainer();
+ this.testContainer.stopContainer();
}
}
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java?rev=1083792&r1=1083791&r2=1083792&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java Mon Mar 21 14:12:11 2011
@@ -34,7 +34,7 @@ public abstract class AbstractJsfAwareTe
@Before
public void before() throws Exception
{
- this.webAppTestContainer = TestContainerFactory.getNewJsfTestContainer();
+ this.webAppTestContainer = TestContainerFactory.createTestContainer(WebAppTestContainer.class);
this.webAppTestContainer.initEnvironment();
this.webAppTestContainer.startContainer();
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java?rev=1083792&r1=1083791&r2=1083792&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java Mon Mar 21 14:12:11 2011
@@ -36,7 +36,7 @@ public abstract class AbstractServletAwa
@Before
public void before() throws Exception
{
- this.testContainer = TestContainerFactory.getNewCdiTestContainer(true);
+ this.testContainer = TestContainerFactory.createTestContainer(WebAppAwareCdiTestContainer.class);
this.testContainer.initEnvironment();
this.testContainer.startContainer();