MONDRIAN: Oops, remove timezone-dependent strings from expected results.

[git-p4: depot-paths = "//open/mondrian-release/3.1/": change = 13032]
pentaho · Sep 4, 2009 · deebb30 · deebb30
1 parent 16c53a7
commit deebb30
Showing 1 changed file with 31 additions and 8 deletions.
diff --git a/testsrc/main/mondrian/test/ParameterTest.java b/testsrc/main/mondrian/test/ParameterTest.java
@@ -20,6 +20,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Time;
+import java.sql.Timestamp;
 
 /**
  * A <code>ParameterTest</code> is a test suite for functionality relating to
@@ -436,9 +437,16 @@ public void testAssignNumericParameter() {
         assertAssignParameter(para, false, -8.56, null);
         assertAssignParameter(para, false, new BigDecimal("12.345"), null);
         assertAssignParameter(para, false, new BigInteger("12345"), null);
+        // Formatted date will depends on time zone. Only match part of message.
         assertAssignParameter(
-            para, false, new Time(12345678),
-            "Invalid value '19:25:45' for parameter 'x', type NUMERIC");
+            para, false, new Date(),
+            "' for parameter 'x', type NUMERIC");
+        assertAssignParameter(
+            para, false, new Timestamp(new Date().getTime()),
+            "' for parameter 'x', type NUMERIC");
+        assertAssignParameter(
+            para, false, new Time(new Date().getTime()),
+            "' for parameter 'x', type NUMERIC");
         assertAssignParameter(
             para, false, null,
             "Invalid value 'null' for parameter 'x', type NUMERIC");
@@ -456,7 +464,11 @@ public void testAssignStringParameter() {
         assertAssignParameter(para, false, -8.56, null);
         assertAssignParameter(para, false, new BigDecimal("12.345"), null);
         assertAssignParameter(para, false, new BigInteger("12345"), null);
-        assertAssignParameter(para, false, new Time(12345678), null);
+        assertAssignParameter(para, false, new Date(), null);
+        assertAssignParameter(
+            para, false, new Timestamp(new Date().getTime()), null);
+        assertAssignParameter(
+            para, false, new Time(new Date().getTime()), null);
         assertAssignParameter(para, false, null, null);
     }
 
@@ -484,9 +496,14 @@ para, false, new BigDecimal("12.345"),
             "Invalid value '12.345' for parameter 'x',"
             + " type MemberType<hierarchy=[Customers]>");
         assertAssignParameter(
-            para, false, new Time(12345678),
-            "Invalid value '19:25:45' for parameter 'x',"
-            + " type MemberType<hierarchy=[Customers]>");
+            para, false, new Date(),
+            "' for parameter 'x', type MemberType<hierarchy=[Customers]>");
+        assertAssignParameter(
+            para, false, new Timestamp(new Date().getTime()),
+            "' for parameter 'x', type MemberType<hierarchy=[Customers]>");
+        assertAssignParameter(
+            para, false, new Time(new Date().getTime()),
+            "' for parameter 'x', type MemberType<hierarchy=[Customers]>");
 
         // Valid to set to null. It means use the default member of the
         // hierarchy. (Not necessarily the same as the default value of the
@@ -552,8 +569,14 @@ public void testAssignSetParameter() {
             para, true, new BigDecimal("12.345"),
             "Invalid value '12.345' for parameter 'x', type SetType<MemberType<hierarchy=[Customers]>");
         assertAssignParameter(
-            para, true, new Time(12345678),
-            "Invalid value '19:25:45' for parameter 'x', type SetType<MemberType<hierarchy=[Customers]>");
+            para, true, new Date(),
+            "' for parameter 'x', type SetType<MemberType<hierarchy=[Customers]>");
+        assertAssignParameter(
+            para, true, new Timestamp(new Date().getTime()),
+            "' for parameter 'x', type SetType<MemberType<hierarchy=[Customers]>");
+        assertAssignParameter(
+            para, true, new Time(new Date().getTime()),
+            "' for parameter 'x', type SetType<MemberType<hierarchy=[Customers]>");
 
         List<Member> list;
         SchemaReader sr =