fix tests after creating olap repository

Signed-off-by: dbulahov <[email protected]>

Author: dbulahov

mondrian/src/test/java/mondrian/rolap/agg/AggregationOnDistinctCountMeasuresTest.java

@@ -559,7 +559,7 @@ void testAggregationOverLargeListGeneratesError(Context<?> context) {
               + "{[Measures].[Customer Count]}\n"
               + "Axis #2:\n"
               + "{[Product].[Product].[X]}\n"
-              + "Row #0: #ERR: mondrian.olap.fun.MondrianEvaluationException: "
+              + "Row #0: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: "
               + "Aggregation is not supported over a list with more than 7 predicates (see property MaxConstraints)\n");
 
         // aggregation over a non-distinct-count measure is OK

mondrian/src/test/java/mondrian/test/BasicQueryTest.java

@@ -3372,18 +3372,18 @@ public void _testDc4dtp2(Context<?> context) {
                   + "Row #3: 2,015.528\n"
                   + "Row #3: 1,641.615\n"
                   + "Row #3: 1,584.334\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q1].[1]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q1].[2]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q1].[3]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q2].[4]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q2].[5]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q2].[6]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q3].[7]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q3].[8]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q3].[9]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q4].[10]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q4].[11]'\n"
-                  + "Row #4: #ERR: mondrian.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q4].[12]'\n");
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q1].[1]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q1].[2]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q1].[3]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q2].[4]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q2].[5]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q2].[6]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q3].[7]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q3].[8]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q3].[9]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q4].[10]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q4].[11]'\n"
+                  + "Row #4: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Property 'Dynamic Forecast Multiplier' is not valid for member '[Time].[Time].[1997].[Q4].[12]'\n");
   }
 
   @ParameterizedTest

mondrian/src/test/java/mondrian/test/ParentChildHierarchyTest.java

@@ -879,7 +879,7 @@ void testGenuineCycle(Context<?> context) {
         //
         // So encapsulate the error string as a pattern.
         final String expectedPattern =
-            "(?s).*Row #0: #ERR: mondrian.olap.fun.MondrianEvaluationException.*: Infinite loop while evaluating calculated member \\'\\[Measures\\].\\[Foo\\]\\'; context stack is.*";
+            "(?s).*Row #0: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException.*: Infinite loop while evaluating calculated member \\'\\[Measures\\].\\[Foo\\]\\'; context stack is.*";
         if (!resultString.matches(expectedPattern)) {
             System.out.println(resultString);
             assertEquals(expectedPattern, resultString);

mondrian/src/test/java/mondrian/test/SolveOrderScopeIsolationTest.java

@@ -551,10 +551,10 @@ void testAggregateMemberEvalAfterOtherMembersAbsolute(Context<?> context) {
             + "{[Time].[Time].[Total1]}\n"
             + "{[Time].[Time].[1997].[Q1]}\n"
             + "{[Time].[Time].[1997].[Q2]}\n"
-            + "Row #0: #ERR: mondrian.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
+            + "Row #0: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
             + "Row #0: 128,901\n"
             + "Row #0: 41,956\n"
-            + "Row #1: #ERR: mondrian.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
+            + "Row #1: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
             + "Row #1: 128,901\n"
             + "Row #1: 41,956\n"
             + "Row #2: 3.07\n"
@@ -647,10 +647,10 @@ void testConditionalAggregateMemberEvalAfterOtherMembersAbsolute(Context<?> cont
             + "{[Time].[Time].[Total1]}\n"
             + "{[Time].[Time].[1997].[Q1]}\n"
             + "{[Time].[Time].[1997].[Q2]}\n"
-            + "Row #0: #ERR: mondrian.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
+            + "Row #0: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
             + "Row #0: 128,901\n"
             + "Row #0: 41,956\n"
-            + "Row #1: #ERR: mondrian.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
+            + "Row #1: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
             + "Row #1: 128,901\n"
             + "Row #1: 41,956\n"
             + "Row #2: 3\n"
@@ -742,7 +742,7 @@ void testStrToMemberReturningAggEvalAfterOtherMembersAbsolute(Context<?> context
             + "{[Time].[Time].[Total]}\n"
             + "{[Time].[Time].[1997].[Q1]}\n"
             + "{[Time].[Time].[1997].[Q2]}\n"
-            + "Row #0: #ERR: mondrian.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
+            + "Row #0: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: Could not find an aggregator in the current evaluation context\n"
             + "Row #0: 128,901\n"
             + "Row #0: 41,956\n"
             + "Row #1: 3.07\n"

mondrian/src/test/java/mondrian/test/TestCalculatedMembers.java

@@ -1702,7 +1702,7 @@ void testBugMondrian852(Context<?> context) {
             + "{}\n"
             + "Axis #1:\n"
             + "{[Measures].[Foo]}\n"
-            + "Row #0: #ERR: mondrian.olap.fun.MondrianEvaluationException: wrtong typed, was: 123.0\n");
+            + "Row #0: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: wrtong typed, was: 123.0\n");
 
         // unrelated to Mondrian852 we were occasionally seeing differences
         // in number of digits of the casted value based on whether the
@@ -1737,7 +1737,7 @@ void testBugMondrian852(Context<?> context) {
             + "{[Measures].[Unit Sales]}\n"
             + "{[Measures].[Tom1]}\n"
             + "Row #0: 21628.0, 20957.0, 23706.0, 20179.0\n"
-            + "Row #1: #ERR: mondrian.olap.fun.MondrianEvaluationException: wrtong typed, was: 45539.69, 44058.79, 50029.87, 42878.25\n");
+            + "Row #1: #ERR: org.eclipse.daanse.olap.fun.MondrianEvaluationException: wrtong typed, was: 45539.69, 44058.79, 50029.87, 42878.25\n");
 
         // Solve orders to achieve what Tom intended.
         assertQueryReturns(context.getConnectionWithDefaultRole(),

…n/def/crossjoin/CrossJoinFunDefTest.java …/def/crossjoinx/CrossJoinFunDefTest.javamondrian/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinFunDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/crossjoinx/CrossJoinFunDefTest.java mondrian/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinFunDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/crossjoinx/CrossJoinFunDefTest.java

@@ -11,7 +11,7 @@
  *   SmartCity Jena - initial
  *   Stefan Bischof (bipolis.org) - initial
  */
-package org.eclipse.daanse.olap.function.def.crossjoin;
+package org.eclipse.daanse.olap.function.def.crossjoinx;
 
 import static mondrian.olap.fun.FunctionTest.assertExprReturns;
 import static org.opencube.junit5.TestUtil.assertAxisReturns;

…ossjoin/NonEmptyCrossJoinFunDefTest.java …ssjoinx/NonEmptyCrossJoinFunDefTest.javamondrian/src/test/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoin/NonEmptyCrossJoinFunDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoinx/NonEmptyCrossJoinFunDefTest.java mondrian/src/test/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoin/NonEmptyCrossJoinFunDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoinx/NonEmptyCrossJoinFunDefTest.java

@@ -11,7 +11,7 @@
  *   SmartCity Jena - initial
  *   Stefan Bischof (bipolis.org) - initial
  */
-package org.eclipse.daanse.olap.function.def.nonemptycrossjoin;
+package org.eclipse.daanse.olap.function.def.nonemptycrossjoinx;
 
 import static mondrian.olap.fun.FunctionTest.allHiersExcept;
 import static org.opencube.junit5.TestUtil.assertAxisReturns;

…/def/operators/or/OrOperatorDefTest.java …def/operators/orx/OrOperatorDefTest.javamondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/or/OrOperatorDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/orx/OrOperatorDefTest.java mondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/or/OrOperatorDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/orx/OrOperatorDefTest.java

@@ -11,7 +11,7 @@
  *   SmartCity Jena - initial
  *   Stefan Bischof (bipolis.org) - initial
  */
-package org.eclipse.daanse.olap.function.def.operators.or;
+package org.eclipse.daanse.olap.function.def.operators.orx;
 
 import static mondrian.enums.DatabaseProduct.getDatabaseProduct;
 import static org.opencube.junit5.TestUtil.assertBooleanExprReturns;

…perators/or/OrStringOperatorDefTest.java …erators/orx/OrStringOperatorDefTest.javamondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/or/OrStringOperatorDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/orx/OrStringOperatorDefTest.java mondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/or/OrStringOperatorDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/operators/orx/OrStringOperatorDefTest.java

@@ -11,7 +11,7 @@
  *   SmartCity Jena - initial
  *   Stefan Bischof (bipolis.org) - initial
  */
-package org.eclipse.daanse.olap.function.def.operators.or;
+package org.eclipse.daanse.olap.function.def.operators.orx;
 
 import static mondrian.olap.fun.FunctionTest.assertExprReturns;
 

…/set/hierarchy/AllMembersFunDefTest.java …set/hierarchyx/AllMembersFunDefTest.javamondrian/src/test/java/org/eclipse/daanse/olap/function/def/set/hierarchy/AllMembersFunDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/set/hierarchyx/AllMembersFunDefTest.java mondrian/src/test/java/org/eclipse/daanse/olap/function/def/set/hierarchy/AllMembersFunDefTest.java renamed to mondrian/src/test/java/org/eclipse/daanse/olap/function/def/set/hierarchyx/AllMembersFunDefTest.java

@@ -11,7 +11,7 @@
  *   SmartCity Jena - initial
  *   Stefan Bischof (bipolis.org) - initial
  */
-package org.eclipse.daanse.olap.function.def.set.hierarchy;
+package org.eclipse.daanse.olap.function.def.set.hierarchyx;
 
 import static mondrian.enums.DatabaseProduct.getDatabaseProduct;
 import static org.opencube.junit5.TestUtil.assertAxisReturns;