MONDRIAN: Fix test exceptions in FilterTest where SQL queries are now…

… 'even

    better than expected' if agg tables are enabled.

[git-p4: depot-paths = "//open/mondrian-release/3.2/": change = 13601]

testsrc/main/mondrian/rolap/FilterTest.java

@@ -332,6 +332,11 @@ public void testNotInFilterExcludeNullMember() throws Exception {
      * that contain multiple levels, but none being null.
      */
     public void testNotInMultiLevelMemberConstraintNonNullParent() {
+        if (MondrianProperties.instance().ReadAggregates.get()) {
+            // If aggregate tables are enabled, generates similar SQL involving
+            // agg tables.
+            return;
+        }
         String query =
             "With "
             + "Set [*NATIVE_CJ_SET] as 'NonEmptyCrossJoin([*BASE_MEMBERS_Customers],[*BASE_MEMBERS_Quarters])' "
@@ -395,6 +400,11 @@ public void testNotInMultiLevelMemberConstraintNonNullParent() {
      * the same parent.
      */
     public void testNotInMultiLevelMemberConstraintNonNullSameParent() {
+        if (MondrianProperties.instance().ReadAggregates.get()) {
+            // If aggregate tables are enabled, generates similar SQL involving
+            // agg tables.
+            return;
+        }
         String query =
             "With "
             + "Set [*NATIVE_CJ_SET] as 'NonEmptyCrossJoin([*BASE_MEMBERS_Customers],[*BASE_MEMBERS_Quarters])' "