Skip to content

Commit

Permalink
First round of fixes for Mondrian 4 compatibility.
Browse files Browse the repository at this point in the history 
git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@542 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information
@lucboudreau
lucboudreau committed Aug 1, 2012
1 parent 43d0836 commit d5ff50d
Show file tree
Hide file tree
Showing 5 changed files with 321 additions and 311 deletions.
96 changes: 48 additions & 48 deletions testsrc/org/olap4j/CellSetFormatterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@ public void testQuery1Traditional() throws SQLException {
"Axis #0:\n"
+ "{}\n"
+ "Axis #1:\n"
+ "{[Time].[1997].[Q1], [Measures].[Unit Sales]}\n"
+ "{[Time].[1997].[Q1], [Measures].[Store Sales]}\n"
+ "{[Time].[1997].[Q2].[4], [Measures].[Unit Sales]}\n"
+ "{[Time].[1997].[Q2].[4], [Measures].[Store Sales]}\n"
+ "{[Time].[Time].[1997].[Q1], [Measures].[Unit Sales]}\n"
+ "{[Time].[Time].[1997].[Q1], [Measures].[Store Sales]}\n"
+ "{[Time].[Time].[1997].[Q2].[4], [Measures].[Unit Sales]}\n"
+ "{[Time].[Time].[1997].[Q2].[4], [Measures].[Store Sales]}\n"
+ "Axis #2:\n"
+ "{[Store].[USA].[CA].[Los Angeles]}\n"
+ "{[Store].[USA].[WA].[Seattle]}\n"
+ "{[Store].[USA].[CA].[San Francisco]}\n"
+ "{[Store].[Store].[USA].[CA].[Los Angeles]}\n"
+ "{[Store].[Store].[USA].[WA].[Seattle]}\n"
+ "{[Store].[Store].[USA].[CA].[San Francisco]}\n"
+ "Row #0: 6,373\n"
+ "Row #0: 13,736.97\n"
+ "Row #0: 1,865\n"
Expand Down Expand Up @@ -351,13 +351,13 @@ public void testFilter() throws SQLException {
queryString,
Format.TRADITIONAL,
"Axis #0:\n"
+ "{[Gender].[M], [Marital Status].[S]}\n"
+ "{[Gender].[Gender].[M], [Marital Status].[Marital Status].[S]}\n"
+ "Axis #1:\n"
+ "{[Time].[1997].[Q1], [Measures].[Unit Sales]}\n"
+ "{[Time].[1997].[Q2].[4], [Measures].[Unit Sales]}\n"
+ "{[Time].[Time].[1997].[Q1], [Measures].[Unit Sales]}\n"
+ "{[Time].[Time].[1997].[Q2].[4], [Measures].[Unit Sales]}\n"
+ "Axis #2:\n"
+ "{[Store].[USA].[CA].[Los Angeles]}\n"
+ "{[Store].[USA].[CA].[San Francisco]}\n"
+ "{[Store].[Store].[USA].[CA].[Los Angeles]}\n"
+ "{[Store].[Store].[USA].[CA].[San Francisco]}\n"
+ "Row #0: 1,615\n"
+ "Row #0: 594\n"
+ "Row #1: 101\n"
Expand Down Expand Up @@ -403,18 +403,18 @@ public void testFilterCompound() throws SQLException {
queryString,
Format.TRADITIONAL,
"Axis #0:\n"
+ "{[Gender].[F], [Marital Status].[All Marital Status]}\n"
+ "{[Gender].[F], [Marital Status].[M]}\n"
+ "{[Gender].[F], [Marital Status].[S]}\n"
+ "{[Gender].[M], [Marital Status].[All Marital Status]}\n"
+ "{[Gender].[M], [Marital Status].[M]}\n"
+ "{[Gender].[M], [Marital Status].[S]}\n"
+ "{[Gender].[Gender].[F], [Marital Status].[Marital Status].[All Marital Status]}\n"
+ "{[Gender].[Gender].[F], [Marital Status].[Marital Status].[M]}\n"
+ "{[Gender].[Gender].[F], [Marital Status].[Marital Status].[S]}\n"
+ "{[Gender].[Gender].[M], [Marital Status].[Marital Status].[All Marital Status]}\n"
+ "{[Gender].[Gender].[M], [Marital Status].[Marital Status].[M]}\n"
+ "{[Gender].[Gender].[M], [Marital Status].[Marital Status].[S]}\n"
+ "Axis #1:\n"
+ "{[Time].[1997].[Q1], [Measures].[Unit Sales]}\n"
+ "{[Time].[1997].[Q2].[4], [Measures].[Unit Sales]}\n"
+ "{[Time].[Time].[1997].[Q1], [Measures].[Unit Sales]}\n"
+ "{[Time].[Time].[1997].[Q2].[4], [Measures].[Unit Sales]}\n"
+ "Axis #2:\n"
+ "{[Store].[USA].[CA].[Los Angeles]}\n"
+ "{[Store].[USA].[CA].[San Francisco]}\n"
+ "{[Store].[Store].[USA].[CA].[Los Angeles]}\n"
+ "{[Store].[Store].[USA].[CA].[San Francisco]}\n"
+ "Row #0: 6,373\n"
+ "Row #0: 1,865\n"
+ "Row #1: 439\n"
Expand Down Expand Up @@ -465,7 +465,7 @@ public void testThreeAxes() throws SQLException {
+ "FROM [Sales]",
Format.RECTANGULAR,
"\n"
+ "PAGES: [Product].[Drink]\n"
+ "PAGES: [Product].[Product].[Drink]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
Expand All @@ -477,7 +477,7 @@ public void testThreeAxes() throws SQLException {
+ "| | | | Los Angeles | 650 | 1,267.04 | 141 | 289.16 |\n"
+ "| | | WA | | 2,679 | 5,106.36 | 1,007 | 1,978.99 |\n"
+ "\n"
+ "PAGES: [Product].[Food].[Dairy]\n"
+ "PAGES: [Product].[Product].[Food].[Dairy]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
Expand All @@ -504,107 +504,107 @@ public void testFourAxes() throws SQLException {
+ "WHERE [Measures].[Store Sales]",
Format.RECTANGULAR,
"\n"
+ "CHAPTERS: [Marital Status].[All Marital Status], [Gender].[F]\n"
+ "PAGES: [Product].[Drink]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[All Marital Status], [Gender].[Gender].[F]\n"
+ "PAGES: [Product].[Product].[Drink]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+----------+\n"
+ "| USA | | 5,676.21 | 1,836.80 |\n"
+ "| | OR | 1,569.00 | 327.26 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[All Marital Status], [Gender].[F]\n"
+ "PAGES: [Product].[Food].[Dairy]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[All Marital Status], [Gender].[Gender].[F]\n"
+ "PAGES: [Product].[Product].[Food].[Dairy]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+----------+\n"
+ "| USA | | 3,873.00 | 1,378.20 |\n"
+ "| | OR | 1,069.88 | 284.91 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[All Marital Status], [Gender].[M]\n"
+ "PAGES: [Product].[Drink]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[All Marital Status], [Gender].[Gender].[M]\n"
+ "PAGES: [Product].[Product].[Drink]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+----------+\n"
+ "| USA | | 5,909.59 | 2,047.73 |\n"
+ "| | OR | 1,600.69 | 365.50 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[All Marital Status], [Gender].[M]\n"
+ "PAGES: [Product].[Food].[Dairy]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[All Marital Status], [Gender].[Gender].[M]\n"
+ "PAGES: [Product].[Product].[Food].[Dairy]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+----------+\n"
+ "| USA | | 3,835.75 | 1,134.60 |\n"
+ "| | OR | 1,089.06 | 230.57 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[M], [Gender].[F]\n"
+ "PAGES: [Product].[Drink]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[M], [Gender].[Gender].[F]\n"
+ "PAGES: [Product].[Product].[Drink]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+--------+\n"
+ "| USA | | 3,099.69 | 971.79 |\n"
+ "| | OR | 767.62 | 134.02 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[M], [Gender].[F]\n"
+ "PAGES: [Product].[Food].[Dairy]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[M], [Gender].[Gender].[F]\n"
+ "PAGES: [Product].[Product].[Food].[Dairy]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+--------+\n"
+ "| USA | | 2,125.13 | 732.95 |\n"
+ "| | OR | 581.31 | 160.55 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[M], [Gender].[M]\n"
+ "PAGES: [Product].[Drink]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[M], [Gender].[Gender].[M]\n"
+ "PAGES: [Product].[Product].[Drink]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+--------+\n"
+ "| USA | | 2,874.11 | 914.70 |\n"
+ "| | OR | 643.61 | 132.37 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[M], [Gender].[M]\n"
+ "PAGES: [Product].[Food].[Dairy]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[M], [Gender].[Gender].[M]\n"
+ "PAGES: [Product].[Product].[Food].[Dairy]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+--------+\n"
+ "| USA | | 1,920.54 | 528.54 |\n"
+ "| | OR | 519.94 | 108.96 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[S], [Gender].[F]\n"
+ "PAGES: [Product].[Drink]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[S], [Gender].[Gender].[F]\n"
+ "PAGES: [Product].[Product].[Drink]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+--------+\n"
+ "| USA | | 2,576.52 | 865.01 |\n"
+ "| | OR | 801.38 | 193.24 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[S], [Gender].[F]\n"
+ "PAGES: [Product].[Food].[Dairy]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[S], [Gender].[Gender].[F]\n"
+ "PAGES: [Product].[Product].[Food].[Dairy]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+--------+\n"
+ "| USA | | 1,747.87 | 645.25 |\n"
+ "| | OR | 488.57 | 124.36 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[S], [Gender].[M]\n"
+ "PAGES: [Product].[Drink]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[S], [Gender].[Gender].[M]\n"
+ "PAGES: [Product].[Product].[Drink]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
+ "+-----+----+----------+----------+\n"
+ "| USA | | 3,035.48 | 1,133.03 |\n"
+ "| | OR | 957.08 | 233.13 |\n"
+ "\n"
+ "CHAPTERS: [Marital Status].[S], [Gender].[M]\n"
+ "PAGES: [Product].[Food].[Dairy]\n"
+ "CHAPTERS: [Marital Status].[Marital Status].[S], [Gender].[Gender].[M]\n"
+ "PAGES: [Product].[Product].[Food].[Dairy]\n"
+ "| | 1997 |\n"
+ "| | Q1 | Q2 |\n"
+ "| | | 4 |\n"
Expand Down
Loading

0 comments on commit d5ff50d

Please sign in to comment.