MONDRIAN: Disable testNonEmptyCrossJoin test if native crossjoin is d…

…isabled. (Bug 1688139.)

[git-p4: depot-paths = "//open/mondrian/": change = 8947]

testsrc/main/mondrian/test/BasicQueryTest.java

@@ -4504,9 +4504,15 @@ public void testFilteredCrossJoin() {
     }
 
     /**
-     * This resulted in an OutOfMemoryError
+     * Tests a query with a CrossJoin so large that we run out of memory unless
+     * we can push down evaluation to SQL.
      */
     public void testNonEmptyCrossJoin() {
+        if (!MondrianProperties.instance().EnableNativeCrossJoin.get()) {
+            // If we try to evaluate the crossjoin in memory we run out of
+            // memory.
+            return;
+        }
         CachePool.instance().flush();
         Result result = executeQuery(
                 "select {[Measures].[Store Sales]} on columns,\n" +
@@ -5252,7 +5258,7 @@ private void tryMemberOrdinalCaching(TestContext context) {
 
         // The query above primed the cache with bad absolute ordinals;
         // verify that this doesn't interfere with subsequent queries.
-        
+
         context.assertQueryReturns(
             "with member [Measures].[o] as 0\n" +
             "select tail([Customers].[Name].members, 5)\n" +