MONDRIAN: Integrate @13244, checkFile fixes, from main line.

[git-p4: depot-paths = "//open/mondrian-release/3.1/": change = 13261]
pentaho · Dec 23, 2009 · 00d438d · 00d438d
1 parent 7afe046
commit 00d438d
Show file tree

Hide file tree

Showing 10 changed files with 194 additions and 175 deletions.
diff --git a/src/main/mondrian/rolap/CacheControlImpl.java b/src/main/mondrian/rolap/CacheControlImpl.java
@@ -221,8 +221,8 @@ public void flushSchema(Schema schema) {
         if (RolapSchema.class.isInstance(schema)) {
             RolapSchema.Pool.instance().remove((RolapSchema)schema);
         } else {
-            throw new UnsupportedOperationException(schema.getClass().getName()+
-                    " cannot be flushed");
+            throw new UnsupportedOperationException(
+                schema.getClass().getName() + " cannot be flushed");
         }
     }
 

diff --git a/src/main/mondrian/rolap/HierarchyUsage.java b/src/main/mondrian/rolap/HierarchyUsage.java
@@ -223,7 +223,8 @@ enum Kind {
             init(cube, hierarchy, null);
         }
         if (getLogger().isDebugEnabled()) {
-            getLogger().debug(toString()
+            getLogger().debug(
+                toString()
                 + ", cubeDim="
                 + cubeDim.getClass().getName());
         }

diff --git a/src/main/mondrian/rolap/agg/GroupingSetsList.java b/src/main/mondrian/rolap/agg/GroupingSetsList.java
@@ -79,8 +79,8 @@ List<RolapStar.Column[]> getGroupingColumnsList(
         List<RolapStar.Column[]> groupingColumns =
             new ArrayList<RolapStar.Column[]>();
         for (GroupingSet aggBatchDetail : groupingSets) {
-            groupingColumns.add(aggBatchDetail.getSegments()[0]
-                .aggregation.getColumns());
+            groupingColumns.add(
+                aggBatchDetail.getSegments()[0].aggregation.getColumns());
         }
         return groupingColumns;
     }

diff --git a/testsrc/main/mondrian/olap/fun/FunctionTest.java b/testsrc/main/mondrian/olap/fun/FunctionTest.java
@@ -2603,23 +2603,23 @@ public void testBasic2() {
         Result result =
             executeQuery(
                 "select {[Gender].[F].NextMember} ON COLUMNS from Sales");
-        Assert.assertTrue(
-            result.getAxes()[0].getPositions().get(0).get(0).getName()
-                .equals("M"));
+        assertEquals(
+            "M",
+            result.getAxes()[0].getPositions().get(0).get(0).getName());
     }
 
     public void testFirstInLevel2() {
         Result result =
             executeQuery(
                 "select {[Gender].[M].NextMember} ON COLUMNS from Sales");
-        Assert.assertTrue(result.getAxes()[0].getPositions().size() == 0);
+        assertEquals(0, result.getAxes()[0].getPositions().size());
     }
 
     public void testAll2() {
         Result result =
             executeQuery("select {[Gender].PrevMember} ON COLUMNS from Sales");
         // previous to [Gender].[All] is null, so no members are returned
-        Assert.assertTrue(result.getAxes()[0].getPositions().size() == 0);
+        assertEquals(0, result.getAxes()[0].getPositions().size());
     }
 
 
@@ -2628,19 +2628,19 @@ public void testBasic5() {
             executeQuery(
                 "select{ [Product].[All Products].[Drink].Parent} on columns "
                 + "from Sales");
-        Assert.assertTrue(
-            result.getAxes()[0].getPositions().get(0).get(0).getName()
-                .equals("All Products"));
+        assertEquals(
+            "All Products",
+            result.getAxes()[0].getPositions().get(0).get(0).getName());
     }
 
     public void testFirstInLevel5() {
         Result result =
             executeQuery(
                 "select {[Time].[1997].[Q2].[4].Parent} on columns,"
                 + "{[Gender].[M]} on rows from Sales");
-        Assert.assertTrue(
-                result.getAxes()[0].getPositions().get(0).get(0)
-                .getName().equals("Q2"));
+        assertEquals(
+            "Q2",
+            result.getAxes()[0].getPositions().get(0).get(0).getName());
     }
 
     public void testAll5() {
@@ -2649,32 +2649,32 @@ public void testAll5() {
                 "select {[Time].[1997].[Q2].Parent} on columns,"
                 + "{[Gender].[M]} on rows from Sales");
         // previous to [Gender].[All] is null, so no members are returned
-        Assert.assertTrue(
-            result.getAxes()[0].getPositions().get(0).get(0).getName()
-                .equals("1997"));
+        assertEquals(
+            "1997",
+            result.getAxes()[0].getPositions().get(0).get(0).getName());
     }
 
     public void testBasic() {
         Result result =
             executeQuery(
                 "select {[Gender].[M].PrevMember} ON COLUMNS from Sales");
-        Assert.assertTrue(
-            result.getAxes()[0].getPositions().get(0).get(0).getName()
-                .equals("F"));
+        assertEquals(
+            "F",
+            result.getAxes()[0].getPositions().get(0).get(0).getName());
     }
 
     public void testFirstInLevel() {
         Result result =
             executeQuery(
                 "select {[Gender].[F].PrevMember} ON COLUMNS from Sales");
-        Assert.assertTrue(result.getAxes()[0].getPositions().size() == 0);
+        assertEquals(0, result.getAxes()[0].getPositions().size());
     }
 
     public void testAll() {
         Result result =
             executeQuery("select {[Gender].PrevMember} ON COLUMNS from Sales");
         // previous to [Gender].[All] is null, so no members are returned
-        Assert.assertTrue(result.getAxes()[0].getPositions().size() == 0);
+        assertEquals(0, result.getAxes()[0].getPositions().size());
     }
 
     public void testAggregateDepends() {
@@ -6387,7 +6387,7 @@ public void testFilterCompound() {
             + "from Sales\n"
             + "where ([Time].[1997].[Q1])");
         List<Position> rows = result.getAxes()[1].getPositions();
-        Assert.assertTrue(rows.size() == 3);
+        Assert.assertEquals(3, rows.size());
         Assert.assertEquals("F", rows.get(0).get(0).getName());
         Assert.assertEquals("WA", rows.get(0).get(1).getName());
         Assert.assertEquals("M", rows.get(1).get(0).getName());