incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1371118 - in /incubator/ooo/trunk/main/test: ./ reportstyle/ testcommon/ testcommon/prj/ testcommon/source/org/openoffice/test/vcl/ testgui/ testgui/prj/ testgui/reportstyle/ testgui/source/testlib/gui/
Date Thu, 09 Aug 2012 09:26:10 GMT
Author: liuzhe
Date: Thu Aug  9 09:26:09 2012
New Revision: 1371118

URL: http://svn.apache.org/viewvc?rev=1371118&view=rev
Log:
#120510# - Move ant scripts from testgui to test module root

Added:
    incubator/ooo/trunk/main/test/build.xml
      - copied, changed from r1371047, incubator/ooo/trunk/main/test/testgui/build.xml
    incubator/ooo/trunk/main/test/reportstyle/
      - copied from r1371047, incubator/ooo/trunk/main/test/testgui/reportstyle/
Removed:
    incubator/ooo/trunk/main/test/testcommon/build.xml
    incubator/ooo/trunk/main/test/testcommon/makefile.mk
    incubator/ooo/trunk/main/test/testcommon/prj/
    incubator/ooo/trunk/main/test/testgui/build.xml
    incubator/ooo/trunk/main/test/testgui/makefile.mk
    incubator/ooo/trunk/main/test/testgui/prj/
    incubator/ooo/trunk/main/test/testgui/reportstyle/
    incubator/ooo/trunk/main/test/testgui/test
    incubator/ooo/trunk/main/test/testgui/test.bat
Modified:
    incubator/ooo/trunk/main/test/testcommon/.classpath
    incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/IDList.java
    incubator/ooo/trunk/main/test/testgui/.classpath
    incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java

Copied: incubator/ooo/trunk/main/test/build.xml (from r1371047, incubator/ooo/trunk/main/test/testgui/build.xml)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/build.xml?p2=incubator/ooo/trunk/main/test/build.xml&p1=incubator/ooo/trunk/main/test/testgui/build.xml&r1=1371047&r2=1371118&rev=1371118&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/build.xml (original)
+++ incubator/ooo/trunk/main/test/build.xml Thu Aug  9 09:26:09 2012
@@ -25,84 +25,129 @@
 <project basedir="." default="test">
 	<property file="build.properties" />
 	<property environment="env" />
-	<property name="src" value="./source" />
+
 	<property name="out" value="output"/>
 	<property name="classes" value="${out}/class" />
-	<property name="lib" value="${out}/lib" />
 	<property name="dist" value="${out}/dist" />
 
-	<property name="env.TESTSPACE" value="../testspace" />
+	<property name="env.TESTSPACE" value="testspace" />
+	<property name="env.JUNIT_HOME" value="${out}/junit" />
 	<property name="junit.home" value="${env.JUNIT_HOME}" />
 	<property name="testspace" value="${env.TESTSPACE}" />
 	<property name="test.classes" value="testsuite/gui/BVT.class" />
 	<property name="test.output" value="${testspace}/output" />
 	<property name="test.result" value="${test.output}/result" />
 	<property name="test.report" value="${test.output}/report" />
-	<property name="junit.style.dir" value="./reportstyle" />
+	<property name="junit.style.dir" value="reportstyle" />
 
-	<path id="classpath">
-		<pathelement location="${classes}" />
-		<fileset dir="${lib}" erroronmissingdir="false">
-			<include name="**/testcommon.jar" />
-			<include name="**/junit.jar" />
-		</fileset>
-		<fileset dir="${solar.jar}" erroronmissingdir="false">
-			<include name="**/testcommon.jar" />
-			<include name="**/junit.jar" />
-		</fileset>
+	<path id="junit.classpath">
 		<fileset dir="${junit.home}" erroronmissingdir="false">
 			<include name="*.jar" />
 		</fileset>
 	</path>
 
-	<target name="init">
+	<path id="testgui.classpath">
+		<pathelement location="${classes}" />
+		<path refid="junit.classpath"/>
+	</path>
+
+	<path id="testuno.classpath">
+		<pathelement location="${classes}" />
+		<path refid="junit.classpath"/>
+		<fileset dir="${openoffice.home}/../" erroronmissingdir="false">
+			<include name="**/juh.jar" />
+			<include name="**/unoil.jar" />
+			<include name="**/ridl.jar" />
+			<include name="**/jurt.jar" />
+		</fileset>
+	</path>
+
+	<path id="test.classpath">
+		<pathelement location="${classes}" />
+		<path refid="junit.classpath" />
+		<fileset dir="${openoffice.home}/../" erroronmissingdir="false">
+			<include name="**/juh.jar" />
+			<include name="**/unoil.jar" />
+			<include name="**/ridl.jar" />
+			<include name="**/jurt.jar" />
+		</fileset>
+	</path>
+
+	<target name="testcommon.init">
 		<mkdir dir="${classes}" />
-		<mkdir dir="${lib}" />
 		<copy includeemptydirs="false" todir="${classes}">
-			<fileset dir="${src}">
+			<fileset dir="testcommon/source">
 				<exclude name="**/*.java" />
 			</fileset>
 		</copy>
 	</target>
 
-	<target name="clean" description="Clean all output">
-		<delete dir="${classes}" />
-		<delete dir="${testspace}" />
+	<target name="testcommon.compile" depends="testcommon.init">
+		<javac destdir="${classes}" debug="on" source="1.6" includeantruntime="false">
+			<src path="testcommon/source"/>
+		</javac>
 	</target>
 
-	<target name="check.dependencies">
-		<available file="testcommon.jar" property="testcommon.jar.exists">
-			<filepath refid="classpath" />
-		</available>
-		<available file="junit.jar" property="junit.jar.exists">
-			<filepath refid="classpath" />
-		</available>
+	<target name="testgui.init">
+		<mkdir dir="${classes}" />
+		<copy includeemptydirs="false" todir="${classes}">
+			<fileset dir="testgui/source">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+		<copy includeemptydirs="false" todir="${classes}">
+			<fileset dir="testgui/data">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
 	</target>
 
-	<target name="prepare.junit" unless="junit.jar.exists">
-		<property name="junit.jar.repos" value="http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar"
/>
-		<get src="${junit.jar.repos}" dest="${lib}/junit.jar" skipexisting="true" />
+	<target name="testgui.compile" depends="testgui.init, prepare.junit">
+		<javac destdir="${classes}" debug="on" source="1.6" includeantruntime="false">
+			<src path="testgui/source"/>
+			<src path="testgui/data"/>
+			<classpath refid="testgui.classpath"/>
+		</javac>
 	</target>
 
-	<target name="prepare.testcommon" unless="testcommon.jar.exists">
-		<ant dir="../testcommon" target="dist" inheritAll="false">
-			<property name="dist" location="${lib}" />
-		</ant>
+	<target name="testuno.init">
+		<mkdir dir="${classes}" />
+		<copy includeemptydirs="false" todir="${classes}">
+			<fileset dir="testuno/source">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
 	</target>
 
-	<target name="prepare.dependencies" depends="init, check.dependencies, prepare.junit,
prepare.testcommon" description="Download all dependencies">
+	<target name="testuno.compile" depends="testuno.init, prepare.junit">
+		<javac destdir="${classes}" debug="on" source="1.6" includeantruntime="false">
+			<src path="testuno/source"/>
+			<classpath refid="testuno.classpath"/>
+		</javac>
 	</target>
 
-	<target name="compile" depends="init, prepare.dependencies" description="Compile source
code">
-		<javac srcdir="${src}" destdir="${classes}" debug="on" source="1.6">
-			<classpath refid="classpath" />
-		</javac>
+	<target name="clean" description="Clean all output">
+		<delete dir="${out}" />
+	</target>
+
+	<target name="check.junit">
+		<available file="junit.jar" property="junit.jar.exists">
+			<filepath refid="junit.classpath" />
+		</available>
+	</target>
+
+	<target name="prepare.junit" depends="check.junit" unless="junit.jar.exists">
+		<property name="junit.jar.repos" value="http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar"
/>
+		<mkdir dir="${junit.home}" />
+		<get src="${junit.jar.repos}" dest="${junit.home}/junit.jar" skipexisting="true" />
+	</target>
+
+	<target name="compile" depends="testcommon.init, testcommon.compile, testgui.init, testgui.compile,
testuno.init, testuno.compile" description="Compile source code">
 	</target>
 
 	<target name="dist" depends="compile">
 		<tstamp />
-		<property name="dist.archive" value="testoo_${DSTAMP}.zip" />
-		<zip destfile="../${dist.archive}" basedir="." update="true" />
+		<property name="dist.archive" value="aoo_test_${DSTAMP}.zip" />
 	</target>
 
 	<target name="check.build" description="Check the build context">
@@ -186,10 +231,6 @@
 		<echo>Openoffice is installed to ${openoffice.home}</echo>
 	</target>
 
-	<target name="clean.test" unless="clean.test.skip" description="Clean testing footprint">
-		<delete dir="${testspace}/oouser" quiet="true" failonerror="false" />
-	</target>
-
 	<target name="run.test" depends="compile" description="Run junit">
 		<tstamp>
 			<format property="output.stamp" pattern="yyMMdd.hhmm" />
@@ -213,7 +254,7 @@
 			</batchtest>
 
 			<formatter type="xml" />
-			<classpath refid="classpath" />
+			<classpath refid="test.classpath" />
 		</junit>
 
 		<junitreport todir="${test.report}">
@@ -226,7 +267,7 @@
 		</junitreport>
 	</target>
 
-	<target name="test" depends="check.build,find.build,download.build,install.build,clean.test,run.test"
description="Run testing on the specified build. The build is automatically downloaded and
installed according to the context.">
+	<target name="test" depends="check.build,find.build,download.build,install.build,run.test"
description="Run testing on the specified build. The build is automatically downloaded and
installed according to the context.">
 		<fail message="Test Failed" if="test.failed" />
 	</target>
 
@@ -263,7 +304,7 @@
 		<echo file="${testspace}/build.txt">${openoffice.build}</echo>
 	</target>
 
-	<target name="routine.test" depends="detect.build,download.build,install.build,clean.test,run.test,report.test"
description="Periodically run testing.">
+	<target name="routine.test" depends="detect.build,download.build,install.build,run.test,report.test"
description="Periodically run testing.">
 		<fail message="Test Failed" if="test.failed" />
 	</target>
 </project>

Modified: incubator/ooo/trunk/main/test/testcommon/.classpath
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testcommon/.classpath?rev=1371118&r1=1371117&r2=1371118&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testcommon/.classpath (original)
+++ incubator/ooo/trunk/main/test/testcommon/.classpath Thu Aug  9 09:26:09 2012
@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="source"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="output/class"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/IDList.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/IDList.java?rev=1371118&r1=1371117&r2=1371118&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/IDList.java (original)
+++ incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/IDList.java Thu
Aug  9 09:26:09 2012
@@ -84,6 +84,9 @@ public class IDList {
 		map.clear();
 		ArrayList<File> validFiles = new ArrayList<File>();
 		File[] files = dir.listFiles();
+		if (files == null)
+			return;
+		
 		for (File file : files) {
 			if (file.isFile() && file.getName().endsWith(".lst")) {
 				validFiles.add(file);

Modified: incubator/ooo/trunk/main/test/testgui/.classpath
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/.classpath?rev=1371118&r1=1371117&r2=1371118&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/.classpath (original)
+++ incubator/ooo/trunk/main/test/testgui/.classpath Thu Aug  9 09:26:09 2012
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="source"/>
+	<classpathentry kind="src" path="data"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/testcommon"/>
-	<classpathentry kind="lib" path="output/lib/junit.jar"/>
-	<classpathentry kind="output" path="output/class"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java?rev=1371118&r1=1371117&r2=1371118&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java Thu Aug  9 09:26:09
2012
@@ -51,7 +51,7 @@ import org.openoffice.test.vcl.widgets.V
  *
  */
 public class UIMap {
-	private static IDList idList = new IDList(new File("./ids"));
+	private static IDList idList = new IDList(new File("./idsd"));
 	public static final VclMessageBox ActiveMsgBox = new VclMessageBox(Constant.UID_ACTIVE);
 	public static final VclMessageBox MsgBox_AdditionalRowsNotSaved = new VclMessageBox(Constant.UID_ACTIVE,
"Additional rows were not saved.");
 	public static final VclTabControl ActiveTabControl = new VclTabControl(Constant.UID_ACTIVE);



Mime
View raw message