[gatein-commits] gatein SVN: r237 - in components/pc/trunk: portlet/src/test/java/org/gatein/pc/test/portlet and 6 other directories.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2009-10-02 12:46:12 -0400 (Fri, 02 Oct 2009)
New Revision: 237

Added:
   components/pc/trunk/test/src/main/java/org/gatein/pc/test/portlet/
   components/pc/trunk/test/src/main/java/org/gatein/pc/test/portlet/framework/
   components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/
   components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/
   components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/
   components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr286/
   components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/session/
Removed:
   components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/framework/
   components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168/
   components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr286/
   components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/session/
   components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/unit/
Modified:
   components/pc/trunk/test/pom.xml
   components/pc/trunk/test/src/test/build.xml
Log:
GTNPC-10 : Move portlet container tests to the test maven module


Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml	2009-10-02 16:33:19 UTC (rev 236)
+++ components/pc/trunk/test/pom.xml	2009-10-02 16:46:12 UTC (rev 237)
@@ -28,12 +28,6 @@
 
       <dependency>
          <groupId>org.gatein.pc</groupId>
-         <artifactId>pc-portlet</artifactId>
-         <type>test-jar</type>
-         <classifier>tests</classifier>
-      </dependency>
-      <dependency>
-         <groupId>org.gatein.pc</groupId>
          <artifactId>pc-controller</artifactId>
       </dependency>
       <dependency>
@@ -264,7 +258,6 @@
                         <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
                         <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
                         <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
-                        <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.gatein.pc.pc-portlet.tests.jar.path}"/>
                         <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
 
                         <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>

Copied: components/pc/trunk/test/src/main/java/org/gatein/pc/test/portlet/framework (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/framework)

Copied: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/unit)

Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml	2009-10-02 16:33:19 UTC (rev 236)
+++ components/pc/trunk/test/src/test/build.xml	2009-10-02 16:46:12 UTC (rev 237)
@@ -45,7 +45,6 @@
 
       <mkdir dir="${test.temp.dir}"/>
       <mkdir dir="${test.temp.lib}"/>
-      <mkdir dir="${test.temp.portlet}"/>
       <mkdir dir="${target}/jboss-unit"/>
 
       <echo message="Preparing environment"/>
@@ -388,19 +387,19 @@
          <mkdir dir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"/>
          <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes">
             <fileset
-               dir="${test.temp.portlet}"
+               dir="${target}/test-classes"
                includes="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/>
             <fileset
-               dir="${test.temp.portlet}"
+               dir="${target}/test-classes"
                includes="org/gatein/pc/test/portlet/@{testsuiteversion}/common/**"/>
             <fileset
-               dir="${test.temp.portlet}"
+               dir="${target}/test-classes"
                includes="org/gatein/pc/test/portlet/common/**"/>
             <fileset
-               dir="${test.temp.portlet}"
+               dir="${target}/test-classes"
                includes="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/>
             <fileset
-               dir="${test.temp.portlet}"
+               dir="${target}/classes"
                includes="org/gatein/pc/test/portlet/framework/**"/>
          </copy>
          <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/lib">
@@ -420,23 +419,11 @@
 
    <target name="package-tests">
 
-      <echo>------------------------</echo>
-      <echo>------------------------</echo>
-      <echo>------------------------</echo>
-      <echo>------------------------</echo>
-      <echo>------------------------</echo>
-      <echo>------------------------</echo>
-      <echo>------------------------</echo>
-      <echo>dependency.portal-portlet-tests.test-jar=${dependency.portal-portlet-tests.test-jar}</echo>
-      <echo>dependency.portal-portlet-mc.jar=${dependency.portal-portlet-mc.jar}</echo>
-      
-      <unjar src="${dependency.portal-portlet-tests.test-jar}" dest="${test.temp.portlet}"/>
-
       <!--Portlet test framework lib jar-->
       <jar jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar">
 
          <!-- -->
-         <fileset dir="${test.temp.portlet}" includes="org/gatein/pc/test/unit/**"/>
+         <fileset dir="${target}/classes" includes="org/gatein/pc/test/unit/**"/>
 
          <!--  JSR 168 TLD -->
          <zipfileset

Copied: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168 (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168)

Copied: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr286 (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr286)

Copied: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/session (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/session)