Refactor Image(Display, int, int) in Tests

Replacing Image(Display, int, int) with Image(Display, ImageGcDrawer,
int, int) in Tests

Author: ShahzaibIbrahim

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java

@@ -89,7 +89,7 @@ public static String takeScreenshot(Class<?> testClass, String name, PrintStream
 		GC gc = new GC(display);
 		Rectangle displayBounds= display.getBounds();
 		out.println("Display @ " + displayBounds);
-		final Image image = new Image(display, displayBounds.width, displayBounds.height);
+		final Image image = new Image(display, (iGc, width, height) -> {}, displayBounds.width, displayBounds.height);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();
 

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/LabelProviderTest.java

@@ -15,8 +15,8 @@ public class LabelProviderTest {
 
 	private static final Car HORCH = new Car("Horch");
 
-	private static Image horchImage = new Image(Display.getDefault(), 50, 10);
-	private static Image defaultImage = new Image(Display.getDefault(), 1, 1);
+	private static Image horchImage = new Image(Display.getDefault(), (gc, width, height) -> {}, 50, 10);
+	private static Image defaultImage = new Image(Display.getDefault(), (gc, width, height) -> {}, 1, 1);
 
 	private final Function<Object, String> textFunction = o -> o instanceof Car ? ((Car) o).getMake() : "unknown";
 	private final Function<Object, Image> imageFunction = o -> o instanceof Car ? horchImage : defaultImage;

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AbstractFactoryTest.java

@@ -14,6 +14,7 @@
 package org.eclipse.jface.tests.widgets;
 
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageGcDrawer;
 import org.eclipse.swt.widgets.Shell;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -26,7 +27,8 @@ public class AbstractFactoryTest {
 
 	@BeforeClass
 	public static void classSetup() {
-		image = new Image(null, 1, 1);
+		final ImageGcDrawer noOp = (gc, width, height) -> {};
+		image = new Image(null, noOp, 1, 1);
 	}
 
 	@Before

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java

@@ -515,7 +515,7 @@ private static boolean hasCodeMiningPrintedBelowLine(ITextViewer viewer, int lin
 			starty= lineBounds.y;
 		}
 
-		Image image= new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image= new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		try {
 			GC gc= new GC(widget);
 			gc.copyArea(image, 0, 0);
@@ -555,7 +555,7 @@ private static boolean hasCodeMiningPrintedAfterTextOnLine(ITextViewer viewer, i
 		} else {
 			secondLineBounds= widget.getTextBounds(lineOffset, lineOffset + lineLength);
 		}
-		Image image = new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image = new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		GC gc = new GC(widget);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java

@@ -148,7 +148,7 @@ protected boolean condition() {
 	}
 
 	public int getMostRightPaintedPixel(StyledText widget) {
-		Image image = new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image = new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		GC gc = new GC(widget);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();

tests/org.eclipse.ui.editors.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java

@@ -273,7 +273,7 @@ private static boolean existsPixelWithNonBackgroundColorAtLine(ITextViewer viewe
 		int lineOffset = document.getLineOffset(line);
 		Rectangle lineBounds = widget.getTextBounds(lineOffset, lineOffset + lineLength);
 		String lineStr = document.get(lineOffset, lineLength);
-		Image image = new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image = new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		try {
 			GC gc = new GC(widget);
 			gc.copyArea(image, 0, 0);
@@ -306,7 +306,7 @@ private static boolean existsPixelWithNonBackgroundColorAtEndOfLine(ITextViewer
 		String lineStr = document.get(lineOffset,
 				document.getLineLength(line) - document.getLineDelimiter(line).length());
 		Rectangle lineBounds = widget.getTextBounds(lineOffset, lineOffset);
-		Image image = new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image = new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		try {
 			GC gc = new GC(widget);
 			gc.copyArea(image, 0, 0);

tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/FormImagesTest.java

@@ -281,7 +281,7 @@ public void testToolkitColors() throws Exception {
 	@Test
 	public void testDisposeUnknown() throws Exception {
 		Display display = Display.getCurrent();
-		Image image = new Image(display, 10, 10);
+		Image image = new Image(display, (gc, width, height) -> {}, 10, 10);
 		getFormImagesInstance().markFinished(image, display);
 		assertTrue("markFinished(...) did not dispose of an unknown image", image.isDisposed());
 		assertNull("descriptors map", getDescriptors(getFormImagesInstance()));

tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java

@@ -117,7 +117,7 @@ public static String takeScreenshot(Class<?> testClass, String name, PrintStream
 		GC gc = new GC(display);
 		Rectangle displayBounds= display.getBounds();
 		out.println("Display @ " + displayBounds);
-		final Image image= new Image(display, displayBounds.width, displayBounds.height);
+		final Image image= new Image(display, (iGc, width, height) -> {}, displayBounds.width, displayBounds.height);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();