Skip to content

Commit 27387d7

Browse files
committed
Repair and execute disabled JFrameTopBoundsTest
The `test_resize_pack` test case was disabled with 2f300b9 because the size of the Swing components is platform-dependent.
1 parent 1726be8 commit 27387d7

1 file changed

Lines changed: 22 additions & 8 deletions

File tree

org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/top/JFrameTopBoundsTest.java

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.eclipse.draw2d.geometry.Dimension;
2323
import org.eclipse.jdt.core.ICompilationUnit;
2424

25-
import org.junit.jupiter.api.Disabled;
2625
import org.junit.jupiter.api.Test;
2726

2827
import java.awt.Window;
@@ -160,13 +159,12 @@ public MyBigFrame() {
160159
/**
161160
* Using {@link JFrame#pack()}.
162161
*/
163-
@Disabled
164162
@Test
165163
public void test_resize_pack() throws Exception {
166-
Dimension packSize = new Dimension(132, 89);
164+
Dimension packSize = new Dimension(130, 60);
167165
Dimension resizeSize = new Dimension(450, 300);
168166
ICompilationUnit unit =
169-
check_resize("// no size", "pack();", packSize, resizeSize, packSize, "// no size");
167+
check_resize("setUndecorated(true);", "pack();", packSize, resizeSize, packSize, "setUndecorated(true);");
170168
assert_sameSizeAfterReparse(unit, packSize);
171169
}
172170

@@ -275,8 +273,16 @@ private ICompilationUnit check_resize(String superClassName,
275273
public class Test extends %s {
276274
public Test() {
277275
%s
278-
getContentPane().add(new JButton("Swing JButton"), BorderLayout.NORTH);
279-
getContentPane().add(new Button("AWT Button"), BorderLayout.WEST);
276+
{
277+
JButton button = new JButton("Swing JButton");
278+
button.setPreferredSize(new Dimension(130, 30));
279+
getContentPane().add(button, BorderLayout.NORTH);
280+
}
281+
{
282+
Button button = new Button("AWT Button");
283+
button.setPreferredSize(new Dimension(130, 30));
284+
getContentPane().add(button, BorderLayout.WEST);
285+
}
280286
%s
281287
}
282288
}""".formatted(superClassName, oldSizeLine, addSizeString));
@@ -294,8 +300,16 @@ public Test() {
294300
public class Test extends %s {
295301
public Test() {
296302
%s
297-
getContentPane().add(new JButton("Swing JButton"), BorderLayout.NORTH);
298-
getContentPane().add(new Button("AWT Button"), BorderLayout.WEST);
303+
{
304+
JButton button = new JButton("Swing JButton");
305+
button.setPreferredSize(new Dimension(130, 30));
306+
getContentPane().add(button, BorderLayout.NORTH);
307+
}
308+
{
309+
Button button = new Button("AWT Button");
310+
button.setPreferredSize(new Dimension(130, 30));
311+
getContentPane().add(button, BorderLayout.WEST);
312+
}
299313
%s
300314
}
301315
}""".formatted(superClassName, newSizeLine, addSizeString));

0 commit comments

Comments
 (0)