MONDRIAN: generate a Java-quoted version of periodstodate

test, and remove some escape characters which were preventing generateDiffRepositoryJUnit output from compiling [git-p4: depot-paths = "//open/mondrian/": change = 11592]
pentaho · Sep 21, 2008 · 41a81c4 · 41a81c4
1 parent 0915b20
commit 41a81c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/testsrc/main/mondrian/olap/fun/FunctionTest.java b/testsrc/main/mondrian/olap/fun/FunctionTest.java
@@ -6646,6 +6646,26 @@ public void testPeriodsToDate() {
                 "Row #1: 45,539.69\n" +
                 "Row #1: 89,598.48\n" +
                 "Row #1: 139,628.35\n"));
+
+        assertQueryReturns(
+            "select\n" +
+            "{[Measures].[Unit Sales]} on columns,\n" +
+            "periodstodate(\n" +
+            "    [Product].[Product Category],\n" +
+            "    [Product].[Food].[Baked Goods].[Bread].[Muffins]) on rows\n" +
+            "from [Sales]\n" +
+            "", 
+            fold(
+                "Axis #0:\n" +
+                "{}\n" +
+                "Axis #1:\n" +
+                "{[Measures].[Unit Sales]}\n" +
+                "Axis #2:\n" +
+                "{[Product].[All Products].[Food].[Baked Goods].[Bread].[Bagels]}\n" +
+                "{[Product].[All Products].[Food].[Baked Goods].[Bread].[Muffins]}\n" +
+                "Row #0: 815\n" +
+                "Row #1: 3,497\n" +
+                ""));
     }
 
     public void testSetToStr() {

diff --git a/testsrc/main/mondrian/test/clearview/MiscTest.ref.xml b/testsrc/main/mondrian/test/clearview/MiscTest.ref.xml
@@ -137,7 +137,7 @@ With
   Set [*BASE_MEMBERS_Measures] as '{[Measures].[*FORMATTED_MEASURE_0]}'
   Set [*BASE_MEMBERS_Gender] as '[Gender].[Gender].Members'
   Set [*NATIVE_MEMBERS_Gender] as 'Generate([*NATIVE_CJ_SET], {[Gender].CurrentMember})'
-  Set [*BASE_MEMBERS_Product] as 'Filter([Product].[Product Name].Members,[Product].CurrentMember.Name Not Matches ("(?i).*\QLow Fat Bologna\E.*"))'
+  Set [*BASE_MEMBERS_Product] as 'Filter([Product].[Product Name].Members,[Product].CurrentMember.Name Not Matches ("(?i).*Low Fat Bologna.*"))'
   Set [*NATIVE_MEMBERS_Product] as 'Generate([*NATIVE_CJ_SET], {[Product].CurrentMember})'
   Set [*BASE_MEMBERS_Time] as '{[Time].[1997]}'
   Set [*NATIVE_MEMBERS_Time] as 'Generate([*NATIVE_CJ_SET], {[Time].CurrentMember})'