From cae3a13f48cb06cdbb9f534fcc3daf21400db7d0 Mon Sep 17 00:00:00 2001
From: Julian Hyde <julianhyde@gmail.com>
Date: Wed, 17 Nov 2010 08:48:31 +0000
Subject: [PATCH] Upgrade mondrian to fix bug: require its XMLA server to
 return a filter axis in a query result even if filter axis has 0 tuples.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@369 c6a108a4-781c-0410-a6c6-c2d559e19af0
---
 ivy.xml                                | 2 +-
 testsrc/org/olap4j/ConnectionTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 5159084..b08ed3a 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -76,7 +76,7 @@
     <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"
       transitive="false" conf="test->default" />
 
-    <dependency org="pentaho" name="mondrian" rev="3.2.1.13914"
+    <dependency org="pentaho" name="mondrian" rev="3.2.1.13916"
       transitive="false" changing="true" conf="test->default" />
 
     <dependency org="eigenbase" name="eigenbase-xom" rev="1.3.0.11999"
diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java
index 1565a9d..e4bc432 100644
--- a/testsrc/org/olap4j/ConnectionTest.java
+++ b/testsrc/org/olap4j/ConnectionTest.java
@@ -577,7 +577,7 @@ public void testEmptyFilter() throws SQLException {
         assertEquals(0, filterAxis.getPositionCount());
         final List<Position> filterPositions = filterAxis.getPositions();
         assertEquals(0, filterPositions.size());
-        assertEquals(0, filterAxis.getAxisMetaData().getHierarchies().size());
+        assertEquals(2, filterAxis.getAxisMetaData().getHierarchies().size());
         final Cell cell = cellSet.getCell(Arrays.asList(0, 0));
         assertTrue(cell.isNull());
     }
@@ -1550,7 +1550,7 @@ public void testBuildParseTree() {
     }
 
     /**
-     * Tests the {@link Cube#lookupMember(java.util.List} method.
+     * Tests the {@link Cube#lookupMember(java.util.List)} method.
      */
     public void testCubeLookupMember() throws Exception {
         Class.forName(tester.getDriverClassName());