incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1386631 - in /incubator/ooo/trunk/test: build.xml testcommon/source/org/openoffice/test/common/XMLReporter.xsl
Date Mon, 17 Sep 2012 14:31:00 GMT
Author: liuzhe
Date: Mon Sep 17 14:31:00 2012
New Revision: 1386631

URL: http://svn.apache.org/viewvc?rev=1386631&view=rev
Log:
#120987 - Enable test automation framework to group test cases. Part 1

Modified:
    incubator/ooo/trunk/test/build.xml
    incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl

Modified: incubator/ooo/trunk/test/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/build.xml?rev=1386631&r1=1386630&r2=1386631&view=diff
==============================================================================
--- incubator/ooo/trunk/test/build.xml (original)
+++ incubator/ooo/trunk/test/build.xml Mon Sep 17 14:31:00 2012
@@ -133,14 +133,13 @@
 	
 	<target name="dist" depends="clean,compile">
 		<tstamp/>
-        <zip destfile="${dist.dir}/${dist.name}_${DSTAMP}.zip" update="false">
-			<zipfileset dir="." includes="lib/**, testcommon/**,testgui/**,testuno/**,build.xml"
prefix="aoo_test/"/>
-			<zipfileset dir="." includes="test,test.bat" filemode="751" prefix="aoo_test/"/>
-        </zip>
+        	<zip destfile="${dist.dir}/${dist.name}_${DSTAMP}.zip" update="false">
+			<zipfileset dir="." includes="lib/**, testcommon/**,testgui/**,testuno/**,build.xml,run,run.bat"
filemode="751" prefix="aoo_test/"/>
+		</zip>
 	</target>
 	
 	<target name="test" depends="compile" description="start test">
-        <condition property="test.arg0" value="-Dopenoffice.home=${openoffice.home}">
+		<condition property="test.arg0" value="-Dopenoffice.home=${openoffice.home}">
 			<isset property="openoffice.home" />
 		</condition>
 		<pathconvert property="openoffice.pack" setonempty="false">
@@ -152,40 +151,14 @@
 			<isset property="openoffice.pack" />
 		</condition>
 		<fail message="No OpenOffice available!" unless="test.arg0"/>
-	    <condition property="test.executable" value="./run.bat">
+		<condition property="test.executable" value="./run.bat">
 			<os family="windows" />
 		</condition>
-		<echo>${test.arg0}</echo>
-        <property name="test.executable" value="./run"/>
-        <exec executable="${test.executable}">
+		<property name="test.executable" value="./run"/>
+		<exec executable="${test.executable}">
 			<arg value="${test.arg0}"/>
 			<arg value="-tp"/>
 			<arg value="bvt"/>
 		</exec>
 	</target>
-	
-    <target name="upgrade">
-		<property name="upgrade.script" location="${java.io.tmpdir}/aoo_test_upgrade.xml"/>
-		<property name="upgrade.to" location="."/>
-		<copy file="build.xml" tofile="${upgrade.script}"/>
-        <condition property="ant.executable" value="ant.bat">
-			<os family="windows" />
-		</condition>
-        <property name="ant.executable" value="ant"/>
-        <exec executable="${ant.executable}" spawn="true">
-			<arg value="-Dupgrade.to=${upgrade.to}"/>
-			<arg value="-f"/>
-			<arg value="${upgrade.script}"/>
-			<arg value="upgrade.run"/>
-		</exec>
-	</target>
-
-	<target name="upgrade.run">
-		<property name="testpack.url" value="http://9.123.117.85/testpack/trunk/aoo_test.zip"/>
-		<property name="testack.temp" location="${java.io.tmpdir}/aoo_test.zip"/>
- 		<get src="${testpack.url}" dest="${testack.temp}"/>
-		<delete dir="${upgrade.to}" failonerror="false"/>
-		<mkdir dir="${upgrade.to}"/>
-		<unzip src="${testack.temp}" dest="${upgrade.to}"/>
-	</target>
 </project>

Modified: incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl?rev=1386631&r1=1386630&r2=1386631&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl
(original)
+++ incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl
Mon Sep 17 14:31:00 2012
@@ -1,4 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0"?>
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
+ 
+ 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" />
 <xsl:template match="/">



Mime
View raw message