Stop disposing Color in tests
Change-Id: I8f53a8a11a87c98d8ab0ecf6518c7a429378f713
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/185429
Tested-by: Platform Bot <platform-bot@eclipse.org>
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelperTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelperTest.java
index 211de05..342759c 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelperTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelperTest.java
@@ -29,7 +29,6 @@
public class CSSSWTColorHelperTest extends CSSSWTHelperTestCase {
private Display display;
- private Color result;
@Before
public void setUp() {
@@ -39,15 +38,12 @@
@After
public void tearDown() {
- if (result != null) {
- result.dispose();
- }
display.dispose();
}
@Test
public void testGetSWTColor() {
- result = getSWTColor(colorValue("red"), display);
+ Color result = getSWTColor(colorValue("red"), display);
assertNotNull(result);
assertEquals(255, result.getRed());
assertEquals(0, result.getBlue());
@@ -56,7 +52,7 @@
@Test
public void testGetSWTColorWhenNotSupportedColorType() {
- result = getSWTColor(colorValue("123213", CSSValue.CSS_CUSTOM),
+ Color result = getSWTColor(colorValue("123213", CSSValue.CSS_CUSTOM),
display);
assertNull(result);
@@ -64,7 +60,7 @@
@Test
public void testGetSWTColorWhenInvalidColorValue() {
- result = getSWTColor(colorValue("asdsad12"), display);
+ Color result = getSWTColor(colorValue("asdsad12"), display);
assertNotNull(result);
assertEquals(0, result.getRed());
@@ -76,7 +72,7 @@
public void testGetSWTColorWhenColorFromDefinition() {
registerColorProviderWith("org.eclipse.jdt.debug.ui.InDeadlockColor", new RGB(0, 255, 0));
- result = getSWTColor(
+ Color result = getSWTColor(
colorValue(addColorDefinitionMarker("org-eclipse-jdt-debug-ui-InDeadlockColor")),
display);
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java
index 2fbdd3e..10e25b0 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java
@@ -23,7 +23,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -45,13 +44,6 @@
redColor = new Color(display, RED);
}
- @After
- @Override
- public void tearDown() {
- redColor.dispose();
- super.tearDown();
- }
-
/**
* Test status quo: if a more general rule sets the background, it applies
* to widgets matching more specific rules with specify no explicit
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
index 15ae430..6033ee6 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
@@ -161,7 +161,7 @@
}
@Test
- public void testDisposeHandler() throws Exception {
+ public void testDisposeHandler() {
// given
ThemeDefinitionChangedHandlerTestable handler = spy(new ThemeDefinitionChangedHandlerTestable());
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java
index f69fd2f..ee14513 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java
@@ -43,6 +43,7 @@
/**
* Create a new instance of the receiver
+ *
* @param name
*/
public TableColorProviderTest(String name) {
@@ -50,7 +51,7 @@
}
/**
- * Test with a standard color provider.
+ * Test with a standard color provider.
*/
public void testColorProviderForeground() {
TableViewer viewer = (TableViewer) fViewer;
@@ -58,7 +59,7 @@
viewer.setLabelProvider(provider);
- //refresh so that the colors are set
+ // refresh so that the colors are set
fViewer.refresh();
assertEquals("foreground 1 green", viewer.getTable().getItem(0).getForeground(0), green);//$NON-NLS-1$
@@ -125,13 +126,6 @@
}
@Override
- public void tearDown() {
- super.tearDown();
- red.dispose();
- green.dispose();
- }
-
- @Override
public void setUp() {
super.setUp();
red = new Color(Display.getCurrent(), 255, 0, 0);
@@ -140,6 +134,7 @@
/**
* Run as a stand alone test
+ *
* @param args
*/
public static void main(String[] args) {
@@ -158,8 +153,7 @@
viewer.getTable().setHeaderVisible(true);
String headers[] = { "column 1 header", "column 2 header" };//$NON-NLS-1$ //$NON-NLS-2$
- ColumnLayoutData layouts[] = { new ColumnWeightData(100),
- new ColumnWeightData(100) };
+ ColumnLayoutData layouts[] = { new ColumnWeightData(100), new ColumnWeightData(100) };
final TableColumn columns[] = new TableColumn[headers.length];
@@ -187,8 +181,7 @@
return table.getItem(at).getText();
}
- class TableColorViewLabelProvider extends TableTestLabelProvider implements
- ITableColorProvider {
+ class TableColorViewLabelProvider extends TableTestLabelProvider implements ITableColorProvider {
@Override
public Image getColumnImage(Object obj, int index) {
@@ -206,8 +199,6 @@
}
}
-
-
@Override
public Color getBackground(Object element, int columnIndex) {
switch (columnIndex) {
@@ -223,7 +214,7 @@
/**
* A class to test color providing without coloured columns.
*/
- class ColorViewLabelProvider extends TableTestLabelProvider implements IColorProvider{
+ class ColorViewLabelProvider extends TableTestLabelProvider implements IColorProvider {
@Override
public Color getBackground(Object element) {
return red;
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/JFaceThemeTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/JFaceThemeTest.java
index 699b408..f0ae0ee 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/JFaceThemeTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/JFaceThemeTest.java
@@ -93,7 +93,6 @@
assertNotNull(desc);
Color color = desc.createColor(getWorkbench().getDisplay());
assertNotNull(color);
- color.dispose();
desc = getDefaultTheme().getColorRegistry().getColorDescriptor(
"somegarbage", null);
@@ -104,6 +103,5 @@
assertNotNull(desc);
color = desc.createColor(getWorkbench().getDisplay());
assertNotNull(color);
- color.dispose();
}
}
