diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java
index 0faa8b09a7e..fc3bdeaa009 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java
@@ -581,7 +581,7 @@ public static boolean hasPixelNotMatching(Image image, Color nonMatchingColor, R
return false;
}
-public static String getPath(String fileName, TemporaryFolder tempFolder) {
+public static Path getPath(String fileName, TemporaryFolder tempFolder) {
Path filePath = tempFolder.getRoot().toPath().resolve("image-resources").resolve(Path.of(fileName));
if (!Files.isRegularFile(filePath)) {
// Extract resource on the classpath to a temporary file to ensure it's
@@ -594,6 +594,6 @@ public static String getPath(String fileName, TemporaryFolder tempFolder) {
throw new IllegalArgumentException(e);
}
}
- return filePath.toString();
+ return filePath;
}
}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java
index 63e42e664da..35adebff18c 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java
@@ -84,10 +84,12 @@
import org.eclipse.swt.widgets.Text;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
@@ -758,16 +760,11 @@ public void test_LocationListener_LocationListener_ordered_changing () {
assertTrue("Change of locations do not fire in order", locations.get(0).equals("about:blank") && locations.get(1).contains("testWebsiteWithTitle.html"));
}
+@ClassRule
+public static TemporaryFolder tempFolder = new TemporaryFolder();
+
private String getValidUrl() {
- String pluginPath = System.getProperty("PLUGIN_PATH");
- testLogAppend("PLUGIN_PATH: " + pluginPath);
- // When test is run via Ant, URL needs to be acquired differently. In that case the PLUGIN_PATH property is set and used.
- if (pluginPath != null) {
- return Path.of(pluginPath, "data/testWebsiteWithTitle.html").toUri().toString();
- } else {
- // used when ran from Eclipse gui.
- return Test_org_eclipse_swt_browser_Browser.class.getClassLoader().getResource("testWebsiteWithTitle.html").toString();
- }
+ return SwtTestUtil.getPath("testWebsiteWithTitle.html", tempFolder).toUri().toString();
}
@Test
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
index aaad21801c6..5bc9cc034c9 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
@@ -64,7 +64,7 @@ public class Test_org_eclipse_swt_graphics_Image {
public static TemporaryFolder tempFolder = new TemporaryFolder();
private static String getPath(String fileName) {
- return SwtTestUtil.getPath(fileName, tempFolder);
+ return SwtTestUtil.getPath(fileName, tempFolder).toString();
}
ImageFileNameProvider imageFileNameProvider = zoom -> {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_internal_SVGRasterizer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_internal_SVGRasterizer.java
index 6eb35f14295..cd4a598799b 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_internal_SVGRasterizer.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_internal_SVGRasterizer.java
@@ -37,7 +37,7 @@ public class Test_org_eclipse_swt_internal_SVGRasterizer {
public static TemporaryFolder tempFolder = new TemporaryFolder();
private static String getPath(String fileName) {
- return SwtTestUtil.getPath(fileName, tempFolder);
+ return SwtTestUtil.getPath(fileName, tempFolder).toString();
}
@Test
diff --git a/tests/org.eclipse.swt.tests/data/testWebsiteWithTitle.html b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/testWebsiteWithTitle.html
similarity index 100%
rename from tests/org.eclipse.swt.tests/data/testWebsiteWithTitle.html
rename to tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/testWebsiteWithTitle.html
diff --git a/tests/org.eclipse.swt.tests/test.xml b/tests/org.eclipse.swt.tests/test.xml
index 925b1e631ce..6c4c27d21a8 100644
--- a/tests/org.eclipse.swt.tests/test.xml
+++ b/tests/org.eclipse.swt.tests/test.xml
@@ -9,7 +9,6 @@
-