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 9442b5ccce3..f952c86adcc 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 @@ -19,8 +19,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.PrintStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BooleanSupplier; @@ -574,4 +581,27 @@ public static boolean hasPixelNotMatching(Image image, Color nonMatchingColor, R } return false; } + +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); + } + } else { + uri = URI.create(pluginPath + "/data/" + fileName); + } + // 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(); +} } 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 1ddd87f5e5f..d5ed9dd9d0b 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 @@ -16,6 +16,7 @@ import static org.eclipse.swt.tests.junit.SwtTestUtil.assertSWTProblem; +import static org.eclipse.swt.tests.junit.SwtTestUtil.getPath; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -26,10 +27,8 @@ import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; -import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.util.Comparator; @@ -1167,26 +1166,7 @@ void getImageData2(int depth, PaletteData palette) { gc.dispose(); image.dispose(); } -String getPath(String fileName) { - String urlPath; - - String pluginPath = System.getProperty("PLUGIN_PATH"); - if (pluginPath == null) { - URL url = getClass().getClassLoader().getResource(fileName); - if (url == null) { - fail("URL == null for file " + fileName); - } - urlPath = url.getFile(); - } else { - urlPath = pluginPath + "/data/" + fileName; - } - if (File.separatorChar != '/') urlPath = urlPath.replace('/', File.separatorChar); - if (SwtTestUtil.isWindows && urlPath.indexOf(File.separatorChar) == 0) urlPath = urlPath.substring(1); - urlPath = urlPath.replaceAll("%20", " "); - - return urlPath; -} RGB getRealRGB(Color color) { Image colorImage = new Image(display, 10, 10); GC imageGc = new GC(colorImage); 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 32a02163727..1b6cf117b66 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 @@ -13,14 +13,8 @@ package org.eclipse.swt.tests.junit; import static org.eclipse.swt.tests.junit.SwtTestUtil.assertSWTProblem; -import static org.junit.Assert.fail; +import static org.eclipse.swt.tests.junit.SwtTestUtil.getPath; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; @@ -68,28 +62,4 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageDataProvider() assertSWTProblem("Incorrect exception thrown for provider with corrupt images", SWT.ERROR_INVALID_IMAGE, e); } - String getPath(String fileName) { - String urlPath = ""; - String pluginPath = System.getProperty("PLUGIN_PATH"); - if (pluginPath == null) { - URL url = getClass().getClassLoader().getResource(fileName); - if (url == null) { - fail("URL == null for file " + fileName); - } - urlPath = url.getFile(); - } else { - urlPath = pluginPath + "/data/" + fileName; - } - if (File.separatorChar != '/') - urlPath = urlPath.replace('/', File.separatorChar); - if (SwtTestUtil.isWindows && urlPath.indexOf(File.separatorChar) == 0) - urlPath = urlPath.substring(1); - urlPath = urlPath.replaceAll("%20", " "); - // Fallback when test is locally executed as plug-in test - if (!Files.exists(Path.of(urlPath))) { - urlPath = Path.of("data/" + fileName).toAbsolutePath().toString(); - } - assertTrue(Files.exists(Path.of(urlPath)), "file not found: " + urlPath); - return urlPath; - } } \ No newline at end of file diff --git a/tests/org.eclipse.swt.tests/data/collapseall.svg b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/collapseall.svg similarity index 100% rename from tests/org.eclipse.swt.tests/data/collapseall.svg rename to tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/collapseall.svg diff --git a/tests/org.eclipse.swt.tests/data/corrupt.svg b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/corrupt.svg similarity index 100% rename from tests/org.eclipse.swt.tests/data/corrupt.svg rename to tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/corrupt.svg diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java index 58587d0cd16..fe44d1fa50b 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java @@ -13,32 +13,16 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit.performance; - -import static org.junit.Assert.fail; - -import java.io.File; -import java.net.URL; - import org.eclipse.swt.SWT; import org.eclipse.test.performance.Dimension; import org.eclipse.test.performance.Performance; import org.eclipse.test.performance.PerformanceMeter; - public class SwtPerformanceTestCase { - // used to specify verbose mode, if true unimplemented warning messages will - // be written to System.out - public static boolean verbose = false; public final static boolean isGTK = SWT.getPlatform().equals("gtk"); public final static boolean isWindows = SWT.getPlatform().startsWith("win32"); - // allow specific image formats to be tested - public static String[] imageFormats = new String[] {"bmp", "jpg", "gif", "png"}; - public static String[] imageFilenames = new String[] {"folder", "folderOpen", "target"}; - public static String[] transparentImageFilenames = new String[] {"transparent.png"}; - - protected PerformanceMeter createMeter(String id) { Performance performance = Performance.getDefault(); String scenarioId = "org.eclipse.swt.test." + id; @@ -63,31 +47,4 @@ protected void disposeMeter(PerformanceMeter meter) { } } -protected String getPath(String fileName) { - String urlPath; - - String pluginPath = System.getProperty("PLUGIN_PATH"); - if (verbose) { - System.out.println("PLUGIN_PATH <"+pluginPath+">"); - } - if (pluginPath == null) { - URL url = getClass().getClassLoader().getResource(fileName); - if (url == null) { - fail("URL == null for file " + fileName); - } - urlPath = url.getFile(); - } else { - urlPath = pluginPath + "/data/" + fileName; - } - - if (File.separatorChar != '/') urlPath = urlPath.replace('/', File.separatorChar); - if (isWindows && urlPath.indexOf(File.separatorChar) == 0) urlPath = urlPath.substring(1); - urlPath = urlPath.replaceAll("%20", " "); - - if (verbose) { - System.out.println("Resolved file name for " + fileName + " = " + urlPath); - } - return urlPath; -} - } diff --git a/tests/org.eclipse.swt.tests/data/collapseall.png b/tests/org.eclipse.swt.tests/data/collapseall.png deleted file mode 100644 index 0ac25a9247b..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/collapseall.png and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/collapseall@1.5x.png b/tests/org.eclipse.swt.tests/data/collapseall@1.5x.png deleted file mode 100644 index 24dd56386e9..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/collapseall@1.5x.png and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/collapseall@2x.png b/tests/org.eclipse.swt.tests/data/collapseall@2x.png deleted file mode 100644 index 9fecefbb752..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/collapseall@2x.png and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/corrupt.bmp b/tests/org.eclipse.swt.tests/data/corrupt.bmp deleted file mode 100644 index 7d1d3ab8908..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/corrupt.bmp and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/corrupt.gif b/tests/org.eclipse.swt.tests/data/corrupt.gif deleted file mode 100644 index 20dc8e25a8f..00000000000 --- a/tests/org.eclipse.swt.tests/data/corrupt.gif +++ /dev/null @@ -1 +0,0 @@ -GIF87a \ No newline at end of file diff --git a/tests/org.eclipse.swt.tests/data/corrupt.jpg b/tests/org.eclipse.swt.tests/data/corrupt.jpg deleted file mode 100644 index 21019dc89d1..00000000000 --- a/tests/org.eclipse.swt.tests/data/corrupt.jpg +++ /dev/null @@ -1 +0,0 @@ -ÿØÿ \ No newline at end of file diff --git a/tests/org.eclipse.swt.tests/data/corrupt.png b/tests/org.eclipse.swt.tests/data/corrupt.png deleted file mode 100644 index aa860abb474..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/corrupt.png and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/corruptBadBitDepth.png b/tests/org.eclipse.swt.tests/data/corruptBadBitDepth.png deleted file mode 100644 index b43cb915f85..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/corruptBadBitDepth.png and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/empty.txt b/tests/org.eclipse.swt.tests/data/empty.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/org.eclipse.swt.tests/data/folder.bmp b/tests/org.eclipse.swt.tests/data/folder.bmp deleted file mode 100644 index 574351fbd4c..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folder.bmp and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/folder.gif b/tests/org.eclipse.swt.tests/data/folder.gif deleted file mode 100644 index 4e17c75cc23..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folder.gif and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/folder.jpg b/tests/org.eclipse.swt.tests/data/folder.jpg deleted file mode 100644 index 38701708786..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folder.jpg and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/folder.png b/tests/org.eclipse.swt.tests/data/folder.png deleted file mode 100644 index 9ef2dc09d25..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folder.png and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.bmp b/tests/org.eclipse.swt.tests/data/folderOpen.bmp deleted file mode 100644 index 6ba12146630..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folderOpen.bmp and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.gif b/tests/org.eclipse.swt.tests/data/folderOpen.gif deleted file mode 100644 index 64886bbbfd7..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folderOpen.gif and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.jpg b/tests/org.eclipse.swt.tests/data/folderOpen.jpg deleted file mode 100644 index faf88826b1e..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folderOpen.jpg and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.png b/tests/org.eclipse.swt.tests/data/folderOpen.png deleted file mode 100644 index 9b36d62b38d..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/folderOpen.png and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/target.bmp b/tests/org.eclipse.swt.tests/data/target.bmp deleted file mode 100644 index ec7d509e743..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/target.bmp and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/target.gif b/tests/org.eclipse.swt.tests/data/target.gif deleted file mode 100644 index 4ee8b5a4a61..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/target.gif and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/target.jpg b/tests/org.eclipse.swt.tests/data/target.jpg deleted file mode 100644 index 173ea1bf55f..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/target.jpg and /dev/null differ diff --git a/tests/org.eclipse.swt.tests/data/target.png b/tests/org.eclipse.swt.tests/data/target.png deleted file mode 100644 index bb5d7eb8431..00000000000 Binary files a/tests/org.eclipse.swt.tests/data/target.png and /dev/null differ