[test] TestLabelProvider: reduce font not disposed warnings

to a single "SWT Resource was not properly disposed" during LabelProviderTest (and fixed the font to be not bold)
eclipse-platform · Oct 9, 2024 · 72ec5a4 · 72ec5a4
1 parent b85d17e
commit 72ec5a4
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 19 deletions.
diff --git a/.../org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java b/.../org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
@@ -402,7 +402,7 @@ protected void checkItems(TreeItem[] rootItems, TestLabelProvider tlp, boolean a
 			}
 			assertEquals(tlp.backgroundColor, rootItem.getBackground(0));
 			assertEquals(TestLabelProvider.toForegroundColor(tlp.backgroundColor), rootItem.getForeground(0));
-			assertEquals(tlp.font, rootItem.getFont(0));
+			assertEquals(TestLabelProvider.font, rootItem.getFont(0));
 			assertEquals(tlp.image, rootItem.getImage(0));
 			if (all) {
 				checkItems(rootItem.getItems(), tlp, all, text);

diff --git a/...se.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java b/...se.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java
@@ -42,7 +42,7 @@ public abstract class TestLabelProvider extends LabelProvider implements
 
 	public Image image;
 
-	public Font font;
+	public static final Font font = new Font(Display.getDefault(), new FontData());
 
 	private Font boldFont;
 
@@ -170,9 +170,8 @@ public void dispose() {
 			_runnable.run();
 		boldFont.dispose();
 		boldFont = null;
-
-//		font.dispose();
-//		font = null;
+		// font can not disposed here because the TestLabelProviders are used by its
+		// static instances
 	}
 
 }
diff --git a/....tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java b/....tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java
@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.navigator.extension;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -32,7 +31,6 @@ public class TestLabelProviderBlank extends TestStyledLabelProvider {
 	protected void initSubclass() {
 		backgroundColor = Display.getCurrent().getSystemColor(SWT.COLOR_RED);
 		backgroundColorName = "Red";
-		font = new Font(Display.getDefault(), boldFontData);
 		image = PlatformUI.getWorkbench().getSharedImages().getImage(
 				ISharedImages.IMG_OBJ_ADD);
 		instance = this;

diff --git a/...i.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java b/...i.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java
@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.navigator.extension;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -32,7 +31,6 @@ protected void initSubclass() {
 		backgroundColor = Display.getCurrent().getSystemColor(
 				SWT.COLOR_BLUE);
 		backgroundColorName = "Blue";
-		font = new Font(Display.getDefault(), boldFontData);
 		image = PlatformUI.getWorkbench().getSharedImages().getImage(
 				ISharedImages.IMG_ETOOL_SAVE_EDIT);
 		instance = this;

diff --git a/...i.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java b/...i.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java
@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.navigator.extension;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -32,7 +31,6 @@ protected void initSubclass() {
 		backgroundColor = Display.getCurrent().getSystemColor(
 				SWT.COLOR_CYAN);
 		backgroundColorName = "Cyan";
-		font = new Font(Display.getDefault(), boldFontData);
 		image = PlatformUI.getWorkbench().getSharedImages().getImage(
 				ISharedImages.IMG_DEF_VIEW);
 		instance = this;

diff --git a/...s.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java b/...s.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java
@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.navigator.extension;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -31,7 +30,6 @@ protected void initSubclass() {
 		backgroundColor = Display.getCurrent().getSystemColor(
 				SWT.COLOR_GREEN);
 		backgroundColorName = "Green";
-		font = new Font(Display.getDefault(), boldFontData);
 		image = PlatformUI.getWorkbench().getSharedImages().getImage(
 				ISharedImages.IMG_ELCL_COLLAPSEALL);
 		instance = this;

diff --git a/...sts.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java b/...sts.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java
@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.navigator.extension;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -31,7 +30,6 @@ protected void initSubclass() {
 		backgroundColor = Display.getCurrent().getSystemColor(
 				SWT.COLOR_RED);
 		backgroundColorName = "Red";
-		font = new Font(Display.getDefault(), boldFontData);
 		image = PlatformUI.getWorkbench().getSharedImages().getImage(
 				ISharedImages.IMG_ELCL_REMOVE);
 		instance = this;

diff --git a/....navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java b/....navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java
@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.navigator.extension;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -31,7 +30,6 @@ protected void initSubclass() {
 		backgroundColor = Display.getCurrent().getSystemColor(
 				SWT.COLOR_GREEN);
 		backgroundColorName = "Green";
-		font = new Font(Display.getDefault(), boldFontData);
 		image = PlatformUI.getWorkbench().getSharedImages().getImage(
 				ISharedImages.IMG_ELCL_COLLAPSEALL);
 		instance = this;

diff --git a/...ts.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java b/...ts.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java
@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.navigator.extension;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -31,7 +30,6 @@ protected void initSubclass() {
 		backgroundColor = Display.getCurrent().getSystemColor(
 				SWT.COLOR_RED);
 		backgroundColorName = "Red";
-		font = new Font(Display.getDefault(), boldFontData);
 		image = PlatformUI.getWorkbench().getSharedImages().getImage(
 				ISharedImages.IMG_ELCL_REMOVE);
 		instance = this;