Mercurial > hg > monetdb-java

changeset 550:c5cf3f00c4c5 onclient

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Run the OnClient tests from JDBC_API_Tester Convenient because the MonetDB test suite runs JDBC_API_Tester if it can find it.
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Tue, 14 Sep 2021 10:10:15 +0200 (2021-09-14)
parents 90eeb4ef7f53
children 5ce6a942aff3
files tests/JDBC_API_Tester.java tests/TestRunner.java tests/build.xml
diffstat 3 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/JDBC_API_Tester.java
+++ b/tests/JDBC_API_Tester.java
@@ -104,6 +104,11 @@ final public class JDBC_API_Tester {
 
 		if (jt.foundDifferences)
 			System.exit(-1);
+
+		OnClientTester oct = new OnClientTester(con_URL, 0, true);
+		int failures = oct.runTests("");
+		if (failures > 0)
+			System.exit(-1);
 	}
 
 	private void Test_Cautocommit(String arg0) {
--- a/tests/TestRunner.java
+++ b/tests/TestRunner.java
@@ -80,8 +80,10 @@ public class TestRunner {
 		int failureCount = failures.size();
 		if (failureCount > 0) {
 			System.out.println();
-			System.out.printf("Ran %d out of %d tests, %d failed: %s%n",
-					testCount - skippedCount, testCount, failureCount,
+			System.out.printf("Ran %d out of %d %s tests, %d failed: %s%n",
+					testCount - skippedCount, testCount,
+					this.getClass().getSimpleName(),
+					failureCount,
 					String.join(", ", failures)
 					);
 		} else if (verbosity >= VERBOSITY_ON) {
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -105,7 +105,6 @@ Copyright 1997 - July 2008 CWI, August 2
   <!-- Run tests -->
   <target name="test">
     <antcall target="JDBC_API_Tester" />
-    <antcall target="OnClientTester" />
   </target>
 
   <target name="test_class" depends="compile,jdbc">