MONDRIAN: Fix tests on JDK 1.4.

[git-p4: depot-paths = "//open/mondrian/": change = 14434]
pentaho · Jul 7, 2011 · 675fc9b · 675fc9b
1 parent 8fd7981
commit 675fc9b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/testsrc/main/mondrian/olap/ParserTest.java b/testsrc/main/mondrian/olap/ParserTest.java
@@ -464,7 +464,7 @@ public void testNumbers() {
 
         // exponents akimbo
         assertParseExpr("1e2", "100", true);
-        assertParseExpr("1e2", "1E+2", false);
+        assertParseExpr("1e2", Util.PreJdk15 ? "100" : "1E+2", false);
         assertParseExprFails(
             "1e2e3",
             "Syntax error at line 1, column 37, token 'e3'");

diff --git a/testsrc/main/mondrian/olap/UtilTestCase.java b/testsrc/main/mondrian/olap/UtilTestCase.java
@@ -623,6 +623,10 @@ public void testServiceDiscovery() {
         for (Class<Driver> driverClass : list) {
             expectedClassNames.remove(driverClass.getName());
         }
+        if (Util.PreJdk15) {
+            // JDK only discovers services from jars in JDK 1.5 and later.
+            return;
+        }
         assertTrue(expectedClassNames.toString(), expectedClassNames.isEmpty());
     }
 

diff --git a/testsrc/main/mondrian/olap/fun/FunctionTest.java b/testsrc/main/mondrian/olap/fun/FunctionTest.java
@@ -7166,6 +7166,10 @@ public void testOrderDepends() {
     }
 
     public void testOrderCalc() {
+        if (Util.Retrowoven) {
+            // If retrowoven, we don't use Iterable, so plans are different.
+            return;
+        }
         // [Measures].[Unit Sales] is a constant member, so it is evaluated in
         // a ContextCalc.
         assertAxisCompilesTo(

diff --git a/testsrc/main/mondrian/test/BasicQueryTest.java b/testsrc/main/mondrian/test/BasicQueryTest.java
@@ -7190,6 +7190,11 @@ public void testDirectMemberReferenceOnDimensionWithCalculationsDefined() {
     }
 
     public void testExplain() throws SQLException {
+        if (Util.PreJdk15) {
+            // Cannot use explain before JDK 1.5. EmptyResultSet relies on
+            // javax.sql.rowset.RowSetMetaDataImpl, which arrived in JDK 1.5.
+            return;
+        }
         OlapConnection connection =
             TestContext.instance().getOlap4jConnection();
         final OlapStatement statement = connection.createStatement();
@@ -7222,6 +7227,11 @@ public void testExplain() throws SQLException {
     }
 
     public void testExplainComplex() throws SQLException {
+        if (Util.PreJdk15) {
+            // Cannot use explain before JDK 1.5. EmptyResultSet relies on
+            // javax.sql.rowset.RowSetMetaDataImpl, which arrived in JDK 1.5.
+            return;
+        }
         OlapConnection connection =
             TestContext.instance().getOlap4jConnection();
         final OlapStatement statement = connection.createStatement();

diff --git a/testsrc/main/mondrian/test/TestCalculatedMembers.java b/testsrc/main/mondrian/test/TestCalculatedMembers.java
@@ -938,7 +938,9 @@ public void testCalcMemberCustomFormatterInQueryNegative2() {
             "Failed to load formatter class 'java.lang.String' for member '[Measures].[Foo]'.");
         assertQueryThrows(
             query,
-            "java.lang.ClassCastException: java.lang.String");
+            Util.PreJdk15
+            ? "java.lang.ClassCastException"
+            : "java.lang.ClassCastException: java.lang.String");
     }
 
     public void testCalcMemberCustomFormatterInNonMeasureInQuery() {