db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r885114 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang: Price.java UDTTest.java
Date Sat, 28 Nov 2009 17:01:18 GMT
Author: rhillegas
Date: Sat Nov 28 17:01:17 2009
New Revision: 885114

URL: http://svn.apache.org/viewvc?rev=885114&view=rev
Log:
DERBY-651: Hopefully fix an instability in UDTTest: different timestamp results on some Java
platforms.

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Price.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Price.java?rev=885114&r1=885113&r2=885114&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Price.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Price.java
Sat Nov 28 17:01:17 2009
@@ -82,7 +82,7 @@
     public void writeExternal(ObjectOutput out) throws IOException
     {
         // first write the version id
-        out.writeInt( FIRST_VERSION );
+        out.writeInt( TIMESTAMPED_VERSION );
 
         // now write the state
         out.writeObject( currencyCode );

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java?rev=885114&r1=885113&r2=885114&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
Sat Nov 28 17:01:17 2009
@@ -190,7 +190,7 @@
              "select getCurrencyCode( totalPrice ), getAmount( totalPrice ), getTimeInstant(
totalPrice ) from orders",
              new String[][]
              {
-                 { "USD" ,         "9.99000" ,        "1969-12-31 16:00:00.0" },
+                 { "USD" ,         "9.99000" ,        "2009-10-16 14:24:43.0" },
              },
              false
              );
@@ -200,7 +200,7 @@
              "select totalPrice from orders",
              new String[][]
              {
-                 { "Price( USD, 9.99000, 1969-12-31 16:00:00.0 )" },
+                 { "Price( USD, 9.99000, 2009-10-16 14:24:43.0 )" },
              },
              false
              );
@@ -208,14 +208,14 @@
         goodStatement
             ( conn,
               "call savePrice\n" +
-              "( makePrice( 'EUR', cast( 1.23 as decimal( 31, 5 ) ), timestamp('1969-12-31
16:00:00') ) )\n" );
+              "( makePrice( 'EUR', cast( 1.23 as decimal( 31, 5 ) ), timestamp('2008-10-16
14:24:43') ) )\n" );
         assertResults
             (
              conn,
              "values( getSavedPrice() )",
              new String[][]
              {
-                 { "Price( EUR, 1.23000, 1969-12-31 16:00:00.0 )" },
+                 { "Price( EUR, 1.23000, 2008-10-16 14:24:43.0 )" },
              },
              false
              );



Mime
View raw message