db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r497026 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
Date Wed, 17 Jan 2007 14:22:45 GMT
Author: myrnavl
Date: Wed Jan 17 06:22:45 2007
New Revision: 497026

URL: http://svn.apache.org/viewvc?view=rev&rev=497026
Log:
DERBY-2158 - ensure test.lang.UpdatableResultSetTest runs with JSR169 jvms
- modified test to use JDBC.vmSupportsJSR169 rather than its own mechanisms to
  check for existence of java.math.BigDecimal
- added one more required check


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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?view=diff&rev=497026&r1=497025&r2=497026
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
Wed Jan 17 06:22:45 2007
@@ -41,19 +41,7 @@
  * insertRow API
  */
 public class UpdatableResultSetTest  extends BaseJDBCTestCase {
-    
-    private static boolean HAVE_BIG_DECIMAL;
-    
-    static {
-        if (BigDecimalHandler.representation != 
-                BigDecimalHandler.BIGDECIMAL_REPRESENTATION)
-        {
-            HAVE_BIG_DECIMAL = false;
-        } else {
-            HAVE_BIG_DECIMAL = true;
-        }
-    }
-    
+        
     private static String[] allUpdateXXXNames =
     {
         "updateShort",
@@ -2506,7 +2494,7 @@
                     updateXXXName <= allUpdateXXXNames.length; 
                     updateXXXName++) 
             {
-                if(!HAVE_BIG_DECIMAL && (updateXXXName == 4))
+                if(JDBC.vmSupportsJSR169() && (updateXXXName == 4))
                     continue;
                 println("Testing " + allUpdateXXXNames[updateXXXName-1] + 
                         " on SQL type " + allSQLTypes[sqlType-1]);
@@ -2568,7 +2556,7 @@
                                 rs1.getLong(updateXXXName));
                 } else if (updateXXXName == 4) { 
                     //update column with updateBigDecimal methods
-                    if(HAVE_BIG_DECIMAL) {
+                    if(!JDBC.vmSupportsJSR169()) {
                         if (indexOrName == 1) //test by passing column position
                             rs.updateBigDecimal(sqlType, 
                                     rs1.getBigDecimal(updateXXXName));
@@ -2791,7 +2779,7 @@
                     updateXXXName <= allUpdateXXXNames.length; 
                     updateXXXName++) 
             {
-                if(!HAVE_BIG_DECIMAL && (updateXXXName == 4))
+                if(JDBC.vmSupportsJSR169() && (updateXXXName == 4))
                     continue;
                 println("  Testing " + allUpdateXXXNames[updateXXXName-1] + 
                         " on SQL type " + allSQLTypes[sqlType-1]);
@@ -2857,7 +2845,7 @@
                                 new Long(rs1.getLong(updateXXXName)));
                 } else if (updateXXXName == 4) { 
                     //updateObject using BigDecimal object
-                    if(HAVE_BIG_DECIMAL) {
+                    if(!JDBC.vmSupportsJSR169()) {
                         println(displayString + 
                                 " BigDecimal object as parameters");
                         if (indexOrName == 1) //test by passing column position
@@ -4094,13 +4082,18 @@
                         rs.updateLong(ColumnNames[sqlType-1], 
                                 rs1.getLong(updateXXXName));
                 } else if (updateXXXName == 4) { 
-                    //update column with updateBigDecimal methods
-                    if (indexOrName == 1) //test by passing column position
-                        rs.updateBigDecimal(sqlType, 
+                    if (!JDBC.vmSupportsJSR169())
+                    {
+                        //update column with updateBigDecimal methods
+                        if (indexOrName == 1) //test by passing column position
+                            rs.updateBigDecimal(sqlType, 
                                 rs1.getBigDecimal(updateXXXName));
-                    else //test by passing column name
-                        rs.updateBigDecimal(ColumnNames[sqlType-1], 
+                        else //test by passing column name
+                            rs.updateBigDecimal(ColumnNames[sqlType-1], 
                                 rs1.getBigDecimal(updateXXXName));
+                    } else {
+                        continue;
+                    }
                 } else if (updateXXXName == 5) { 
                     //update column with updateFloat methods
                     if (indexOrName == 1) //test by passing column position
@@ -4487,11 +4480,13 @@
                     " using " + allUpdateXXXNames[updateXXXName - 1],
                     rs1.getLong(updateXXXName), rs.getLong(sqlType));
         } else if (sqlType == 4) {
-            // verify update made to DECIMAL column with updateXXX methods
-            assertTrue("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 
+            if (!JDBC.vmSupportsJSR169()) {
+                // verify update made to DECIMAL column with updateXXX methods
+                assertTrue("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 
                     rs.getBigDecimal(sqlType),
                     rs.getBigDecimal(sqlType).doubleValue() == 
                             rs1.getBigDecimal(updateXXXName).doubleValue());
+            }
         } else if (sqlType == 5) {
             // verify update made to REAL column with updateXXX methods
             assertTrue("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 



Mime
View raw message