MONDRIAN: Integration backswing.

[git-p4: depot-paths = "//open/mondrian-release/3.2/": change = 13700]
pentaho · Jun 12, 2010 · d6374d6 · d6374d6
1 parent 5054bb7
commit d6374d6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/testsrc/main/mondrian/rolap/VirtualCubeTest.java b/testsrc/main/mondrian/rolap/VirtualCubeTest.java
@@ -95,6 +95,25 @@ public void testDefaultMeasureInVCForIncorrectMeasureName() {
         assertQueriesReturnSimilarResults(query1, query2, testContext);
     }
 
+    public void testVirtualCubeMeasureInvalidCubeName() {
+        TestContext testContext = TestContext.create(
+            null,
+            null,
+            "<VirtualCube name=\"Sales vs Warehouse\">\n"
+            + "<VirtualCubeDimension name=\"Product\"/>\n"
+            + "<VirtualCubeMeasure cubeName=\"Warehouse\" "
+            + "name=\"[Measures].[Warehouse Sales]\"/>\n"
+            + "<VirtualCubeMeasure cubeName=\"Bad cube\" "
+            + "name=\"[Measures].[Unit Sales]\"/>\n"
+            + "</VirtualCube>",
+            null,
+            null,
+            null);
+        testContext.assertQueryThrows(
+            "select from [Sales vs Warehouse]",
+            "Cube 'Bad cube' not found");
+    }
+
     public void testDefaultMeasureInVCForCaseSensitivity() {
         TestContext testContext = TestContext.create(
             null,
@@ -128,25 +147,6 @@ public void testDefaultMeasureInVCForCaseSensitivity() {
         }
     }
 
-    public void testVirtualCubeMeasureInvalidCubeName() {
-        TestContext testContext = TestContext.create(
-            null,
-            null,
-            "<VirtualCube name=\"Sales vs Warehouse\">\n"
-            + "<VirtualCubeDimension name=\"Product\"/>\n"
-            + "<VirtualCubeMeasure cubeName=\"Warehouse\" "
-            + "name=\"[Measures].[Warehouse Sales]\"/>\n"
-            + "<VirtualCubeMeasure cubeName=\"Bad cube\" "
-            + "name=\"[Measures].[Unit Sales]\"/>\n"
-            + "</VirtualCube>",
-            null,
-            null,
-            null);
-        testContext.assertQueryThrows(
-            "select from [Sales vs Warehouse]",
-            "Cube 'Bad cube' not found");
-    }
-
     public void testWithTimeDimension() {
         TestContext testContext = TestContext.create(
             null,

diff --git a/testsrc/main/mondrian/test/MultipleHierarchyTest.java b/testsrc/main/mondrian/test/MultipleHierarchyTest.java
@@ -214,7 +214,8 @@ public void testProperty() {
             + "[Measures].[Store type], "
             + "[Measures].[Store Sqft]"
             + "} ON COLUMNS,\n"
-            + "{" + nuStore + ".[All NuStores], "
+            + "{"
+            + nuStore + ".[All NuStores], "
             + nuStore + ".[Canada], "
             + nuStore + ".[Canada].[BC], "
             + nuStore + ".[Canada].[BC].[Vancouver], "