Skip to content

Commit

Permalink
MONDRIAN - fixed tests that were failing on Windows
Browse files Browse the repository at this point in the history
[git-p4: depot-paths = "//open/mondrian/": change = 7208]
  • Loading branch information
Zelaine Fong committed Jul 20, 2006
1 parent c301527 commit a04ea21
Show file tree
Hide file tree
Showing 7 changed files with 241 additions and 232 deletions.
27 changes: 18 additions & 9 deletions testsrc/main/mondrian/test/UdfTest.java
Expand Up @@ -241,7 +241,8 @@ public void testCurrentDateMemberBefore()
"{}",
"Axis #1:",
"{[Time].[1998].[Q4].[12]}",
"Row #0: \n"
"Row #0: ",
""
}));
}

Expand All @@ -256,7 +257,8 @@ public void testCurrentDateMemberAfter()
fold(new String[] {
"Axis #0:",
"{}",
"Axis #1:\n"
"Axis #1:",
""
}));
}

Expand All @@ -271,7 +273,8 @@ public void testCurrentDateMemberExact()
fold(new String[] {
"Axis #0:",
"{}",
"Axis #1:\n"
"Axis #1:",
""
}));
}

Expand All @@ -286,7 +289,8 @@ public void testCurrentDateMemberNoFindArg()
fold(new String[] {
"Axis #0:",
"{}",
"Axis #1:\n"
"Axis #1:",
""
}));
}

Expand All @@ -301,7 +305,8 @@ public void testCurrentDateMemberHierarchy()
"{}",
"Axis #1:",
"{[Time.Weekly].[All Time.Weeklys].[1998].[52]}",
"Row #0: \n"
"Row #0: ",
""
}));
}

Expand All @@ -319,7 +324,8 @@ public void testCurrentDateMemberRealAfter()
"{}",
"Axis #1:",
"{[Time].[1997].[Q1]}",
"Row #0: 66,291\n"
"Row #0: 66,291",
""
}));
}

Expand All @@ -337,7 +343,8 @@ public void testCurrentDateMemberRealExact1()
"{}",
"Axis #1:",
"{[Time].[1997]}",
"Row #0: 266,773\n"
"Row #0: 266,773",
""
}));
}

Expand All @@ -355,7 +362,8 @@ public void testCurrentDateMemberRealExact2()
"{}",
"Axis #1:",
"{[Time].[1997].[Q2].[5]}",
"Row #0: 21,081\n"
"Row #0: 21,081",
""
}));
}

Expand All @@ -371,7 +379,8 @@ public void testCurrentDateMemberPrev()
"{}",
"Axis #1:",
"{[Time].[1998].[Q4].[11]}",
"Row #0: \n"
"Row #0: ",
""
}));
}

Expand Down
136 changes: 68 additions & 68 deletions testsrc/queryfiles/queryTest_29ce2f3512f79d38_TOPCOUNT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<mdbTest>
<mdxQuery>WITH MEMBER [Store].[Other Cities] AS '([Store].[All Stores], Measures.CURRENTMEMBER) - SUM(TOPCOUNT([Store].[Store City].MEMBERS, 12, [Sales Count]), Measures.CURRENTMEMBER)' SELECT {Measures.MEMBERS} ON COLUMNS, {TOPCOUNT([Store].[Store City].MEMBERS, 12, [Sales Count]), [Store].[Other Cities]} ON ROWS FROM [Sales]</mdxQuery>
<mdxQuery>WITH MEMBER [Store].[Other Cities] AS '([Store].[All Stores], Measures.CURRENTMEMBER) - SUM(TOPCOUNT([Store].[Store City].MEMBERS, 12, [Sales Count]), Measures.CURRENTMEMBER)' SELECT {Measures.[Sales Count], Measures.[Store Cost], Measures.[Store Sales], Measures.[Unit Sales], Measures.[Customer Count]} ON COLUMNS, {TOPCOUNT([Store].[Store City].MEMBERS, 12, [Sales Count]), [Store].[Other Cities]} ON ROWS FROM [Sales]</mdxQuery>
<dataResult>
<slicer>
<dimensions>
Expand Down Expand Up @@ -38,7 +38,7 @@
</dimensions>
<tuples>
<tuple>
<member>[Measures].[Unit Sales]</member>
<member>[Measures].[Sales Count]</member>
</tuple>
<tuple>
<member>[Measures].[Store Cost]</member>
Expand All @@ -47,7 +47,7 @@
<member>[Measures].[Store Sales]</member>
</tuple>
<tuple>
<member>[Measures].[Sales Count]</member>
<member>[Measures].[Unit Sales]</member>
</tuple>
<tuple>
<member>[Measures].[Customer Count]</member>
Expand Down Expand Up @@ -102,95 +102,95 @@
</rows>
<data>
<drow>
<cell>41580.0</cell> <!-- Unit Sales -->
<cell>34823.5566</cell> <!-- Store Cost -->
<cell>87218.28</cell> <!-- Store Sales -->
<cell>13347.0</cell> <!-- Sales Count -->
<cell>474.0</cell> <!-- Customer Count -->
<cell>13347.0</cell>
<cell>34823.5566</cell>
<cell>87218.28</cell>
<cell>41580.0</cell>
<cell>474.0</cell>
</drow>
<drow>
<cell>35257.0</cell> <!-- Unit Sales -->
<cell>29959.2813</cell> <!-- Store Cost -->
<cell>74843.96</cell> <!-- Store Sales -->
<cell>11184.0</cell> <!-- Sales Count -->
<cell>278.0</cell> <!-- Customer Count -->
<cell>11184.0</cell>
<cell>29959.2813</cell>
<cell>74843.96</cell>
<cell>35257.0</cell>
<cell>278.0</cell>
</drow>
<drow>
<cell>26079.0</cell> <!-- Unit Sales -->
<cell>21948.944</cell> <!-- Store Cost -->
<cell>55058.79</cell> <!-- Store Sales -->
<cell>8264.0</cell> <!-- Sales Count -->
<cell>563.0</cell> <!-- Customer Count -->
<cell>8264.0</cell>
<cell>21948.944</cell>
<cell>55058.79</cell>
<cell>26079.0</cell>
<cell>563.0</cell>
</drow>
<drow>
<cell>25663.0</cell> <!-- Unit Sales -->
<cell>21771.536</cell> <!-- Store Cost -->
<cell>54545.28</cell> <!-- Store Sales -->
<cell>8207.0</cell> <!-- Sales Count -->
<cell>1147.0</cell> <!-- Customer Count -->
<cell>8207.0</cell>
<cell>21771.536</cell>
<cell>54545.28</cell>
<cell>25663.0</cell>
<cell>1147.0</cell>
</drow>
<drow>
<cell>25635.0</cell> <!-- Unit Sales -->
<cell>21713.5328</cell> <!-- Store Cost -->
<cell>54431.14</cell> <!-- Store Sales -->
<cell>8095.0</cell> <!-- Sales Count -->
<cell>962.0</cell> <!-- Customer Count -->
<cell>8095.0</cell>
<cell>21713.5328</cell>
<cell>54431.14</cell>
<cell>25635.0</cell>
<cell>962.0</cell>
</drow>
<drow>
<cell>25011.0</cell> <!-- Unit Sales -->
<cell>20956.8025</cell> <!-- Store Cost -->
<cell>52644.07</cell> <!-- Store Sales -->
<cell>7956.0</cell> <!-- Sales Count -->
<cell>906.0</cell> <!-- Customer Count -->
<cell>7956.0</cell>
<cell>20956.8025</cell>
<cell>52644.07</cell>
<cell>25011.0</cell>
<cell>906.0</cell>
</drow>
<drow>
<cell>24576.0</cell> <!-- Unit Sales -->
<cell>21121.9631</cell> <!-- Store Cost -->
<cell>52896.3</cell> <!-- Store Sales -->
<cell>7876.0</cell> <!-- Sales Count -->
<cell>179.0</cell> <!-- Customer Count -->
<cell>7876.0</cell>
<cell>21121.9631</cell>
<cell>52896.3</cell>
<cell>24576.0</cell>
<cell>179.0</cell>
</drow>
<drow>
<cell>23591.0</cell> <!-- Unit Sales -->
<cell>19795.491</cell> <!-- Store Cost -->
<cell>49634.46</cell> <!-- Store Sales -->
<cell>7397.0</cell> <!-- Sales Count -->
<cell>84.0</cell> <!-- Customer Count -->
<cell>7397.0</cell>
<cell>19795.491</cell>
<cell>49634.46</cell>
<cell>23591.0</cell>
<cell>84.0</cell>
</drow>
<drow>
<cell>21333.0</cell> <!-- Unit Sales -->
<cell>18266.4404</cell> <!-- Store Cost -->
<cell>45750.24</cell> <!-- Store Sales -->
<cell>6815.0</cell> <!-- Sales Count -->
<cell>1059.0</cell> <!-- Customer Count -->
<cell>6815.0</cell>
<cell>18266.4404</cell>
<cell>45750.24</cell>
<cell>21333.0</cell>
<cell>1059.0</cell>
</drow>
<drow>
<cell>11491.0</cell> <!-- Unit Sales -->
<cell>9713.813</cell> <!-- Store Cost -->
<cell>24329.23</cell> <!-- Store Sales -->
<cell>3652.0</cell> <!-- Sales Count -->
<cell>95.0</cell> <!-- Customer Count -->
<cell>3652.0</cell>
<cell>9713.813</cell>
<cell>24329.23</cell>
<cell>11491.0</cell>
<cell>95.0</cell>
</drow>
<drow>
<cell>2237.0</cell> <!-- Unit Sales -->
<cell>1896.6174</cell> <!-- Store Cost -->
<cell>4739.23</cell> <!-- Store Sales -->
<cell>1380.0</cell> <!-- Sales Count -->
<cell>190.0</cell> <!-- Customer Count -->
<cell>1380.0</cell>
<cell>1896.6174</cell>
<cell>4739.23</cell>
<cell>2237.0</cell>
<cell>190.0</cell>
</drow>
<drow>
<cell>2203.0</cell> <!-- Unit Sales -->
<cell>1880.3396</cell> <!-- Store Cost -->
<cell>4705.97</cell> <!-- Store Sales -->
<cell>1339.0</cell> <!-- Sales Count -->
<cell>96.0</cell> <!-- Customer Count -->
<cell>1339.0</cell>
<cell>1880.3396</cell>
<cell>4705.97</cell>
<cell>2203.0</cell>
<cell>96.0</cell>
</drow>
<drow>
<cell>2117.0</cell> <!-- Unit Sales -->
<cell>1778.9159</cell> <!-- Store Cost -->
<cell>4441.18</cell> <!-- Store Sales -->
<cell>1325.0</cell> <!-- Sales Count -->
<cell>-452.0</cell> <!-- Customer Count -->
<cell>1325.0</cell>
<cell>1778.9159</cell>
<cell>4441.18</cell>
<cell>2117.0</cell>
<cell>-452.0</cell>
</drow>
</data>
</dataResult>
Expand Down

0 comments on commit a04ea21

Please sign in to comment.