Changeset: fec311f99bd1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fec311f99bd1
Modified Files:
java/tests/Test_Dobjects.java
sql/jdbc/tests/Tests/All
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
Branch: default
Log Message:
Test_Dobjects.jave test program was not executed on platforms which did not
support SAMTOOLS and NETCDF, such as Windows, Mac, Freebsd, Solaris and Ubuntu.
Adjusted the test program to only query sys schema and sys tables, such that it
should produce the same output on all platforms.
Enabled the test to run on all platforms.
diffs (65 lines):
diff --git a/java/tests/Test_Dobjects.java b/java/tests/Test_Dobjects.java
--- a/java/tests/Test_Dobjects.java
+++ b/java/tests/Test_Dobjects.java
@@ -35,9 +35,9 @@ public class Test_Dobjects {
try {
// inspect the catalog by use of dbmd functions
dumpResultSet(dbmd.getCatalogs());
- dumpResultSet(dbmd.getSchemas());
+// dumpResultSet(dbmd.getSchemas()); // this
produces different outputs on different platforms due to dependency on SAMTOOLS
and NETCDF. so exclude it
dumpResultSet(dbmd.getSchemas(null, "sys"));
- dumpResultSet(dbmd.getTables(null, null, null, null));
+ dumpResultSet(dbmd.getTables(null, "sys", null, null));
} catch (SQLException e) {
System.out.println("FAILED :( "+ e.getMessage());
System.out.println("ABORTING TEST!!!");
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -5,7 +5,7 @@ HAVE_JDBCTESTS?Test_Creplysize
HAVE_JDBCTESTS?Test_Csavepoints
HAVE_JDBCTESTS?Test_Ctransaction
#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
-HAVE_JDBCTESTS&HAVE_SAMTOOLS&HAVE_NETCDF?Test_Dobjects
+HAVE_JDBCTESTS?Test_Dobjects
HAVE_JDBCTESTS?Test_PSgeneratedkeys
HAVE_JDBCTESTS?Test_PSsomeamount
HAVE_JDBCTESTS?Test_PSlargebatchval
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -32,21 +32,9 @@ Resultset with 1 columns
TABLE_CAT
Resultset with 3 columns
TABLE_SCHEM TABLE_CATALOG TABLE_CAT
-bam null null
-json null null
-profiler null null
-sys null null
-tmp null null
-Resultset with 3 columns
-TABLE_SCHEM TABLE_CATALOG TABLE_CAT
sys null null
Resultset with 10 columns
TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS
TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME
REF_GENERATION
-null bam export SYSTEM TABLE null null null null rowid
SYSTEM
-null bam files SYSTEM TABLE null null null null rowid
SYSTEM
-null bam pg SYSTEM TABLE null null null null rowid
SYSTEM
-null bam rg SYSTEM TABLE null null null null rowid
SYSTEM
-null bam sq SYSTEM TABLE null null null null rowid
SYSTEM
null sys _columns SYSTEM TABLE null null null null
rowid SYSTEM
null sys _tables SYSTEM TABLE null null null null rowid
SYSTEM
null sys args SYSTEM TABLE null null null null rowid
SYSTEM
@@ -75,12 +63,6 @@ null sys table_types SYSTEM TABLE null n
null sys triggers SYSTEM TABLE null null null null
rowid SYSTEM
null sys types SYSTEM TABLE null null null null rowid
SYSTEM
null sys user_role SYSTEM TABLE null null null null
rowid SYSTEM
-null tmp _columns SYSTEM TABLE null null null null
rowid SYSTEM
-null tmp _tables SYSTEM TABLE null null null null rowid
SYSTEM
-null tmp idxs SYSTEM TABLE null null null null rowid
SYSTEM
-null tmp keys SYSTEM TABLE null null null null rowid
SYSTEM
-null tmp objects SYSTEM TABLE null null null null rowid
SYSTEM
-null tmp triggers SYSTEM TABLE null null null null
rowid SYSTEM
null sys columns SYSTEM VIEW SELECT * FROM (SELECT p.* FROM
"sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t) AS
columns; null null null rowid SYSTEM
null sys environment SYSTEM VIEW create view sys.environment as
select * from sys.environment(); null null null rowid SYSTEM
null sys optimizers SYSTEM VIEW create view sys.optimizers as
select * from sys.optimizers(); null null null rowid SYSTEM
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
