Skip to content

Repair image-related Swing tests #1198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Aug 9, 2025
Merged

Repair image-related Swing tests #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,24 @@ public static IFile setFileContent(String path, String content) throws Exception
}

/**
* Creates/updates {@link IFile} with given folder/name, relative to "src" folder.
* Creates/updates {@link IFile} with given path, relative to "src" folder.
*/
public static IFile setFileContentSrc(String path, byte[] content) throws Exception {
return setFileContent("src/" + path, content);
}

/**
* Creates/updates {@link IFile} with given path, relative to {@link IProject}.
*/
public static IFile setFileContent(String path, byte[] content) throws Exception {
IFile file = getFile(path);
setFileContent(file, content);
return file;
}

/**
* Creates/updates {@link IFile} with given folder/name, relative to "src"
* folder.
*
* @return the created/updated {@link IFile}.
*/
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2024 Google, Inc. and others.
* Copyright (c) 2011, 2025 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -36,6 +36,7 @@
import org.eclipse.wb.internal.swing.model.component.ContainerInfo;
import org.eclipse.wb.internal.swing.model.component.JToolBarInfo;
import org.eclipse.wb.internal.swing.palette.ActionUseEntryInfo;
import org.eclipse.wb.tests.designer.TestUtils;
import org.eclipse.wb.tests.designer.swing.SwingModelTest;
import org.eclipse.wb.tests.designer.swing.SwingTestUtils;

Expand All @@ -55,7 +56,6 @@

import org.assertj.core.api.Assertions;
import org.assertj.core.util.Lists;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
Expand Down Expand Up @@ -1594,18 +1594,18 @@ public void test_anonymous_properties_inConstructorArgument() throws Exception {
/**
* Test for {@link ActionInfo#getPresentation()}.
*/
@Disabled
@Test
public void test_presentation() throws Exception {
m_waitForAutoBuild = true;
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
ContainerInfo panel =
parseContainer(
"public class Test extends JPanel {",
" private Action action_1 = new Action_1();",
" private Action action_2 = new Action_2();",
" private class Action_1 extends AbstractAction {",
" public Action_1() {",
" putValue(SMALL_ICON, new ImageIcon(Test.class.getResource('/javax/swing/plaf/basic/icons/JavaCup16.png')));",
" putValue(SMALL_ICON, new ImageIcon(Test.class.getResource('/Test.png')));",
" }",
" public void actionPerformed(ActionEvent e) {",
" }",
Expand Down
22 changes: 13 additions & 9 deletions ....tests/src/org/eclipse/wb/tests/designer/swing/model/property/IconPropertyEditorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 Google, Inc.
* Copyright (c) 2011, 2025 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -99,28 +99,30 @@ public void test_getText_fromFile_2() throws Exception {

@Test
public void test_getText_Class_getResource_1() throws Exception {
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
assertIconPropertyText(
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
"Classpath: /Test.png",
new String[]{
"public class Test extends JPanel {",
" public Test() {",
" JButton button = new JButton();",
" button.setIcon(new ImageIcon(Test.class.getResource(\"/javax/swing/plaf/basic/icons/JavaCup16.png\")));",
" button.setIcon(new ImageIcon(Test.class.getResource(\"/Test.png\")));",
" add(button);",
" }",
"}"});
}

@Test
public void test_getText_Class_getResource_2() throws Exception {
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
assertIconPropertyText(
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
"Classpath: /Test.png",
new String[]{
"public class Test extends JPanel {",
" public Test() {",
" JButton button = new JButton();",
" button.setIcon("
+ " new ImageIcon(Test.class.getResource(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"), "
+ " new ImageIcon(Test.class.getResource(\"/Test.png\"), "
+ " \"Some description\"));",
" add(button);",
" }",
Expand All @@ -129,13 +131,14 @@ public void test_getText_Class_getResource_2() throws Exception {

@Test
public void test_getText_Class_getResource_3() throws Exception {
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
assertIconPropertyText(
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
"Classpath: /Test.png",
new String[]{
"public class Test extends JPanel {",
" public Test() {",
" JButton button = new JButton();",
" Icon icon = new ImageIcon(Test.class.getResource(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"));",
" Icon icon = new ImageIcon(Test.class.getResource(\"/Test.png\"));",
" button.setIcon(icon);",
" add(button);",
" }",
Expand All @@ -144,13 +147,14 @@ public void test_getText_Class_getResource_3() throws Exception {

@Test
public void test_getText_Class_getResource_4() throws Exception {
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
assertIconPropertyText(
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
"Classpath: /Test.png",
new String[]{
"public class Test extends JPanel {",
" public Test() {",
" JButton button = new JButton();",
" java.net.URL url = Test.class.getResource(\"/javax/swing/plaf/basic/icons/JavaCup16.png\");",
" java.net.URL url = Test.class.getResource(\"/Test.png\");",
" Icon icon = new ImageIcon(url);",
" button.setIcon(icon);",
" add(button);",
Expand Down
21 changes: 10 additions & 11 deletions ...tests/src/org/eclipse/wb/tests/designer/swing/model/property/ImagePropertyEditorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 Google, Inc.
* Copyright (c) 2011, 2025 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -20,7 +20,6 @@

import org.eclipse.core.resources.IFile;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
Expand Down Expand Up @@ -69,42 +68,42 @@ public void test_getText_fromFile() throws Exception {
}
}

@Disabled
@Test
public void test_getText_Class_getResource_1() throws Exception {
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
assertImagePropertyText(
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
"Classpath: /Test.png",
new String[]{
"public class Test extends JFrame {",
" public Test() {",
" setIconImage(Toolkit.getDefaultToolkit().getImage(Test.class.getResource(\"/javax/swing/plaf/basic/icons/JavaCup16.png\")));",
" setIconImage(Toolkit.getDefaultToolkit().getImage(Test.class.getResource(\"/Test.png\")));",
" }",
"}"});
}

@Disabled
@Test
public void test_getText_Class_getResource_2() throws Exception {
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
assertImagePropertyText(
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
"Classpath: /Test.png",
new String[]{
"public class Test extends JFrame {",
" public Test() {",
" Image icon = Toolkit.getDefaultToolkit().getImage(Test.class.getResource(\"/javax/swing/plaf/basic/icons/JavaCup16.png\"));",
" Image icon = Toolkit.getDefaultToolkit().getImage(Test.class.getResource(\"/Test.png\"));",
" setIconImage(icon);",
" }",
"}"});
}

@Disabled
@Test
public void test_getText_Class_getResource_3() throws Exception {
setFileContentSrc("Test.png", TestUtils.createImagePNG(1, 1));
assertImagePropertyText(
"Classpath: /javax/swing/plaf/basic/icons/JavaCup16.png",
"Classpath: /Test.png",
new String[]{
"public class Test extends JFrame {",
" public Test() {",
" java.net.URL url = Test.class.getResource(\"/javax/swing/plaf/basic/icons/JavaCup16.png\");",
" java.net.URL url = Test.class.getResource(\"/Test.png\");",
" Image icon = Toolkit.getDefaultToolkit().getImage(url);",
" setIconImage(icon);",
" }",
Expand Down
Loading