refactor test class

Author: Michael5601

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

@@ -25,28 +25,10 @@
 import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.swt.graphics.ImageFileNameProvider;
 import org.eclipse.swt.widgets.Display;
-import org.junit.Before;
 import org.junit.Test;
 
 public class Test_org_eclipse_swt_internal_SVGRasterizer {
 
-	Display display;
-
-	ImageFileNameProvider imageFileNameProvider = zoom -> {
-		String fileName = "collapseall.svg";
-		return getPath(fileName);
-	};
-
-	ImageDataProvider imageDataProvider = zoom -> {
-		String fileName = "collapseall.svg";
-		return new ImageData(getPath(fileName));
-	};
-
-	@Before
-	public void setUp() {
-		display = Display.getDefault();
-	}
-
 	String getPath(String fileName) {
 		String urlPath = "";
 		String pluginPath = System.getProperty("PLUGIN_PATH");
@@ -69,16 +51,19 @@ String getPath(String fileName) {
 
 	@Test
 	public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageFileNameProvider() {
-		// Valid provider
-		Image image = new Image(display, imageFileNameProvider);
+		ImageFileNameProvider validImageFileNameProvider = zoom -> {
+			String fileName = "collapseall.svg";
+			return getPath(fileName);
+		};
+		Image image = new Image(Display.getDefault(), validImageFileNameProvider);
 		image.dispose();
-		// Corrupt Image provider
-		ImageFileNameProvider provider = zoom -> {
+
+		ImageFileNameProvider corruptImageFileNameProvider = zoom -> {
 			String fileName = "corrupt.svg";
 			return getPath(fileName);
 		};
 		try {
-			image = new Image(display, provider);
+			image = new Image(Display.getDefault(), corruptImageFileNameProvider);
 			image.dispose();
 			fail("No exception thrown for corrupt image file.");
 		} catch (SWTException e) {
@@ -88,16 +73,19 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageFileNameProvid
 
 	@Test
 	public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageDataProvider() {
-		// Valid provider
-		Image image = new Image(display, imageDataProvider);
+		ImageDataProvider validImageDataProvider = zoom -> {
+			String fileName = "collapseall.svg";
+			return new ImageData(getPath(fileName));
+		};
+		Image image = new Image(Display.getDefault(), validImageDataProvider);
 		image.dispose();
-		// Corrupt Image provider
-		ImageDataProvider provider = zoom -> {
+
+		ImageDataProvider corruptImageDataProvider = zoom -> {
 			String fileName = "corrupt.svg";
 			return new ImageData(getPath(fileName));
 		};
 		try {
-			image = new Image(display, provider);
+			image = new Image(Display.getDefault(), corruptImageDataProvider);
 			image.dispose();
 			fail("No exception thrown for corrupt image file.");
 		} catch (SWTException e) {