work on windows

Author: jonahgraham

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/graphics/ImageDataTestHelper.java

@@ -223,7 +223,9 @@ public static Comparator<ImageData> imageDataComparator() {
 				.thenComparing((ImageData firstData, ImageData secondData) -> {
 					for (int x = 0; x < firstData.width; x++) {
 						for (int y = 0; y < firstData.height; y++) {
-							if (firstData.getPixel(x, y) != secondData.getPixel(x, y)) {
+							RGB first = firstData.palette.getRGB(firstData.getPixel(x, y));
+							RGB second = secondData.palette.getRGB(secondData.getPixel(x, y));
+							if (!first.equals(second)) {
 								return -1;
 							}
 							if (firstData.getAlpha(x, y) != secondData.getAlpha(x, y)) {

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

@@ -31,6 +31,8 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import clipboard.ClipboardTest;
+
 /**
  * Base class for tests that test clipboard and transfer types
  */
@@ -178,6 +180,28 @@ public void tearDown() throws Exception {
 		}
 	}
 
+	protected String addTrailingNulCharacter(String result) {
+		return result + '\0';
+	}
+
+	/**
+	 * Trim trailing nul character - some transfer types require a trailing nul when
+	 * copied to the clipboard, so use this method to remove it for tests that
+	 * obtain bytes from the {@link ClipboardTest} app.
+	 *
+	 * @param result to trim terminating nul character from
+	 * @return string with the nul character trimmed, or null if result was null.
+	 */
+	protected String trimTrailingNulCharacter(String result) {
+		if (result == null) {
+			return null;
+		}
+		if (result.charAt(result.length() - 1) == '\0') {
+			result = result.substring(0, result.length() - 1);
+		}
+		return result;
+	}
+
 	/**
 	 * Make sure to always copy/paste unique strings - this ensures that tests run
 	 * under {@link RepeatedTest}s don't false pass because of clipboard value on

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

@@ -215,7 +215,7 @@ public static class MyType {
 	// the code in the ByteArrayTransfer javadoc
 	public static class MyTypeTransfer extends ByteArrayTransfer {
 
-		private static final String MYTYPENAME = "application/my_type_name";
+		private static final String MYTYPENAME = "my_type_name";
 		private static final int MYTYPEID = registerType(MYTYPENAME);
 		private static MyTypeTransfer _instance = new MyTypeTransfer();
 

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

@@ -152,16 +152,7 @@ public void test_javaToNative() throws Exception {
 		setContents(test);
 		openAndFocusRemote();
 		String result = SwtTestUtil.runOperationInThread(() -> remote.getHtmlContents());
-		// HtmlTransfer.javaToNative on GTK (as of this writing) purposely adds a \0
-		// byte at the end of the stream. XXX: I don't think this is needed, and
-		// in other transfers such as Text and RTF this is not done. However receiving
-		// programs, such as LibreOffice Writer, do not seem negatively affected, so
-		// this test is written permissively. This permissiveness also exists in the
-		// implementation of HtmlTransfer.nativeToJava which trims the trailing \0
-		// on incoming transfers.
-		if (result.charAt(result.length() - 1) == '\0') {
-			result = result.substring(0, result.length() - 1);
-		}
+		result = trimTrailingNulCharacter(result);
 		assertEquals(test, result);
 	}
 }

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

@@ -125,7 +125,7 @@ public void test_nativeToJava() throws Exception {
 		String test = toRtf(getUniqueTestString());
 
 		openAndFocusRemote();
-		remote.setRtfContents(test);
+		remote.setRtfContents(addTrailingNulCharacter(test));
 		openAndFocusShell(false);
 		assertEquals(test, getContents());
 	}
@@ -139,6 +139,7 @@ public void test_javaToNative() throws Exception {
 		setContents(test);
 		openAndFocusRemote();
 		String result = SwtTestUtil.runOperationInThread(() -> remote.getRtfContents());
+		result = trimTrailingNulCharacter(result);
 		assertEquals(test, result);
 	}
 }

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

@@ -145,6 +145,7 @@ public void test_javaToNative(String name, String test) throws Exception {
 		setContents(test);
 		openAndFocusRemote();
 		String result = SwtTestUtil.runOperationInThread(() -> remote.getStringContents());
+		result = trimTrailingNulCharacter(result);
 		assertEquals(test, result);
 	}
 }

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

@@ -128,8 +128,7 @@ public void test_nativeToJava() throws Exception {
 		String test = getURLTransferString();
 
 		openAndFocusRemote();
-		// This is an attempt to recreate the same bytestream that Firefox provides when
-		// doing text/x-moz-url which appears to be this encoding (specifically no BOM)
+
 		byte[] bytes = test.getBytes(StandardCharsets.UTF_16LE);
 		remote.setUrlContents(bytes);
 		openAndFocusShell(false);
@@ -149,14 +148,7 @@ public void test_javaToNative() throws Exception {
 		// This is an attempt to recreate the same bytestream that Firefox provides when
 		// doing text/x-moz-url which appears to be this encoding (specifically no BOM)
 		String result = new String(bytes, StandardCharsets.UTF_16LE);
-		// HtmlTransfer.javaToNative on GTK (as of this writing) purposely adds a \0
-		// char at the end of the stream. XXX: I don't think this is needed, and
-		// in other transfers such as Text and RTF this is not done. This permissiveness
-		// also exists in the implementation of HtmlTransfer.nativeToJava which trims
-		// the trailing \0 on incoming transfers.
-		if (result.charAt(result.length() - 1) == '\0') {
-			result = result.substring(0, result.length() - 1);
-		}
+		result = trimTrailingNulCharacter(result);
 		assertEquals(test, result);
 	}
 }

tests/org.eclipse.swt.tests/data/clipboard/ClipboardTest.java

@@ -164,8 +164,9 @@ private static int getAvailablePort() throws IOException {
 		try {
 			RTF_InputStream = new DataFlavor("text/rtf;class=java.io.InputStream");
 			HTML_InputStream = new DataFlavor("text/html;class=java.io.InputStream");
-			URL_InputStream = new DataFlavor("text/x-moz-url;class=java.io.InputStream");
-			MyType_InputStream = new DataFlavor("application/my_type_name;class=java.io.InputStream");
+			URL_InputStream = new DataFlavor("application/x-uniform-resourcelocatorw;class=java.io.InputStream",
+					"UniformResourceLocatorW");
+			MyType_InputStream = new DataFlavor("application/x-my_type_name;class=java.io.InputStream", "my_type_name");
 		} catch (ClassNotFoundException e) {
 			throw new RuntimeException(e);
 		}
@@ -225,26 +226,26 @@ static void registerUrlNatives() {
 
 		String os = System.getProperty("os.name", "").toLowerCase();
 		if (os.contains("win")) {
-			String nativeFmt = "HTML Format";
-			map.addUnencodedNativeForFlavor(HTML_InputStream, nativeFmt);
-			map.addFlavorForUnencodedNative(nativeFmt, HTML_InputStream);
+			String nativeFmt = "UniformResourceLocatorW";
+			map.addUnencodedNativeForFlavor(URL_InputStream, nativeFmt);
+			map.addFlavorForUnencodedNative(nativeFmt, URL_InputStream);
 		} else if (os.contains("mac")) {
-			String nativeFmt = "public.html";
-			map.addUnencodedNativeForFlavor(HTML_InputStream, nativeFmt);
-			map.addFlavorForUnencodedNative(nativeFmt, HTML_InputStream);
+			String nativeFmt = "public.url";
+			map.addUnencodedNativeForFlavor(URL_InputStream, nativeFmt);
+			map.addFlavorForUnencodedNative(nativeFmt, URL_InputStream);
 		} else {
 			// X11/Wayland
-			for (String nativeFmt : List.of("text/html")) {
-				map.addUnencodedNativeForFlavor(HTML_InputStream, nativeFmt);
-				map.addFlavorForUnencodedNative(nativeFmt, HTML_InputStream);
-			}
+			String nativeFmt = "text/x-moz-url";
+			map.addUnencodedNativeForFlavor(URL_InputStream, nativeFmt);
+			map.addFlavorForUnencodedNative(nativeFmt, URL_InputStream);
+
 		}
 	}
 
 	static void registerMyTypeNatives() {
 		SystemFlavorMap map = (SystemFlavorMap) SystemFlavorMap.getDefaultFlavorMap();
-		map.addUnencodedNativeForFlavor(URL_InputStream, "my_type_name");
-		map.addFlavorForUnencodedNative("my_type_name", URL_InputStream);
+		map.addUnencodedNativeForFlavor(MyType_InputStream, "my_type_name");
+		map.addFlavorForUnencodedNative("my_type_name", MyType_InputStream);
 	}
 
 	static class RtfSelection implements Transferable {
@@ -304,8 +305,8 @@ public Object getTransferData(DataFlavor f) throws UnsupportedFlavorException {
 	static class UrlSelection implements Transferable {
 		private final byte[] url;
 
-		UrlSelection(byte[] html) {
-			this.url = html;
+		UrlSelection(byte[] url) {
+			this.url = url;
 		}
 
 		@Override