Resolve resources URLs as file-URLs if running in an OSGi environment

Don't consider the 'PLUGIN_PATH' property anymore, which is set in
I-build tests and whose handling doesn't work anymore.

Fixes #2001

Author: HannesWell

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java

@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.IOException;
 import java.io.PrintStream;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -31,6 +32,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BooleanSupplier;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTError;
 import org.eclipse.swt.SWTException;
@@ -584,23 +586,18 @@ public static boolean hasPixelNotMatching(Image image, Color nonMatchingColor, R
 
 public static String getPath(String fileName) {
 	URI uri;
-	String pluginPath = System.getProperty("PLUGIN_PATH");
-	if (pluginPath == null) {
-		URL url = SwtTestUtil.class.getResource(fileName);
-		assertNotNull(url, "URL == null for file " + fileName);
-		try {
-			uri = url.toURI();
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException(e);
+	URL url = SwtTestUtil.class.getResource(fileName);
+	assertNotNull(url, "URL == null for file " + fileName);
+	try {
+		if (!"file".equals(url.getProtocol())) {
+			url = FileLocator.toFileURL(url); // probably running in an OSGi runtime and this should work
 		}
-	} else {
-		uri = URI.create(pluginPath + "/data/" + fileName);
+		uri = url.toURI();
+	} catch (URISyntaxException | IOException e) {
+		throw new IllegalArgumentException(e);
 	}
 	// Fallback when test is locally executed as plug-in test
 	Path path = Path.of(uri);
-	if (!Files.exists(path)) {
-		path = Path.of("data/" + fileName).toAbsolutePath();
-	}
 	assertTrue(Files.exists(path), "file not found: " + uri);
 	return path.toString();
 }

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java

@@ -319,11 +319,11 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String()
 
 @Test
 public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageFileNameProvider() {
-	 Exception e;
+	Exception e;
 
 	// Null provider
 	ImageFileNameProvider provider1 = null;
-	  e = assertThrows(IllegalArgumentException.class, ()->new Image(display, provider1));
+	e = assertThrows(IllegalArgumentException.class, ()->new Image(display, provider1));
 	assertSWTProblem("Incorrect exception thrown for provider == null", SWT.ERROR_NULL_ARGUMENT, e);
 
 	// Invalid provider

tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF

@@ -15,6 +15,7 @@ Require-Bundle: org.junit;bundle-version="4.13.2",
  junit-platform-suite-commons;bundle-version="1.12.0",
  junit-platform-suite-engine;bundle-version="1.12.0",
  org.eclipse.swt;bundle-version="3.120.0",
+ org.eclipse.equinox.common,
  org.eclipse.test;bundle-version="3.6.200",
  org.eclipse.test.performance;bundle-version="3.13.0"
 Eclipse-BundleShape: dir