MonetDB: Jun2010 - Fix Rmetadata test.

[Fabian Groffen]

Changeset: 0cd3147b77d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0cd3147b77d7
Modified Files:
        java/tests/Test_Rmetadata.java
        sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out
Branch: Jun2010
Log Message:

Fix Rmetadata test.

Use Java's Class object to determine if an object is an instance of the
given Class, since this includes things like implementing a certain
interface (such as java.sql.Clob).

Update test output now that a clob is returned as Clob.


diffs (38 lines):

diff -r 3904867c539e -r 0cd3147b77d7 java/tests/Test_Rmetadata.java
--- a/java/tests/Test_Rmetadata.java    Wed Jul 21 14:49:55 2010 +0200
+++ b/java/tests/Test_Rmetadata.java    Wed Jul 21 14:51:46 2010 +0200
@@ -84,10 +84,11 @@
        }
 
        private static String isInstance(Object obj, String type) {
-               if (obj == null) return("(null)");
+               if (obj == null)
+                       return("(null)");
                try {
                        Class c = Class.forName(type);
-                       if (obj.getClass() == c) {
+                       if (c.isInstance(obj)) {
                                return(obj.getClass().getName() + " is an 
instance of " + type);
                        } else {
                                return(obj.getClass().getName() + " is NOT an 
instance of " + type);
diff -r 3904867c539e -r 0cd3147b77d7 
sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out        Wed Jul 21 
14:49:55 2010 +0200
+++ b/sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out        Wed Jul 21 
14:51:46 2010 +0200
@@ -107,7 +107,7 @@
        signed        false
        writable      false
 5.     mTests_src_jdbc_tests
-       classname     java.lang.String
+       classname     java.sql.Clob
        displaysize   11
        label         myclob
        name          myclob
@@ -135,7 +135,7 @@
 6.     java.lang.Double is an instance of java.lang.Double
 6.     java.lang.Boolean is an instance of java.lang.Boolean
 6.     java.lang.String is an instance of java.lang.String
-6.     java.lang.String is an instance of java.lang.String
+6.     nl.cwi.monetdb.jdbc.MonetClob is an instance of java.sql.Clob
 
 # 09:09:21 >  
 # 09:09:21 >  Done.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list