Skip to content

Commit a4a774c

Browse files
basilevsHeikoKlare
authored andcommitted
Suppress resource leak reports from failing Image tests
1 parent 40fd7a2 commit a4a774c

1 file changed

Lines changed: 25 additions & 17 deletions

File tree

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

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -213,16 +213,22 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
213213
// set red pixel at x=9, y=9
214214
data.setPixel(9, 9, 0x30);
215215
final Image imageFromImageData = new Image(display, data);
216-
ImageGcDrawer gcDrawer = (gc, width, height) -> {
217-
gc.drawImage(imageFromImageData, 0, 0);
218-
};
219-
Image gcImage = new Image(display, gcDrawer, 10, 10);
220-
ImageData gcImageData = gcImage.getImageData();
221-
int redPixel = gcImageData.getPixel(9, 9);
222-
assertEquals(getRealRGB(display.getSystemColor(SWT.COLOR_RED)), gcImageData.palette.getRGB(redPixel));
223-
gcImage.dispose();
224-
image.dispose();
225-
imageFromImageData.dispose();
216+
try {
217+
ImageGcDrawer gcDrawer = (gc, width, height) -> {
218+
gc.drawImage(imageFromImageData, 0, 0);
219+
};
220+
Image gcImage = new Image(display, gcDrawer, 10, 10);
221+
try {
222+
ImageData gcImageData = gcImage.getImageData();
223+
int redPixel = gcImageData.getPixel(9, 9);
224+
assertEquals(getRealRGB(display.getSystemColor(SWT.COLOR_RED)), gcImageData.palette.getRGB(redPixel));
225+
} finally {
226+
gcImage.dispose();
227+
}
228+
image.dispose();
229+
} finally {
230+
imageFromImageData.dispose();
231+
}
226232
}
227233

228234
@Test
@@ -264,13 +270,15 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
264270
gc.drawImage(image2, 0, 0);
265271
};
266272
Image gcImage = new Image(display, gcDrawer, 10, 10);
267-
268-
ImageData gcImageData = gcImage.getImageData();
269-
int redPixel = gcImageData.getPixel(9, 9);
270-
assertEquals(getRealRGB(display.getSystemColor(SWT.COLOR_RED)), gcImageData.palette.getRGB(redPixel));
271-
int bluePixel = gcImageData.getPixel(0, 0);
272-
assertEquals(getRealRGB(backgroundColor), gcImageData.palette.getRGB(bluePixel));
273-
gcImage.dispose();
273+
try {
274+
ImageData gcImageData = gcImage.getImageData();
275+
int redPixel = gcImageData.getPixel(9, 9);
276+
assertEquals(getRealRGB(display.getSystemColor(SWT.COLOR_RED)), gcImageData.palette.getRGB(redPixel));
277+
int bluePixel = gcImageData.getPixel(0, 0);
278+
assertEquals(getRealRGB(backgroundColor), gcImageData.palette.getRGB(bluePixel));
279+
} finally {
280+
gcImage.dispose();
281+
}
274282
image.dispose();
275283
image2.dispose();
276284
}

0 commit comments

Comments
 (0)