Move imageDataComparator from to test util class

A result of #2664

Author: jonahgraham

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

@@ -18,6 +18,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Comparator;
 import java.util.Random;
 
 import org.eclipse.swt.graphics.Image;
@@ -212,6 +213,28 @@ public static BlitTestInfo blit(BlitTestInfo srcInfo, int dstInfo_depth, int dst
 		return new BlitTestInfo(dstInfo_depth, dstInfo_scale, dstInfo_byteOrder, dstInfo_isDirect, dst);
 	}
 
+	/**
+	 * Compares ImageData, allows for change in things like bit depth by comparing pixel values rather
+	 * that the raw data like {@link #assertImageDataEqual(ImageData, ImageData, ImageData)}
+	 */
+	public static Comparator<ImageData> imageDataComparator() {
+		return Comparator.<ImageData>comparingInt(d -> d.width) //
+				.thenComparing(d -> d.height) //
+				.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)) {
+								return -1;
+							}
+							if (firstData.getAlpha(x, y) != secondData.getAlpha(x, y)) {
+								return -1;
+							}
+						}
+					}
+					return 0;
+				});
+	}
+
 	public static void assertImageDataEqual(ImageData source, ImageData actual, ImageData expected) {
 		if (TEST_BLIT_SHOW_IMAGES) {
 			Image[] images = new Image[3];

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

@@ -15,6 +15,7 @@
 package org.eclipse.swt.tests.junit;
 
 
+import static org.eclipse.swt.tests.graphics.ImageDataTestHelper.imageDataComparator;
 import static org.eclipse.swt.tests.junit.SwtTestUtil.assertSWTProblem;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -31,7 +32,6 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
@@ -1158,23 +1158,5 @@ public void test_gcOnImageGcDrawer_imageDataAtNonDeviceZoom() {
 	}
 }
 
-private Comparator<ImageData> imageDataComparator() {
-	return Comparator.<ImageData>comparingInt(d -> d.width) //
-			.thenComparing(d -> d.height) //
-			.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)) {
-							return -1;
-						}
-						if (firstData.getAlpha(x, y) != secondData.getAlpha(x, y)) {
-							return -1;
-						}
-					}
-				}
-				return 0;
-			});
-}
-
 }