Accommodate org.mozilla.rhino 1.8.0 API breakage

- Update tests expectations as well.
eclipse-birt · Jan 14, 2025 · 54e4691 · 54e4691
1 parent bd4d5ea
commit 54e4691
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 41 deletions.
diff --git a/...designer.ui.data/src/org/eclipse/birt/report/designer/data/ui/util/ExpressionUtility.java b/...designer.ui.data/src/org/eclipse/birt/report/designer/data/ui/util/ExpressionUtility.java
@@ -83,7 +83,7 @@ public static boolean isColumnExpression(String expression, boolean mode) {
 			m_compilerEnv.initFromContext(context);
 			Parser p = new Parser(m_compilerEnv, context.getErrorReporter());
 			AstRoot root = p.parse(expression, null, 0);
-			IRFactory ir = new IRFactory(m_compilerEnv);
+			IRFactory ir = new IRFactory(m_compilerEnv, "");
 			tree = ir.transformTree(root);
 		} catch (Exception e) {
 			getCompiledExpCacheMap(mode).put(expression, Boolean.valueOf(false));

diff --git a/...port.designer.ui/src/org/eclipse/birt/report/designer/data/ui/util/ExpressionUtility.java b/...port.designer.ui/src/org/eclipse/birt/report/designer/data/ui/util/ExpressionUtility.java
@@ -83,7 +83,7 @@ public static boolean isColumnExpression(String expression, boolean mode) {
 			m_compilerEnv.initFromContext(context);
 			Parser p = new Parser(m_compilerEnv, context.getErrorReporter());
 			AstRoot root = p.parse(expression, null, 0);
-			IRFactory ir = new IRFactory(m_compilerEnv);
+			IRFactory ir = new IRFactory(m_compilerEnv, "");
 			tree = ir.transformTree(root);
 		} catch (Exception e) {
 			getCompiledExpCacheMap(mode).put(expression, Boolean.valueOf(false));

diff --git a/....designer.ui/src/org/eclipse/birt/report/designer/internal/ui/util/ExpressionUtility.java b/....designer.ui/src/org/eclipse/birt/report/designer/internal/ui/util/ExpressionUtility.java
@@ -89,7 +89,7 @@ public static boolean isColumnExpression(String expression) {
 			m_compilerEnv.initFromContext(context);
 			Parser p = new Parser(m_compilerEnv, context.getErrorReporter());
 			AstRoot root = p.parse(expression, null, 0);
-			IRFactory ir = new IRFactory(m_compilerEnv);
+			IRFactory ir = new IRFactory(m_compilerEnv, "");
 			tree = ir.transformTree(root);
 		} catch (Exception e) {
 			compiledExprCache.put(expression, Boolean.valueOf(false));

diff --git a/core/org.eclipse.birt.core/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core/META-INF/MANIFEST.MF
@@ -37,7 +37,7 @@ Export-Package: org.eclipse.birt.core.archive,
  org.eclipse.birt.core.template,
  org.eclipse.birt.core.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.mozilla.rhino;bundle-version="1.7.4";visibility:=reexport,
+ org.mozilla.rhino;bundle-version="1.8.0";visibility:=reexport,
  com.ibm.icu;bundle-version="70.1.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Eclipse-ExtensibleAPI: true

diff --git a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/ExpressionParserUtility.java b/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/ExpressionParserUtility.java
@@ -154,7 +154,7 @@ private ScriptNode parse(String expression, Context cx) {
 		CompilerEnvirons compilerEnv = new CompilerEnvirons();
 		Parser p = new Parser(compilerEnv, cx.getErrorReporter());
 		AstRoot root = p.parse(expression, null, 0);
-		IRFactory ir = new IRFactory(compilerEnv);
+		IRFactory ir = new IRFactory(compilerEnv, "");
 		return ir.transformTree(root);
 	}
 

diff --git a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/OlapExpressionCompiler.java b/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/OlapExpressionCompiler.java
@@ -50,7 +50,7 @@ public static Set<String> getReferencedMeasure(String expr) {
 			CompilerEnvirons ce = new CompilerEnvirons();
 			Parser p = new Parser(ce, cx.getErrorReporter());
 			AstRoot tree = p.parse(expr, null, 0);
-			IRFactory ir = new IRFactory(ce);
+			IRFactory ir = new IRFactory(ce, "");
 			ScriptNode script = ir.transformTree(tree);
 			getScriptObjectName(script, "measure", result); //$NON-NLS-1$
 
@@ -80,7 +80,7 @@ public static Set<IDimLevel> getReferencedDimLevel(String expr) throws CoreExcep
 			CompilerEnvirons ce = new CompilerEnvirons();
 			Parser p = new Parser(ce, cx.getErrorReporter());
 			AstRoot tree = p.parse(expr, null, 0);
-			IRFactory ir = new IRFactory(ce);
+			IRFactory ir = new IRFactory(ce, "");
 			ScriptNode script = ir.transformTree(tree);
 			populateDimLevels(null, script, result);
 			return result;

diff --git a/...t/org/eclipse/birt/data/engine/binding/golden/ColumnBindingTest.testComputedOnDataSet.txt b/...t/org/eclipse/birt/data/engine/binding/golden/ColumnBindingTest.testComputedOnDataSet.txt
@@ -1,12 +1,12 @@
-CHINA, Beijing, 7000, 14000.0
-US, New York, 100, 200.0
-CHINA, Shanghai, 100, 200.0
-US, Chicago, 700, 1400.0
-US, New York, 100, 200.0
-CHINA, Shanghai, 100, 200.0
-CHINA, Beijing, 400, 800.0
-US, Chicago, 400, 800.0
-UK, London, 600, 1200.0
-UK, London, 700, 1400.0
-UK, Edinburgh, 800, 1600.0
-UK, Edinburgh, 1000, 2000.0
+CHINA, Beijing, 7000, 14000
+US, New York, 100, 200
+CHINA, Shanghai, 100, 200
+US, Chicago, 700, 1400
+US, New York, 100, 200
+CHINA, Shanghai, 100, 200
+CHINA, Beijing, 400, 800
+US, Chicago, 400, 800
+UK, London, 600, 1200
+UK, London, 700, 1400
+UK, Edinburgh, 800, 1600
+UK, Edinburgh, 1000, 2000
diff --git a/...se/birt/data/engine/binding/newbinding/golden/ColumnBindingTest.testComputedOnDataSet.txt b/...se/birt/data/engine/binding/newbinding/golden/ColumnBindingTest.testComputedOnDataSet.txt
@@ -1,12 +1,12 @@
-CHINA, Beijing, 7000, 14000.0
-US, New York, 100, 200.0
-CHINA, Shanghai, 100, 200.0
-US, Chicago, 700, 1400.0
-US, New York, 100, 200.0
-CHINA, Shanghai, 100, 200.0
-CHINA, Beijing, 400, 800.0
-US, Chicago, 400, 800.0
-UK, London, 600, 1200.0
-UK, London, 700, 1400.0
-UK, Edinburgh, 800, 1600.0
-UK, Edinburgh, 1000, 2000.0
+CHINA, Beijing, 7000, 14000
+US, New York, 100, 200
+CHINA, Shanghai, 100, 200
+US, Chicago, 700, 1400
+US, New York, 100, 200
+CHINA, Shanghai, 100, 200
+CHINA, Beijing, 400, 800
+US, Chicago, 400, 800
+UK, London, 600, 1200
+UK, London, 700, 1400
+UK, Edinburgh, 800, 1600
+UK, Edinburgh, 1000, 2000
diff --git a/data/org.eclipse.birt.data.tests/test/org/eclipse/birt/data/engine/impl/ScriptEvalTest.java b/data/org.eclipse.birt.data.tests/test/org/eclipse/birt/data/engine/impl/ScriptEvalTest.java
@@ -126,7 +126,7 @@ public void testDataType() throws Exception {
 		result = ScriptEvalUtil.evaluateJSAsExpr(scontext, scope, script, "", 0);
 		result = ScriptEvalUtil.evaluateJSAsExpr(scontext, scope, script, "", 0);
 		result = ScriptEvalUtil.evaluateJSAsExpr(scontext, scope, script, "", 0);
-		assertEquals(result, new Double(1));
+		assertEquals(result, 1);
 	}
 
 	// Tests error handling

diff --git a/...ta.tests/test/org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQuery.txt b/...ta.tests/test/org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQuery.txt
@@ -1,3 +1,3 @@
-1.0
+1
 1.0  2.0
 1.0  2.0
diff --git a/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery1.txt b/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery1.txt
@@ -1,4 +1,4 @@
-1.0  
+1  
                    1.1
 1.0  2.0  
                    1.12.1

diff --git a/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery2.txt b/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery2.txt
@@ -1,4 +1,4 @@
-1.0  
+1  
                    1.1
 1.0  2.0  
                    1.1

diff --git a/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery3.txt b/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery3.txt
@@ -1,4 +1,4 @@
-1.0  
+1  
                    1.1
 1.0  
                    1.12.1

diff --git a/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery4.txt b/.../org/eclipse/birt/data/engine/impl/rd/golden/ViewingTest2.testDummyQueryWithSubQuery4.txt
@@ -1,4 +1,4 @@
-1.0  
+1  
                    1.1
 1.0  
                    1.12.1

diff --git a/...pse.birt.data/src/org/eclipse/birt/data/engine/expression/AbstractExpressionCompiler.java b/...pse.birt.data/src/org/eclipse/birt/data/engine/expression/AbstractExpressionCompiler.java
@@ -217,7 +217,7 @@ protected ScriptNode parse(String expression, Context cx) throws DataException {
 		CompilerEnvirons compilerEnv = getCompilerEnv(cx);
 		Parser p = new Parser(compilerEnv, cx.getErrorReporter());
 		AstRoot root = p.parse(expression, null, 0);
-		IRFactory ir = new IRFactory(compilerEnv);
+		IRFactory ir = new IRFactory(compilerEnv, "");
 		ScriptNode script = ir.transformTree(root);
 		return script;
 	}

diff --git a/....eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/OlapExpressionCompiler.java b/....eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/OlapExpressionCompiler.java
@@ -135,7 +135,7 @@ public static String getReferencedScriptObject(String expr, String objectName) {
 			CompilerEnvirons ce = new CompilerEnvirons();
 			Parser p = new Parser(ce, cx.getErrorReporter());
 			AstRoot tree = p.parse(expr, null, 0);
-			Node root = new IRFactory(ce).transformTree(tree);
+			Node root = new IRFactory(ce, "").transformTree(tree);
 
 			return getScriptObjectName(root, objectName);
 		} catch (Exception ex) {
@@ -223,7 +223,7 @@ private static Set getReferencedDimLevel(IScriptExpression expr, List bindings,
 			CompilerEnvirons ce = new CompilerEnvirons();
 			Parser p = new Parser(ce, cx.getErrorReporter());
 			AstRoot tree = p.parse(expr.getText(), null, 0);
-			Node root = new IRFactory(ce).transformTree(tree);
+			Node root = new IRFactory(ce, "").transformTree(tree);
 
 			populateDimLevels(null, root, result, bindings, onlyFromDirectReferenceExpr);
 			return result;

diff --git a/....birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/api/CubeQueryUtil.java b/....birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/api/CubeQueryUtil.java
@@ -313,7 +313,7 @@ private static String getReferencedScriptObject(String expr, String objectName)
 			CompilerEnvirons ce = new CompilerEnvirons();
 			Parser p = new Parser(ce, cx.getErrorReporter());
 			AstRoot tree = p.parse(expr, null, 0);
-			IRFactory ir = new IRFactory(ce);
+			IRFactory ir = new IRFactory(ce, "");
 			ScriptNode script = ir.transformTree(tree);
 			return getScriptObjectName(script, objectName);
 		} finally {
-Original file line number
+Diff line change
@@ -1,3 +1,3 @@
-.0
 .0  2.0
 .0  2.0