Fixes file base image tests

19 files changed, 12 insertions, 20 deletions

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 f0e4843480..8729a869fb 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
@@ -12,7 +12,6 @@ package org.eclipse.swt.tests.junit;
 
 
 import java.io.*;
-import java.net.URL;
 
 import junit.framework.*;
 import junit.textui.*;
@@ -379,9 +378,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String()
 			image.dispose();
 			fail("No exception thrown for invalid file name");
 		} catch (SWTException e) {
-// Causes failure
-// TODO: Find out why
-//			assertEquals("Incorrect exception thrown for invalid file name", SWT.ERROR_UNSUPPORTED_FORMAT, e);
+			assertEquals("Incorrect exception thrown for invalid file name", SWT.ERROR_UNSUPPORTED_FORMAT, e);
 		}
 	
 		int numFormats = SwtTestCase.imageFormats.length;
@@ -411,15 +408,11 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String()
 			image.dispose();
 			fail("No exception thrown for invalid file name");
 		} catch (SWTException e) {
-//			 Causes failure
-//			 TODO: Find out why
-//			assertEquals("Incorrect exception thrown for invalid image file name", SWT.ERROR_INVALID_IMAGE, e);
+			assertEquals("Incorrect exception thrown for invalid image file name", SWT.ERROR_INVALID_IMAGE, e);
 		}		
 	
 		// create valid images
-//		 Causes failure
-//		 TODO: Find out why
-/*		for (int j = 0; j < displays.length; j++) {
+		for (int j = 0; j < displays.length; j++) {
 			Display tempDisplay = displays[j];
 			int numFileNames = SwtTestCase.imageFilenames.length;
 			for (int k=0; k<numFileNames; k++) {
@@ -431,7 +424,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String()
 					image.dispose();
 				}
 			}
-		}*/
+		}
 	}
 }
 
@@ -729,15 +722,14 @@ void getImageData2(int depth, PaletteData palette) {
 	image.dispose();
 }
 String getPath(String fileName) {
-	final String packageName = "org/eclipse/swt/tests/junit/";
-	String pathName = packageName + fileName;
-	URL url = SwtTestCase.class.getClassLoader().getResource(pathName);
+	String urlPath;
+	
+	String pluginPath = System.getProperty("PLUGIN_PATH");
+	System.out.println("PLUGIN_PATH <"+pluginPath+">");
+	if (pluginPath == null) urlPath = getClass().getClassLoader().getResource(fileName).getFile();
+	else urlPath = pluginPath + "/data/" + fileName;
 	
-	if (url != null) {
-		pathName = url.getFile();
-		return pathName.replaceAll("%20", " ");
-	} else {
-		return null;
-	}	
+	System.out.println("Resolved file name for " + fileName + " = " + urlPath);
+	return urlPath;
 }
 }
diff --git a/tests/org.eclipse.swt.tests/data/corrupt.bmp b/tests/org.eclipse.swt.tests/data/corrupt.bmp
new file mode 100644
index 0000000000..7d1d3ab890
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/corrupt.bmp
diff --git a/tests/org.eclipse.swt.tests/data/corrupt.gif b/tests/org.eclipse.swt.tests/data/corrupt.gif
new file mode 100644
index 0000000000..1b4369bce5
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/corrupt.gif
diff --git a/tests/org.eclipse.swt.tests/data/corrupt.jpg b/tests/org.eclipse.swt.tests/data/corrupt.jpg
new file mode 100644
index 0000000000..f728fba6c9
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/corrupt.jpg
diff --git a/tests/org.eclipse.swt.tests/data/corrupt.png b/tests/org.eclipse.swt.tests/data/corrupt.png
new file mode 100644
index 0000000000..aecbc78845
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/corrupt.png
diff --git a/tests/org.eclipse.swt.tests/data/corruptBadBitDepth.png b/tests/org.eclipse.swt.tests/data/corruptBadBitDepth.png
new file mode 100644
index 0000000000..b43cb915f8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/corruptBadBitDepth.png
diff --git a/tests/org.eclipse.swt.tests/data/empty.txt b/tests/org.eclipse.swt.tests/data/empty.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/empty.txt
diff --git a/tests/org.eclipse.swt.tests/data/folder.bmp b/tests/org.eclipse.swt.tests/data/folder.bmp
new file mode 100644
index 0000000000..574351fbd4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folder.bmp
diff --git a/tests/org.eclipse.swt.tests/data/folder.gif b/tests/org.eclipse.swt.tests/data/folder.gif
new file mode 100644
index 0000000000..4e17c75cc2
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folder.gif
diff --git a/tests/org.eclipse.swt.tests/data/folder.jpg b/tests/org.eclipse.swt.tests/data/folder.jpg
new file mode 100644
index 0000000000..3870170878
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folder.jpg
diff --git a/tests/org.eclipse.swt.tests/data/folder.png b/tests/org.eclipse.swt.tests/data/folder.png
new file mode 100644
index 0000000000..9ef2dc09d2
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folder.png
diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.bmp b/tests/org.eclipse.swt.tests/data/folderOpen.bmp
new file mode 100644
index 0000000000..6ba1214663
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folderOpen.bmp
diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.gif b/tests/org.eclipse.swt.tests/data/folderOpen.gif
new file mode 100644
index 0000000000..64886bbbfd
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folderOpen.gif
diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.jpg b/tests/org.eclipse.swt.tests/data/folderOpen.jpg
new file mode 100644
index 0000000000..faf88826b1
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folderOpen.jpg
diff --git a/tests/org.eclipse.swt.tests/data/folderOpen.png b/tests/org.eclipse.swt.tests/data/folderOpen.png
new file mode 100644
index 0000000000..9b36d62b38
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/folderOpen.png
diff --git a/tests/org.eclipse.swt.tests/data/target.bmp b/tests/org.eclipse.swt.tests/data/target.bmp
new file mode 100644
index 0000000000..ec7d509e74
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/target.bmp
diff --git a/tests/org.eclipse.swt.tests/data/target.gif b/tests/org.eclipse.swt.tests/data/target.gif
new file mode 100644
index 0000000000..4ee8b5a4a6
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/target.gif
diff --git a/tests/org.eclipse.swt.tests/data/target.jpg b/tests/org.eclipse.swt.tests/data/target.jpg
new file mode 100644
index 0000000000..173ea1bf55
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/target.jpg
diff --git a/tests/org.eclipse.swt.tests/data/target.png b/tests/org.eclipse.swt.tests/data/target.png
new file mode 100644
index 0000000000..bb5d7eb843
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/data/target.png