Skip to content

Commit 9087e21

Browse files
ptzieglerptziegler
committed
Try to stabilize image tests
1 parent 6f7c051 commit 9087e21

File tree

4 files changed

+55
-49
lines changed

4 files changed

+55
-49
lines changed

‎org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTest.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Google, Inc. and others.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -31,6 +31,13 @@
3131
* @author lobas_av
3232
*/
3333
public abstract class ImagePropertyEditorTest extends RcpModelTest {
34+
35+
@Override
36+
protected void configureNewProject() throws Exception {
37+
super.configureNewProject();
38+
m_testProject.addPlugin("org.eclipse.wb.core");
39+
}
40+
3441
////////////////////////////////////////////////////////////////////////////
3542
//
3643
// Utils

‎org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestNoManager.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -22,7 +22,6 @@
2222

2323
import org.apache.commons.io.FilenameUtils;
2424
import org.junit.jupiter.api.BeforeEach;
25-
import org.junit.jupiter.api.Disabled;
2625
import org.junit.jupiter.api.Test;
2726

2827
import java.io.File;
@@ -97,24 +96,22 @@ public void test_textSource_absolutePath() throws Exception {
9796
/**
9897
* Image creation using constructor with input stream (over class resource).
9998
*/
100-
@Disabled
10199
@Test
102100
public void test_textSource_image_over_classpath() throws Exception {
103101
assert_getText_getClipboardSource_forSource(
104-
"new Image(null, getClass().getResourceAsStream(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"))",
105-
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
106-
"new org.eclipse.swt.graphics.Image(null, {wbp_classTop}.getResourceAsStream(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"))");
102+
"new Image(null, getClass().getResourceAsStream(\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\"))",
103+
"Classpath: /org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif",
104+
"new org.eclipse.swt.graphics.Image(null, {wbp_classTop}.getResourceAsStream(\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\"))");
107105
}
108106

109107
/**
110108
* Image creation using constructor with input stream (over class resource).
111109
*/
112-
@Disabled
113110
@Test
114111
public void test_textSource_image_over_classpath_OtherClass() throws Exception {
115112
assert_getText_getClipboardSource_forSource(
116-
"new Image(null, java.lang.String.class.getResourceAsStream(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"))",
117-
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
118-
"new org.eclipse.swt.graphics.Image(null, {wbp_classTop}.getResourceAsStream(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"))");
113+
"new Image(null, org.eclipse.wb.core.editor.constants.CoreImages.class.getResourceAsStream(\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\"))",
114+
"Classpath: /org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif",
115+
"new org.eclipse.swt.graphics.Image(null, {wbp_classTop}.getResourceAsStream(\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\"))");
119116
}
120117
}

‎org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/ImagePropertyEditorTestWithManager.java‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -26,7 +26,6 @@
2626

2727
import org.apache.commons.io.FilenameUtils;
2828
import org.junit.jupiter.api.BeforeEach;
29-
import org.junit.jupiter.api.Disabled;
3029
import org.junit.jupiter.api.Test;
3130

3231
import java.io.File;
@@ -103,25 +102,23 @@ public void test_textSource_absolutePath() throws Exception {
103102
/**
104103
* Image creation using constructor with input stream (over class resource).
105104
*/
106-
@Disabled
107105
@Test
108106
public void test_textSource_image_over_classpath() throws Exception {
109107
assert_getText_getClipboardSource_forSource(
110-
"new Image(null, getClass().getResourceAsStream(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"))",
111-
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
112-
getInvocationSource(shell(), "{wbp_classTop}", "/javax/swing/plaf/basic/icons/JavaCup16.png"));
108+
"new Image(null, getClass().getResourceAsStream(\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\"))",
109+
"Classpath: /org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif",
110+
getInvocationSource(shell(), "{wbp_classTop}", "\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\""));
113111
}
114112

115113
/**
116114
* Image creation using constructor with input stream (over class resource).
117115
*/
118-
@Disabled
119116
@Test
120117
public void test_textSource_image_over_classpath_OtherClass() throws Exception {
121118
assert_getText_getClipboardSource_forSource(
122-
"new Image(null, java.lang.String.class.getResourceAsStream(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"))",
123-
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
124-
getInvocationSource(shell(), "{wbp_classTop}", "/javax/swing/plaf/basic/icons/JavaCup16.png"));
119+
"new Image(null, org.eclipse.wb.core.editor.constants.CoreImages.class.getResourceAsStream(\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\"))",
120+
"Classpath: /org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif",
121+
getInvocationSource(shell(), "{wbp_classTop}", "\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\""));
125122
}
126123

127124
////////////////////////////////////////////////////////////////////////////
@@ -154,9 +151,9 @@ public void test_textSource_absolutePath2() throws Exception {
154151
public void test_textSource_image_over_classpath2() throws Exception {
155152
CompositeInfo shell = shell();
156153
assert_getText_getClipboardSource_forSource2(
157-
getInvocationSource(shell, "getClass()", "\"/javax/swing/plaf/basic/icons/JavaCup16.png\""),
158-
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
159-
getInvocationSource(shell, "{wbp_classTop}", "\"/javax/swing/plaf/basic/icons/JavaCup16.png\""));
154+
getInvocationSource(shell, "getClass()", "\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\""),
155+
"Classpath: /org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif",
156+
getInvocationSource(shell, "{wbp_classTop}", "\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\""));
160157
}
161158

162159
/**
@@ -166,9 +163,9 @@ public void test_textSource_image_over_classpath2() throws Exception {
166163
public void test_textSource_image_over_classpath_OtherClass2() throws Exception {
167164
CompositeInfo shell = shell();
168165
assert_getText_getClipboardSource_forSource2(
169-
getInvocationSource(shell, "java.lang.String.class", "\"/javax/swing/plaf/basic/icons/JavaCup16.png\""),
170-
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
171-
getInvocationSource(shell, "{wbp_classTop}", "\"/javax/swing/plaf/basic/icons/JavaCup16.png\""));
166+
getInvocationSource(shell, "java.lang.String.class", "\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\""),
167+
"Classpath: /org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif",
168+
getInvocationSource(shell, "{wbp_classTop}", "\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\""));
172169
}
173170

174171
/**
@@ -210,15 +207,15 @@ public void test_textSource_order() throws Exception {
210207
"}");
211208
ManagerContainerInfo.getResourceManagerInfo(shell);
212209
shell.addMethodInvocation("setImage(org.eclipse.swt.graphics.Image)",
213-
getInvocationSource(shell, "java.lang.String.class", "\"/javax/swing/plaf/basic/icons/JavaCup16.png\""));
210+
getInvocationSource(shell, "java.lang.String.class", "\"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\""));
214211
shell.refresh();
215212
assertEditor(
216213
"// filler filler filler",
217214
"public class Test extends Shell {",
218215
" private LocalResourceManager localResourceManager;",
219216
" public Test() {",
220217
" createResourceManager();",
221-
" setImage(localResourceManager.create(ImageDescriptor.createFromFile(String.class, \"/javax/swing/plaf/basic/icons/JavaCup16.png\")));",
218+
" setImage(localResourceManager.create(ImageDescriptor.createFromFile(String.class, \"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif\")));",
222219
" }",
223220
" private void createResourceManager() {",
224221
" localResourceManager = new LocalResourceManager(JFaceResources.getResources(),this);",

‎org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/property/SWTResourceManagerTest.java‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*******************************************************************************/
1313
package org.eclipse.wb.tests.designer.swt.model.property;
1414

15+
import org.eclipse.wb.core.editor.constants.CoreImages;
1516
import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils;
1617
import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo;
1718
import org.eclipse.wb.internal.swt.utils.ManagerUtils;
@@ -23,7 +24,6 @@
2324

2425
import org.junit.jupiter.api.AfterEach;
2526
import org.junit.jupiter.api.BeforeEach;
26-
import org.junit.jupiter.api.Disabled;
2727
import org.junit.jupiter.api.Test;
2828

2929
import java.io.File;
@@ -41,6 +41,12 @@ public class SWTResourceManagerTest extends RcpModelTest {
4141
private Class<?> SWTManagerClass;
4242
private Class<?> ImageClass;
4343

44+
@Override
45+
protected void configureNewProject() throws Exception {
46+
super.configureNewProject();
47+
m_testProject.addPlugin("org.eclipse.wb.core");
48+
}
49+
4450
////////////////////////////////////////////////////////////////////////////
4551
//
4652
// Life cycle
@@ -212,7 +218,6 @@ public void test_getImage_absolute() throws Exception {
212218
}
213219
}
214220

215-
@Disabled
216221
@Test
217222
public void test_getImage_classpath() throws Exception {
218223
// create image over SWTResourceManager
@@ -221,7 +226,7 @@ public void test_getImage_classpath() throws Exception {
221226
SWTManagerClass,
222227
"getImage(java.lang.Class,java.lang.String)",
223228
SWTManagerClass,
224-
"/javax/swing/plaf/basic/icons/JavaCup16.png");
229+
"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif");
225230
// check create
226231
assertNotNull(image);
227232
// check state
@@ -230,10 +235,11 @@ public void test_getImage_classpath() throws Exception {
230235
SWTManagerClass,
231236
"getImage(java.lang.Class,java.lang.String)",
232237
SWTManagerClass,
233-
"/javax/swing/plaf/basic/icons/JavaCup16.png"));
238+
"/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif"));
234239
// load image directly over Image
235-
Image directImage = new Image(null,
236-
getClass().getResourceAsStream("/javax/swing/plaf/basic/icons/JavaCup16.png"));
240+
ImageData directImageData = new ImageData(
241+
CoreImages.class.getResourceAsStream("/org/eclipse/wb/core/controls/flyout/icons/arrow_bottom.gif"));
242+
Image directImage = new Image(null, directImageData);
237243
// check equals images
238244
try {
239245
assertEqualsImage(image, directImage);
@@ -246,14 +252,14 @@ public void test_getImage_classpath() throws Exception {
246252
SWTManagerClass,
247253
"getImage(java.lang.Class,java.lang.String)",
248254
SWTManagerClass,
249-
"/javax/swing/plaf/basic/icons/image-failed.png");
255+
"/org/eclipse/wb/core/controls/flyout/icons/arrow_top.gif");
250256
assertNotNull(image1);
251257
assertFalse(image1.isDisposed());
252258
assertSame(image1, ReflectionUtils.invokeMethod(
253259
SWTManagerClass,
254260
"getImage(java.lang.Class,java.lang.String)",
255261
SWTManagerClass,
256-
"/javax/swing/plaf/basic/icons/image-failed.png"));
262+
"/org/eclipse/wb/core/controls/flyout/icons/arrow_top.gif"));
257263
assertNotSame(image, image1);
258264
}
259265

@@ -314,18 +320,17 @@ private static void assertEqualsImage(Image image1, Image image2) throws Excepti
314320
ImageData data1 = image1.getImageData();
315321
ImageData data2 = image2.getImageData();
316322

317-
assertEquals(data1.width, data2.width);
318-
assertEquals(data1.height, data2.height);
319-
assertEquals(data1.depth, data2.depth);
320-
assertEquals(data1.scanlinePad, data2.scanlinePad);
321-
assertEquals(data1.bytesPerLine, data2.bytesPerLine);
322-
assertEquals(data1.transparentPixel, data2.transparentPixel);
323-
assertEquals(data1.maskPad, data2.maskPad);
324-
assertEquals(data1.alpha, data2.alpha);
325-
// Type is only set when image was created via ImageData (Windows)
326-
// assertEquals(data1.type, data2.type);
327-
assertEquals(data1.x, data2.x);
328-
assertEquals(data1.y, data2.y);
323+
assertEquals(data1.width, data2.width, "width");
324+
assertEquals(data1.height, data2.height, "height");
325+
assertEquals(data1.depth, data2.depth, "depth");
326+
assertEquals(data1.scanlinePad, data2.scanlinePad, "scanline pad");
327+
assertEquals(data1.bytesPerLine, data2.bytesPerLine, "bytes per line");
328+
assertEquals(data1.transparentPixel, data2.transparentPixel, "transparent pixel");
329+
assertEquals(data1.maskPad, data2.maskPad, "mask pad");
330+
assertEquals(data1.alpha, data2.alpha, "alpha");
331+
assertEquals(data1.type, data2.type);
332+
assertEquals(data1.x, data2.x, "x");
333+
assertEquals(data1.y, data2.y, "y");
329334
}
330335

331336
////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)