Skip to content

Commit 3ab3fe8

Browse files
committed
Repair and execute disabled SurroundSupportTest
The `test_absolute_singleControl_onTitledJPanel` test case was disabled with 2f300b9 because the insets of the `TitledBorder` are platform-dependent, which therefore need to be determined on-the-fly.
1 parent 718c87d commit 3ab3fe8

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/util/SurroundSupportTest.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import org.eclipse.wb.core.model.ObjectInfo;
1616
import org.eclipse.wb.internal.core.utils.ui.MenuIntersector;
17+
import org.eclipse.wb.internal.swing.model.CoordinateUtils;
1718
import org.eclipse.wb.internal.swing.model.component.ComponentInfo;
1819
import org.eclipse.wb.internal.swing.model.component.ContainerInfo;
1920
import org.eclipse.wb.internal.swing.model.layout.FlowLayoutInfo;
@@ -22,23 +23,26 @@
2223
import org.eclipse.wb.internal.swing.model.util.surround.SwingSurroundSupport;
2324
import org.eclipse.wb.tests.designer.swing.SwingModelTest;
2425

26+
import org.eclipse.draw2d.geometry.Insets;
27+
import org.eclipse.draw2d.geometry.Rectangle;
2528
import org.eclipse.jface.action.IAction;
2629
import org.eclipse.jface.action.IMenuManager;
2730
import org.eclipse.jface.action.MenuManager;
2831

29-
import org.junit.jupiter.api.Disabled;
3032
import org.junit.jupiter.api.Test;
3133

3234
import java.util.ArrayList;
3335
import java.util.Collections;
3436
import java.util.List;
3537

38+
import javax.swing.BorderFactory;
3639
import javax.swing.JButton;
3740
import javax.swing.JPanel;
3841
import javax.swing.JScrollPane;
3942
import javax.swing.JSplitPane;
4043
import javax.swing.JTabbedPane;
4144
import javax.swing.JTable;
45+
import javax.swing.border.TitledBorder;
4246

4347
/**
4448
* Tests for {@link SwingSurroundSupport}.
@@ -316,7 +320,6 @@ public Test() {
316320
/**
317321
* Single {@link ComponentInfo} on {@link AbsoluteLayoutInfo}.
318322
*/
319-
@Disabled
320323
@Test
321324
public void test_absolute_singleControl_onTitledJPanel() throws Exception {
322325
ContainerInfo panel = parseContainer("""
@@ -332,10 +335,15 @@ public Test() {
332335
}""");
333336
panel.refresh();
334337
ComponentInfo button = panel.getChildrenComponents().get(0);
338+
339+
TitledBorder border = BorderFactory.createTitledBorder("JPanel title");
340+
Insets insets = CoordinateUtils.get(border.getBorderInsets(button.getComponent()));
341+
335342
// run action
336343
runSurround("javax.swing.JPanel (border)", button);
337-
String expectedPanelBounds = "44, 28, 112, 79";
338-
String expectedButtonBounds = "6, 22, 100, 50";
344+
Rectangle r = new Rectangle(50, 50, 100, 50).expand(insets);
345+
String expectedPanelBounds = "%d, %d, %d, %d".formatted(r.x, r.y, r.width, r.height);
346+
String expectedButtonBounds = "%d, %d, 100, 50".formatted(insets.left, insets.top);
339347
assertEditor("""
340348
public class Test extends JPanel {
341349
public Test() {

0 commit comments

Comments
 (0)