[portal-commits] JBoss Portal SVN: r11968 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests.

[portal-commits at lists.jboss.org]

Author: vrockai
Date: 2008-09-24 10:15:14 -0400 (Wed, 24 Sep 2008)
New Revision: 11968

Modified:
   branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml
Log:
copying of userinterceptor portlet added to ant

Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml	2008-09-24 14:02:12 UTC (rev 11967)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml	2008-09-24 14:15:14 UTC (rev 11968)
@@ -20,6 +20,7 @@
 	<property name="selsrv.dir" location="selenium-rc-server" />
 	<property name="node0" value="localhost" />
 	<property name="jboss.test.home" value="${env.JBOSS_TEST_HOME}" />
+	<property name="jboss.home" value="${env.JBOSS_HOME}" />
 	<property name="jboss.test.jar" value="${env.JBOSSTESTJAR}" />
 	<property name="jboss.portal.dir" value="${env.JBOSS_UNZIPED_DIR}" />
 	<property name="portal_archive" value="${env.JBOSS_ARCHIVE}" />
@@ -42,39 +43,15 @@
 	</path>
 
 	<taskdef name="testng" classpathref="libraries.cp" classname="org.testng.TestNGAntTask" />
-<!--
-	<taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
-		<classpath id="server.taskdef.classpath">
-			<path refid="jboss.test.classpath" />
-		</classpath>
-	</taskdef>
-	<taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
-		<classpath refid="server.taskdef.classpath" />
-	</taskdef>
-	<taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
-		<classpath refid="server.taskdef.classpath" />
-	</taskdef>
--->
-	<target name="init">
+	
+<target name="init">
 		<echo message="Browser   : ${browser}" />
 		<echo message="Workspace : ${workspace}" />
 		<echo message="Deleting testng report directory"/>
 		<delete dir="${testng.output.dir}"/>
 	</target>
 
-	<!--target name="server-config" depends="unpack-portal"-->
-<!--	
-<server:config javaHome="${java.home}" jbossHome="${jboss.test.home}/${jboss.portal.dir}/">
-		<server name="${portal.instance}" host="${node0}">
-	-->		<!-- jvmarg value="${jpda.cmdline}" / --> <!--
-			<jvmarg value="-Xmx512m" />
-			<sysproperty key="java.endorsed.dirs" value="${jboss.test.home}/${jboss.portal.dir}/lib/endorsed" />
-		</server>
-	</server:config>
 
--->
-	<!--/target-->
-
 	<target name="compile" depends="">
 		<echo message="Compiling testsuite" />
 		<mkdir dir="${test.build.dir}" />
@@ -99,22 +76,11 @@
 		<echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
 	</target>
 
-	<target name="unpack-portal">
-		<echo message="Going to unpack ${portal_archive} into ${jboss.test.home}" />
-		<unzip src="${portal_archive}" dest="${jboss.test.home}" />
-		<chmod file="${jboss.test.home}/${jboss.portal.dir}/bin/run.sh" perm="u+x" />
-	</target>
-
-	<target name="copyApps" depends="unpack-portal">
+	<target name="copyApps">
 		<echo message="Copying userInterceptor portlet into the ${portal.instance} server"/>
-		<copy file="apps/userDetail-portlet.war" tofile="${jboss.test.home}/${jboss.portal.dir}/server/${portal.instance}/deploy/userDetail-portlet.war"/>
+		<copy file="apps/userDetail-portlet.war" tofile="${jboss.home}/server/${portal.instance}/deploy/userDetail-portlet.war"/>
 	</target>
 
-	<target name="delete-portal">
-		<echo message="Going to delete directory ${jboss.test.home}" />
-		<delete dir="${jboss.test.home}/${jboss.portal.dir}/" />
-	</target>
-
 	<target name="clean">
 		<echo message="Going to delete directory ${test.build.dir}" />
 		<delete dir="${test.build.dir}" />
@@ -123,28 +89,12 @@
 	<target name="cleanup">
 		<echo message="Cleaning up..." />
 		<antcall target="stop-src" />
-<!--		<antcall target="delete-portal" /> -->
 
 	</target>
 
-	<target name="reports">
-		<mkdir dir="${junit.report.dir}" />
-		<junitreport todir="test-report">
-			<fileset dir="test-output">
-				<include name="*/*.xml" />
-			</fileset>
-
-			<report format="noframes" todir="test-report" />
-		</junitreport>
-	</target>
-
 	<target name="selenium-test" depends="init, compile, run-src">
-<!--
-		<antcall target="copyApps" />
 
-		<echo message="Starting portal instance : ${portal.instance}" />
-		<server:start name="${portal.instance}" />
--->
+		<antcall target="copyApps" />
 		<echo message="Runing TestNG" />
 		<mkdir dir="test-output" />
 		<testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="test-output"
@@ -152,18 +102,12 @@
 
 			<xmlfileset dir="." includes="testng.xml" />
 
-			<!--classfileset dir="${test.build.dir}"
-				includes="org/jboss/portal/test/selenium/*Test.class" / -->
 			<sysproperty key="browser" value="${browser}" />
 			<sysproperty key="workspace" value="${workspace}"/>
 
 			<jvmarg value="-ea" />
 
 		</testng>
-<!--
-		<echo message="Stoping portal instance : ${portal.instance}" />
-		<server:stop name="${portal.instance}" />
--->
 		<antcall target="cleanup" />
 	</target>