diff --git a/bundles/org.eclipse.swt.svg/.classpath b/bundles/org.eclipse.swt.svg/.classpath index 6b440ca4a80..11957df98f0 100644 --- a/bundles/org.eclipse.swt.svg/.classpath +++ b/bundles/org.eclipse.swt.svg/.classpath @@ -2,7 +2,13 @@ + + + + + + diff --git a/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF index 880ac152253..f51e06d1b83 100644 --- a/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.swt.svg -Bundle-Version: 3.133.0.qualifier +Bundle-Version: 3.133.100.qualifier Automatic-Module-Name: org.eclipse.swt.svg Bundle-Name: %fragmentName Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.swt.svg/pom.xml b/bundles/org.eclipse.swt.svg/pom.xml new file mode 100644 index 00000000000..4b91f5dfdfe --- /dev/null +++ b/bundles/org.eclipse.swt.svg/pom.xml @@ -0,0 +1,54 @@ + + + + 4.0.0 + + org.eclipse.platform + eclipse.platform.swt + 4.41.0-SNAPSHOT + ../../ + + org.eclipse.swt.svg + 3.133.100-SNAPSHOT + eclipse-plugin + + IGNORE + + + src + test + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-junit-platform + ${surefire.version} + + + + + execute-tests + + test + + + + + + + + + diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/JSVGRasterizerTest.java b/bundles/org.eclipse.swt.svg/test/org/eclipse/swt/svg/JSVGRasterizerTest.java similarity index 86% rename from tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/JSVGRasterizerTest.java rename to bundles/org.eclipse.swt.svg/test/org/eclipse/swt/svg/JSVGRasterizerTest.java index 995b4fa9327..3305ca87527 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/JSVGRasterizerTest.java +++ b/bundles/org.eclipse.swt.svg/test/org/eclipse/swt/svg/JSVGRasterizerTest.java @@ -11,9 +11,8 @@ * Contributors: * Yatta Solutions - initial API and implementation *******************************************************************************/ -package org.eclipse.swt.tests.junit; +package org.eclipse.swt.svg; -import static org.eclipse.swt.tests.junit.SwtTestUtil.assertSWTProblem; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -23,10 +22,8 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; import org.eclipse.swt.graphics.ImageData; -import org.eclipse.swt.svg.JSVGRasterizer; import org.junit.jupiter.api.Test; -@SuppressWarnings("restriction") class JSVGRasterizerTest { private final JSVGRasterizer rasterizer = new JSVGRasterizer(); @@ -51,13 +48,7 @@ void testRasterizeWithZoom() { @Test void testRasterizeWithZoomNegative() { - try { - rasterizer.rasterizeSVG(svgStream(svgString), -100); - - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for negative zoom", SWT.ERROR_INVALID_ARGUMENT, e); - } - + assertThrows(IllegalArgumentException.class, () -> rasterizer.rasterizeSVG(svgStream(svgString), -100)); } @Test diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java index 6a1b0f41fac..06adef5fac4 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java @@ -48,7 +48,6 @@ public class AllNonBrowserTests { AllWidgetTests.class, // // Rest of tests alphabetically DPIUtilTests.class, // - JSVGRasterizerTest.class, // Test_org_eclipse_swt_accessibility_Accessible.class, // Test_org_eclipse_swt_accessibility_AccessibleControlEvent.class, // Test_org_eclipse_swt_accessibility_AccessibleEvent.class, //