db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r555421 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
Date Wed, 11 Jul 2007 22:35:37 GMT
Author: mikem
Date: Wed Jul 11 15:35:36 2007
New Revision: 555421

URL: http://svn.apache.org/viewvc?view=rev&rev=555421
Log:
DERBY-2703

This tests passed running against ibm1.4.2 where it previously had failed
reproducebly.  I am changing the test to always run the test case.  If anyone
see's this test fail in the database metadata call report it.  I am not sure
what change fixed the problem.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java?view=diff&rev=555421&r1=555420&r2=555421
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
Wed Jul 11 15:35:36 2007
@@ -782,25 +782,6 @@
         return(ret_order);
     }
 
-	private boolean is142JVM() 
-	{
-        // bug shows up in ibm142, sun142, 
-        // and j9 (J2ME Foundation Specification v1.1)
-	    String java_version = System.getProperty("java.version");
-
-        // only match java versions with leading 1.4.2
-        String leading_version_no = java_version.substring(0, 5);
-
-        /*
-        System.out.println("java_version = " + java_version);
-        System.out.println("leading_version_no = " + leading_version_no);
-        */
-
-
-        return(leading_version_no.equals("1.4.2") || 
-               java_version.equals("J2ME Foundation Specification v1.1"));
-	}
-
     private boolean isDatabaseBasicCollation(Connection conn)
         throws SQLException
     {
@@ -1055,11 +1036,6 @@
     private void runDERBY_2703(Connection conn, int db_index)
         throws SQLException
     {
-        // DERBY-2703, get columns does not work in collated dbs under sun
-        // and ibm 142 jvm's.
-        if (is142JVM())
-            return;
-
         setUpTable(conn);
 
         ResultSet rs = 
@@ -1694,11 +1670,6 @@
     int         db_index)
         throws SQLException 
     {
-        // DERBY-2703, get columns does not work in collated dbs under sun
-        // and ibm 142 jvm's.
-        if (is142JVM())
-            return;
-
         Statement s = conn.createStatement();
 
         setUpTable(conn);



Mime
View raw message