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 2010/12/26 17:20:05 UTC
svn commit: r1052910 - in /myfaces/extensions/cdi/trunk/test-modules: base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/base/cargo/ base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/...

Author: gpetracek
Date: Sun Dec 26 16:20:04 2010
New Revision: 1052910

URL: http://svn.apache.org/viewvc?rev=1052910&view=rev
Log:
EXTCDI-105 refactored packages

Added:
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/
      - copied from r1052854, myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/base/cargo/
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/
      - copied from r1052854, myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/base/junit4/
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/junit4/
      - copied from r1052854, myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/base/junit4/
Removed:
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/base/cargo/
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/base/junit4/
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/base/junit4/
Modified:
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractCargoTest.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/TestConfiguration.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.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
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractTest.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridCdiTestOpenWebBeansContainer.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridStandaloneLifeCycle.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/junit4/InjectedProjectStageTest.java
    myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/BaseConversationTest.java
    myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/ConversationTestCase.java

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractCargoTest.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/cargo/AbstractCargoTest.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractCargoTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractCargoTest.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.cargo;
+package org.apache.myfaces.extensions.cdi.test.cargo;
 
 import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.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/cargo/ContainerNotStartedException.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.cargo;
+package org.apache.myfaces.extensions.cdi.test.cargo;
 
 /**
  * @author Gerhard Petracek

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.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/cargo/SimplePageInteraction.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.cargo;
+package org.apache.myfaces.extensions.cdi.test.cargo;
 
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.WebClient;

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/TestConfiguration.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/cargo/TestConfiguration.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/TestConfiguration.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/TestConfiguration.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.cargo;
+package org.apache.myfaces.extensions.cdi.test.cargo;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.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/cargo/runner/JUnit4WithCargo.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.java Sun Dec 26 16:20:04 2010
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.cargo.runner;
+package org.apache.myfaces.extensions.cdi.test.cargo.runner;
 
-import org.apache.myfaces.extensions.cdi.test.base.cargo.ContainerNotStartedException;
+import org.apache.myfaces.extensions.cdi.test.cargo.ContainerNotStartedException;
 import org.junit.Ignore;
 import org.junit.internal.AssumptionViolatedException;
 import org.junit.internal.runners.model.EachTestNotifier;
@@ -66,7 +66,8 @@ public class JUnit4WithCargo extends Blo
         }
         catch (ContainerNotStartedException e)
         {
-            LOGGER.warning("In this step the container isn't started -> test result is ignored.");
+            LOGGER.fine("In this step the container isn't started -> test result is ignored for now. " +
+                    "Please make sure that the test gets executed in a later phase.");
         }
         catch (Throwable e)
         {

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=1052910&r1=1052854&r2=1052910&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 Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.junit4;
+package org.apache.myfaces.extensions.cdi.test.junit4;
 
 import org.apache.myfaces.test.mock.MockHttpServletRequest;
 import org.apache.myfaces.test.mock.MockHttpServletResponse;

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=1052910&r1=1052854&r2=1052910&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 Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.junit4;
+package org.apache.myfaces.extensions.cdi.test.junit4;
 
 import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
 import org.apache.myfaces.extensions.cdi.core.impl.projectstage.ProjectStageProducer;

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractTest.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/AbstractTest.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractTest.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.junit4;
+package org.apache.myfaces.extensions.cdi.test.junit4;
 
 import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
 import org.apache.myfaces.extensions.cdi.core.impl.projectstage.ProjectStageProducer;

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridCdiTestOpenWebBeansContainer.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/HybridCdiTestOpenWebBeansContainer.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridCdiTestOpenWebBeansContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridCdiTestOpenWebBeansContainer.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.junit4;
+package org.apache.myfaces.extensions.cdi.test.junit4;
 
 import org.apache.myfaces.test.mock.MockHttpServletRequest;
 import org.apache.webbeans.cditest.CdiTestContainer;

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridStandaloneLifeCycle.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/HybridStandaloneLifeCycle.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridStandaloneLifeCycle.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/HybridStandaloneLifeCycle.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.junit4;
+package org.apache.myfaces.extensions.cdi.test.junit4;
 
 import org.apache.myfaces.test.mock.MockHttpServletRequest;
 import org.apache.webbeans.cditest.owb.MockHttpSession;

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/junit4/InjectedProjectStageTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/junit4/InjectedProjectStageTest.java?rev=1052910&r1=1052854&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/junit4/InjectedProjectStageTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/test/java/org/apache/myfaces/extensions/cdi/test/junit4/InjectedProjectStageTest.java Sun Dec 26 16:20:04 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.test.base.junit4;
+package org.apache.myfaces.extensions.cdi.test.junit4;
 
 import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
 import org.junit.Test;

Modified: myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/BaseConversationTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/BaseConversationTest.java?rev=1052910&r1=1052909&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/BaseConversationTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/BaseConversationTest.java Sun Dec 26 16:20:04 2010
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.test.cargo.conversation;
 
-import org.apache.myfaces.extensions.cdi.test.base.cargo.AbstractCargoTest;
+import org.apache.myfaces.extensions.cdi.test.cargo.AbstractCargoTest;
 
 /**
  * @author Gerhard Petracek

Modified: myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/ConversationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/ConversationTestCase.java?rev=1052910&r1=1052909&r2=1052910&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/ConversationTestCase.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/cargo/conversation/ConversationTestCase.java Sun Dec 26 16:20:04 2010
@@ -18,8 +18,8 @@
  */
 package org.apache.myfaces.extensions.cdi.test.cargo.conversation;
 
-import org.apache.myfaces.extensions.cdi.test.base.cargo.SimplePageInteraction;
-import org.apache.myfaces.extensions.cdi.test.base.cargo.runner.JUnit4WithCargo;
+import org.apache.myfaces.extensions.cdi.test.cargo.SimplePageInteraction;
+import org.apache.myfaces.extensions.cdi.test.cargo.runner.JUnit4WithCargo;
 import org.apache.myfaces.extensions.cdi.test.cargo.view.config.Pages;
 import org.junit.Test;
 import org.junit.runner.RunWith;