This is an automated email from the ASF dual-hosted git repository.
cmarcum pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new dee6bc1 Refs #128452 - JUnit and Hamcrest update for test automation
(#130)
dee6bc1 is described below
commit dee6bc1153c06cb6d345ec35bc74de270864b7cf
Author: Carl Marcum <[email protected]>
AuthorDate: Mon May 31 14:05:51 2021 -0400
Refs #128452 - JUnit and Hamcrest update for test automation (#130)
Refs #128452 - update junit lib from 4.10 to 4.12
added hamcrest 2.2 and updated build and run files.
---
test/build.xml | 11 ++++++++++-
test/run | 2 +-
test/run.bat | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/test/build.xml b/test/build.xml
index 1bda3eb..6a9635b 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -27,7 +27,8 @@
<property name="junit.home" value="${env.JUNIT_HOME}" />
<property name="dist.dir" value="." />
<property name="dist.name" value="aoo_test" />
- <property name="junit.jar.repos"
value="https://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar"; />
+ <property name="junit.jar.repos"
value="https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar"; />
+ <property name="hamcrest.jar.repos"
value="https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar";
/>
<path id="uno.classpath">
<fileset dir="${env.OUTDIR}/bin" erroronmissingdir="false">
@@ -51,12 +52,20 @@
</fileset>
<globmapper from="*" to="junit.jar" />
</copy>
+ <copy todir="lib" >
+ <fileset dir="${junit.home}" erroronmissingdir="false">
+ <include name="hamcrest*.jar" />
+ </fileset>
+ <globmapper from="*" to="hamcrest.jar" />
+ </copy>
<available file="lib/junit.jar" property="junit.jar.exists"/>
+ <available file="lib/hamcrest.jar"
property="hamcrest.jar.exists"/>
</target>
<target name="prepare.junit" depends="check.junit"
unless="junit.jar.exists">
<mkdir dir="lib" />
<get src="${junit.jar.repos}" dest="lib/junit.jar"
skipexisting="true" />
+ <get src="${hamcrest.jar.repos}" dest="lib/hamcrest.jar"
skipexisting="true" />
</target>
<target name="testcommon.init">
diff --git a/test/run b/test/run
index 01c64ed..ed5bc43 100755
--- a/test/run
+++ b/test/run
@@ -26,4 +26,4 @@ if [ -z "$DISPLAY" ]; then
fi
BASE=$(cd `dirname "$0"`; pwd)
-eval java -cp
\"$BASE/lib/junit.jar:$BASE/testcommon/bin:$BASE/testgui/bin:$BASE/testuno/bin:$BASE/testgui/data:$BASE/testuno/data\"
org.openoffice.test.Run -r org.openoffice.test.common.Installer -l
org.openoffice.test.common.XMLReporter -l
org.openoffice.test.common.ReportUploader \"-Dtestspace=$BASE/testspace\"
-Dsingleton=true "$*"
+eval java -cp
\"$BASE/lib/junit.jar:$BASE/lib/hamcrest.jar:$BASE/testcommon/bin:$BASE/testgui/bin:$BASE/testuno/bin:$BASE/testgui/data:$BASE/testuno/data\"
org.openoffice.test.Run -r org.openoffice.test.common.Installer -l
org.openoffice.test.common.XMLReporter -l
org.openoffice.test.common.ReportUploader \"-Dtestspace=$BASE/testspace\"
-Dsingleton=true "$*"
diff --git a/test/run.bat b/test/run.bat
index 4ce3995..cc983ed 100644
--- a/test/run.bat
+++ b/test/run.bat
@@ -21,5 +21,5 @@ rem
rem *************************************************************
set BASE=%~pd0%
-java -cp
"%BASE%\lib\junit.jar;%BASE%\testcommon\bin;%BASE%\testgui\bin;%BASE%\testuno\bin;%BASE%\testgui\data;%BASE%\testuno\data"
org.openoffice.test.Run -r org.openoffice.test.common.Installer -l
org.openoffice.test.common.XMLReporter -l
org.openoffice.test.common.ReportUploader "-Dtestspace=%BASE%\testspace"
-Dsingleton=true %*
+java -cp
"%BASE%\lib\junit.jar;%BASE%\lib\hamcrest.jar;%BASE%\testcommon\bin;%BASE%\testgui\bin;%BASE%\testuno\bin;%BASE%\testgui\data;%BASE%\testuno\data"
org.openoffice.test.Run -r org.openoffice.test.common.Installer -l
org.openoffice.test.common.XMLReporter -l
org.openoffice.test.common.ReportUploader "-Dtestspace=%BASE%\testspace"
-Dsingleton=true %*
