RFR: update testing frameworks
qudongfang
qudongfang at gmail.com
Wed Aug 1 07:35:59 UTC 2018
Hi, there
I found that the testing framework versions are out of date.
I'd like to update them to the latest stable version.
Could someone help me with this?
webrev file link stored in google drive
<https://drive.google.com/open?id=1ZG1u-aK-up_EkAwWivpE51kA_9-5A163>
--
Best regards,
QU DONGFANG
-------------- next part --------------
# HG changeset patch
# User qudongfang
# Date 1533108000 -28800
# Wed Aug 01 15:20:00 2018 +0800
# Node ID 78d7cf12bb7fea8f7283d6ae2d49edaaccd07b5a
# Parent 4363bb684f513c2516615b3b1b7309a33d9bea0e
update testing frameworks, junit to 4.12 and testng to 6.14.3.
diff --git a/make/Defs.gmk b/make/Defs.gmk
--- a/make/Defs.gmk
+++ b/make/Defs.gmk
@@ -295,8 +295,8 @@
endif
ASMTOOLS_LICENSE := $(call FullPath,$(ASMTOOLS_LICENSE))
-#----- JUnit 4.10: http://www.junit.org/
-# https://sourceforge.net/projects/junit/files/junit/4.10/junit-4.10.jar/download
+#----- JUnit 4.12: http://www.junit.org/
+# http://repo1.maven.org/maven2/junit/junit/4.12/
#
# JUnit is required, to support the execution of tests using JUnit
#
@@ -309,13 +309,13 @@
ifndef JUNIT_HOME
ifdef SLASHJAVA
- JUNIT_HOME = $(SLASHJAVA)/devtools/share/junit/junit-4.10/
+ JUNIT_HOME = $(SLASHJAVA)/devtools/share/junit/junit-4.12/
endif
endif
ifndef JUNIT_JAR
ifdef JUNIT_HOME
- JUNIT_JAR = $(JUNIT_HOME)/junit-4.10.jar
+ JUNIT_JAR = $(JUNIT_HOME)/junit-4.12.jar
endif
endif
JUNIT_JAR := $(call FullPath,$(JUNIT_JAR))
@@ -327,7 +327,7 @@
endif
JUNIT_LICENSE := $(call FullPath,$(JUNIT_LICENSE))
-#----- TestNG 6.9.5: see http://www.testng.org/
+#----- TestNG 6.14.3: see http://www.testng.org/
# http://testng.org/doc/download.html
#
# TestNG is required, to support the execution of tests using TestNG
@@ -341,14 +341,14 @@
ifndef TESTNG_HOME
ifdef SLASHJAVA
- TESTNG_HOME = $(SLASHJAVA)/devtools/share/testng/testng-6.9.5
+ TESTNG_HOME = $(SLASHJAVA)/devtools/share/testng/testng-6.14.3
endif
endif
TESTNG_HOME := $(call FullPath,$(TESTNG_HOME))
ifndef TESTNG_JAR
ifdef TESTNG_HOME
- TESTNG_JAR = $(TESTNG_HOME)/testng-6.9.5.jar
+ TESTNG_JAR = $(TESTNG_HOME)/testng-6.14.3.jar
endif
endif
TESTNG_JAR := $(call FullPath,$(TESTNG_JAR))
diff --git a/make/build-all.sh b/make/build-all.sh
--- a/make/build-all.sh
+++ b/make/build-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -65,7 +65,7 @@
UNZIP=unzip
UNZIP_OPTS="${UNZIP_OPTS:--q} -u"
WGET=wget
-WGET_OPTS=${WGET_OPTS:--q}
+WGET_OPTS=${WGET_OPTS:--q -c}
ROOT=$(hg root)
BUILD_DIR=${BUILD_DIR:-${ROOT}/build}
@@ -220,9 +220,9 @@
JUNIT_DEPS_DIR=${JTREG_DEPS_DIR}/junit
mkdir -p ${JUNIT_DEPS_DIR}
-JUNIT_JAR=${JUNIT_DEPS_DIR}/junit-4.10.jar
-WGet ${MAVEN_REPO_URL}/junit/junit/4.10/junit-4.10.jar ${JUNIT_JAR}
-echo "e4f1766ce7404a08f45d859fb9c226fc9e41a861 ${JUNIT_JAR}" | ${SHASUM} --check -
+JUNIT_JAR=${JUNIT_DEPS_DIR}/junit-4.12.jar
+WGet ${MAVEN_REPO_URL}/junit/junit/4.12/junit-4.12.jar ${JUNIT_JAR}
+echo "2973d150c0dc1fefe998f834810d68f278ea58ec ${JUNIT_JAR}" | ${SHASUM} --check -
${UNZIP} ${UNZIP_OPTS} ${JUNIT_JAR} LICENSE.txt -d ${JUNIT_DEPS_DIR}
JUNIT_LICENSE=${JUNIT_DEPS_DIR}/LICENSE.txt
@@ -231,12 +231,12 @@
TESTNG_DEPS_DIR=${JTREG_DEPS_DIR}/testng
mkdir -p ${TESTNG_DEPS_DIR}
-TESTNG_JAR=${TESTNG_DEPS_DIR}/testng-6.9.5.jar
-WGet ${MAVEN_REPO_URL}/org/testng/testng/6.9.5/testng-6.9.5.jar ${TESTNG_JAR}
-echo "5d12ea207fc47c3f341a3f8ecc88a3eac396a777 ${TESTNG_JAR}" | ${SHASUM} --check -
+TESTNG_JAR=${TESTNG_DEPS_DIR}/testng-6.14.3.jar
+WGet ${MAVEN_REPO_URL}/org/testng/testng/6.14.3/testng-6.14.3.jar ${TESTNG_JAR}
+echo "d24515dc253e77e54b73df97e1fb2eb7faf34fdd ${TESTNG_JAR}" | ${SHASUM} --check -
TESTNG_LICENSE=${TESTNG_DEPS_DIR}/LICENSE.txt
-WGet https://raw.githubusercontent.com/cbeust/testng/testng-6.9.5/LICENSE.txt ${TESTNG_LICENSE}
+WGet https://raw.githubusercontent.com/cbeust/testng/testng-6.14.3/LICENSE.txt ${TESTNG_LICENSE}
JCOMMANDER_JAR=${TESTNG_DEPS_DIR}/jcommander-1.72.jar
WGet ${MAVEN_REPO_URL}/com/beust/jcommander/1.72/jcommander-1.72.jar ${JCOMMANDER_JAR}
diff --git a/make/build.properties b/make/build.properties
--- a/make/build.properties
+++ b/make/build.properties
@@ -40,11 +40,11 @@
jhall.jar = ${javahelp.home}/javahelp/lib/jhall.jar
jh.jar = ${javahelp.home}/javahelp/lib/jh.jar
-# JUnit (should be 4.10 or better)
-junit.jar = ${jtreg.build.resources}/junit/4.10/junit-4.10.jar
+# JUnit (should be 4.12 or better)
+junit.jar = ${jtreg.build.resources}/junit/4.12/junit-4.12.jar
-# TestNG (should be 6.9.5 or better)
-testng.jar = ${jtreg.build.resources}/testng/6.9.5/testng-6.9.5.jar
+# TestNG (should be 6.14.3 or better)
+testng.jar = ${jtreg.build.resources}/testng/6.14.3/testng-6.14.3.jar
# JCommander (should be recent, e.g. 1.48 or better)
# This is required by TestNG; if it is already included in testng.jar
diff --git a/make/jtreg.gmk b/make/jtreg.gmk
--- a/make/jtreg.gmk
+++ b/make/jtreg.gmk
@@ -285,11 +285,6 @@
$(RM) $@
$(MKDIR) -p $(@D)
$(CP) $(TESTNG_JAR) $@
- jquery=`$(JAR) tf $@ | $(GREP) 'jquery.*.js'` ; \
- if [ -n "$$jquery" ]; then \
- $(RM) $(BUILDDIR)/$$jquery ; $(TOUCH) $(BUILDDIR)/$$jquery ; \
- $(JAR) uf $@ -C $(BUILDDIR) $$jquery ; \
- fi
TARGETS.ZIP.jtreg += $(JTREG_IMAGEJARDIR)/testng.jar
diff --git a/src/share/classes/com/sun/javatest/regtest/agent/TestNGRunner.java b/src/share/classes/com/sun/javatest/regtest/agent/TestNGRunner.java
--- a/src/share/classes/com/sun/javatest/regtest/agent/TestNGRunner.java
+++ b/src/share/classes/com/sun/javatest/regtest/agent/TestNGRunner.java
@@ -89,7 +89,7 @@
testng.setDefaultSuiteName(testName);
testng.setTestClasses(new Class<?>[]{mainClass});
testng.addListener((ITestNGListener) listener); // recognizes both ITestListener and IConfigurationListener
- testng.addListener(new XMLReporter());
+ testng.addListener((ITestNGListener)(new XMLReporter()));
testng.setOutputDirectory(new File(".").getPath()); // current dir, i.e. scratch dir
testng.run();
if (listener.configFailureCount > 0 || listener.failureCount > 0) {
More information about the jtreg-dev
mailing list