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 17:05:14 UTC
svn commit: r1083854 - in /myfaces/extensions/cdi/trunk/test-modules: base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/ base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/ bas...

Author: gpetracek
Date: Mon Mar 21 16:05:13 2011
New Revision: 1083854

URL: http://svn.apache.org/viewvc?rev=1083854&view=rev
Log:
EXTCDI-157 cleanup

Added:
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletContainerAwareCdiTestContainer.java
      - copied, changed from r1083851, myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java
Removed:
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java
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/AbstractServletAwareTest.java
    myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.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=1083854&r1=1083853&r2=1083854&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 16:05:13 2011
@@ -20,7 +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.ServletAwareCdiTestContainer;
+import org.apache.myfaces.extensions.cdi.test.spi.ServletContainerAwareCdiTestContainer;
 import org.apache.myfaces.extensions.cdi.test.spi.TestContainer;
 import org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer;
 import org.apache.myfaces.extensions.cdi.test.spi.WebAppTestContainer;
@@ -49,7 +49,7 @@ public class TestContainerFactory
         {
             return (T)getNewJsfTestContainer();
         }
-        if(ServletAwareCdiTestContainer.class.isAssignableFrom(expectedContainer))
+        if(ServletContainerAwareCdiTestContainer.class.isAssignableFrom(expectedContainer))
         {
             return (T)getNewCdiTestContainer(true);
         }
@@ -139,6 +139,6 @@ public class TestContainerFactory
 
     private static boolean isServletContextAwareContainer(CdiTestContainer testContainer)
     {
-        return ServletAwareCdiTestContainer.class.isAssignableFrom(testContainer.getClass());
+        return ServletContainerAwareCdiTestContainer.class.isAssignableFrom(testContainer.getClass());
     }
 }

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=1083854&r1=1083853&r2=1083854&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 16:05:13 2011
@@ -19,7 +19,7 @@
 package org.apache.myfaces.extensions.cdi.test.junit4;
 
 import org.apache.myfaces.extensions.cdi.test.TestContainerFactory;
-import org.apache.myfaces.extensions.cdi.test.spi.ServletAwareCdiTestContainer;
+import org.apache.myfaces.extensions.cdi.test.spi.ServletContainerAwareCdiTestContainer;
 import org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer;
 import org.junit.After;
 import org.junit.Before;
@@ -39,13 +39,13 @@ public abstract class AbstractServletAwa
     @Before
     public void before()
     {
-        this.testContainer = TestContainerFactory.createTestContainer(ServletAwareCdiTestContainer.class);
+        this.testContainer = TestContainerFactory.createTestContainer(ServletContainerAwareCdiTestContainer.class);
 
         this.testContainer.initEnvironment();
         this.testContainer.startContainer();
         this.testContainer.startContexts();
-        ((ServletAwareCdiTestContainer)this.testContainer).startSession();
-        ((ServletAwareCdiTestContainer)this.testContainer).startRequest();
+        ((ServletContainerAwareCdiTestContainer)this.testContainer).startSession();
+        ((ServletContainerAwareCdiTestContainer)this.testContainer).startRequest();
 
         this.testContainer.injectFields(this);
     }
@@ -56,8 +56,8 @@ public abstract class AbstractServletAwa
     @After
     public void after()
     {
-        ((ServletAwareCdiTestContainer)this.testContainer).stopRequest();
-        ((ServletAwareCdiTestContainer)this.testContainer).stopSession();
+        ((ServletContainerAwareCdiTestContainer)this.testContainer).stopRequest();
+        ((ServletContainerAwareCdiTestContainer)this.testContainer).stopSession();
         this.testContainer.stopContexts();
         this.testContainer.stopContainer();
     }

Copied: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletContainerAwareCdiTestContainer.java (from r1083851, myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.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/spi/ServletContainerAwareCdiTestContainer.java?p2=myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletContainerAwareCdiTestContainer.java&p1=myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java&r1=1083851&r2=1083854&rev=1083854&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletContainerAwareCdiTestContainer.java Mon Mar 21 16:05:13 2011
@@ -23,7 +23,7 @@ package org.apache.myfaces.extensions.cd
  *
  * @author Gerhard Petracek
  */
-public interface ServletAwareCdiTestContainer extends CdiTestContainer
+public interface ServletContainerAwareCdiTestContainer extends CdiTestContainer
 {
     /**
      * Starts a new {@link javax.servlet.http.HttpSessionEvent}

Modified: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java?rev=1083854&r1=1083853&r2=1083854&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java Mon Mar 21 16:05:13 2011
@@ -18,14 +18,14 @@
  */
 package org.apache.myfaces.extensions.cdi.test.owb;
 
-import org.apache.myfaces.extensions.cdi.test.spi.ServletAwareCdiTestContainer;
+import org.apache.myfaces.extensions.cdi.test.spi.ServletContainerAwareCdiTestContainer;
 import org.apache.webbeans.cditest.CdiTestContainerLoader;
 
 /**
  * @author Gerhard Petracek
  */
 public class ServletOpenWebBeans10TestContainer
-        extends AbstractOpenWebBeans10TestContainer implements ServletAwareCdiTestContainer
+        extends AbstractOpenWebBeans10TestContainer implements ServletContainerAwareCdiTestContainer
 {
     public ServletOpenWebBeans10TestContainer()
     {