adapt QM tests to new filter behaviour (set instead of tuple)

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@355 c6a108a4-781c-0410-a6c6-c2d559e19af0
ps3331333 · Oct 8, 2010 · 3d67870 · 3d67870
1 parent 633b604
commit 3d67870
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/testsrc/org/olap4j/OlapTest.java b/testsrc/org/olap4j/OlapTest.java
@@ -463,7 +463,7 @@ public void testSortDimension() {
  + "{[Measures].[Store Sales]} ON COLUMNS,\n"
  + "{{[Product].[Drink], [Product].[Drink].Children}} ON ROWS\n"
  + "FROM [Sales]\n"
- + "WHERE ([Time].[1997].[Q3].[7])",
+ + "WHERE {[Time].[1997].[Q3].[7]}",
  mdxString);
 
  // Sort the products in ascending order.
@@ -476,7 +476,7 @@ public void testSortDimension() {
  + "{[Measures].[Store Sales]} ON COLUMNS,\n"
  + "{Order({{[Product].[Drink], [Product].[Drink].Children}}, [Product].CurrentMember.Name, DESC)} ON ROWS\n"
  + "FROM [Sales]\n"
- + "WHERE ([Time].[1997].[Q3].[7])",
+ + "WHERE {[Time].[1997].[Q3].[7]}",
  sortedMdxString);
 
  CellSet results = query.execute();
@@ -654,7 +654,7 @@ public void testSortAxis() {
  + "{[Measures].[Store Sales]} ON COLUMNS,\n"
  + "{{[Product].[Drink], [Product].[Drink].Children}} ON ROWS\n"
  + "FROM [Sales]\n"
- + "WHERE ([Time].[1997].[Q3].[7])",
+ + "WHERE {[Time].[1997].[Q3].[7]}",
  mdxString);
 
  // Sort the rows in ascending order.
@@ -670,7 +670,7 @@ public void testSortAxis() {
  + "{[Measures].[Store Sales]} ON COLUMNS,\n"
  + "Order({{[Product].[Drink], [Product].[Drink].Children}}, [Measures].[Store Sales], BASC) ON ROWS\n"
  + "FROM [Sales]\n"
- + "WHERE ([Time].[1997].[Q3].[7])",
+ + "WHERE {[Time].[1997].[Q3].[7]}",
  sortedMdxString);
 
  CellSet results = query.execute();
@@ -942,7 +942,7 @@ public void testExclusionModes() {
  + "{[Measures].[Sales Count]} ON COLUMNS,\n"
  + "{[Product].[Drink].[Beverages].Children, [Product].[Food].[Frozen Foods].Children} ON ROWS\n"
  + "FROM [Sales]\n"
- + "WHERE ([Time].[1997].[Q3].[7])",
+ + "WHERE {[Time].[1997].[Q3].[7]}",
  mdxString);
 
  // Validate the returned results
@@ -992,7 +992,7 @@ public void testExclusionModes() {
  + "{[Measures].[Sales Count]} ON COLUMNS,\n"
  + "{Except({[Product].[Drink].[Beverages].Children, [Product].[Food].[Frozen Foods].Children}, {[Product].[Drink].[Beverages].[Carbonated Beverages]})} ON ROWS\n"
  + "FROM [Sales]\n"
- + "WHERE ([Time].[1997].[Q3].[7])",
+ + "WHERE {[Time].[1997].[Q3].[7]}",
  mdxString);
 
  // Validate the returned results