Changeset: c5cf3f00c4c5 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/c5cf3f00c4c5
Modified Files:
tests/JDBC_API_Tester.java
tests/TestRunner.java
tests/build.xml
Branch: onclient
Log Message:
Run the OnClient tests from JDBC_API_Tester
Convenient because the MonetDB test suite runs JDBC_API_Tester if it can find
it.
diffs (42 lines):
diff --git a/tests/JDBC_API_Tester.java b/tests/JDBC_API_Tester.java
--- 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) {
diff --git a/tests/TestRunner.java b/tests/TestRunner.java
--- 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) {
diff --git a/tests/build.xml b/tests/build.xml
--- 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">
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
