Skip to content

Repair and execute disabled MigLayout tests #1267

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Repair and execute disabled MigLayout tests #1267

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
17 changes: 16 additions & 1 deletion ...src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/AbstractMigLayoutTest.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.
* 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 @@ -19,6 +19,10 @@
import org.eclipse.wb.internal.swing.model.component.ComponentInfo;
import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest;

import net.miginfocom.layout.PlatformDefaults;
import net.miginfocom.layout.UnitValue;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;

/**
Expand All @@ -43,6 +47,17 @@ static void do_configureNewProject() throws Exception {
m_testProject.addPlugin("com.miglayout.swing");
}

/**
* Default values used on Windows. Should be used for all platforms to have
* consistent test results.
*/
@BeforeAll
public static void resetMigLayoutDefaults() {
final UnitValue DEFAULT_GAP = new UnitValue(7.0f);
PlatformDefaults.setPanelInsets(DEFAULT_GAP, DEFAULT_GAP, DEFAULT_GAP, DEFAULT_GAP);
PlatformDefaults.setGridCellGap(DEFAULT_GAP, DEFAULT_GAP);
}

@Override
@BeforeEach
public void setUp() throws Exception {
Expand Down
7 changes: 2 additions & 5 deletions ...rc/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutConverterTest.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 @@ -18,7 +18,6 @@

import net.miginfocom.swing.MigLayout;

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

import javax.swing.JTable;
Expand Down Expand Up @@ -388,7 +387,6 @@ public void test_oneRow_bottom() throws Exception {
"}");
}

@Disabled
@Test
public void test_oneRow_fill() throws Exception {
ContainerInfo panel =
Expand Down Expand Up @@ -483,7 +481,6 @@ public void test_twoRows_spanColumns() throws Exception {
"}");
}

@Disabled
@Test
public void test_Switching_fromGridBagLayout() throws Exception {
ContainerInfo panel =
Expand Down Expand Up @@ -544,7 +541,7 @@ public void test_Switching_fromGridBagLayout() throws Exception {
assertEditor(
"public class Test extends JPanel {",
" public Test() {",
" setLayout(new MigLayout('', '[46px][305px][5px][89px]', '[20px][20px][23px]'));",
" setLayout(new MigLayout('', '[60px][275px][5px][105px]', '[26px][21px][27px]'));",
" {",
" JComboBox comboBox = new JComboBox();",
" add(comboBox, 'cell 1 0,growx,aligny center');",
Expand Down
70 changes: 19 additions & 51 deletions ...b.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/MigLayout/MigLayoutTest.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 All @@ -25,9 +25,6 @@
import org.eclipse.wb.internal.swing.model.CoordinateUtils;
import org.eclipse.wb.internal.swing.model.component.ComponentInfo;
import org.eclipse.wb.internal.swing.model.component.ContainerInfo;
import org.eclipse.wb.tests.designer.Expectations;
import org.eclipse.wb.tests.designer.Expectations.RectValue;
import org.eclipse.wb.tests.designer.Expectations.StrValue;
import org.eclipse.wb.tests.designer.core.annotations.DisposeProjectAfter;

import org.eclipse.draw2d.geometry.Interval;
Expand All @@ -42,10 +39,11 @@
import net.miginfocom.swing.MigLayout;

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

import java.awt.Toolkit;
import java.util.List;
import java.util.Locale;

import javax.swing.JButton;

Expand Down Expand Up @@ -234,7 +232,6 @@ public void test_writeDimensions_LC() throws Exception {
/**
* Test for {@link IGridInfo}.
*/
@Disabled
@Test
public void test_IGridInfo() throws Exception {
ContainerInfo panel =
Expand All @@ -258,21 +255,17 @@ public void test_IGridInfo() throws Exception {
assertEquals(3, gridInfo.getColumnCount());
Interval[] columnIntervals = gridInfo.getColumnIntervals();
Assertions.assertThat(columnIntervals).hasSize(3);
assertEquals("Interval(7, 100)", columnIntervals[0].toString());
assertEquals("Interval(111, 150)", columnIntervals[1].toString());
assertEquals("Interval(265, 50)", columnIntervals[2].toString());
assertEquals("Interval[begin=7, length=100]", columnIntervals[0].toString());
assertEquals("Interval[begin=114, length=150]", columnIntervals[1].toString());
assertEquals("Interval[begin=271, length=50]", columnIntervals[2].toString());
}
// rows
{
assertEquals(2, gridInfo.getRowCount());
Interval[] rowIntervals = gridInfo.getRowIntervals();
Assertions.assertThat(rowIntervals).hasSize(2);
assertEquals("Interval(7, 40)", rowIntervals[0].toString());
assertEquals(
Expectations.get("Interval(51, 23)", new StrValue[]{
new StrValue("kosta-home", "Interval(51, 25)"),
new StrValue("scheglov-win", "Interval(51, 23)")}),
rowIntervals[1].toString());
assertEquals("Interval[begin=7, length=40]", rowIntervals[0].toString());
assertEquals("Interval[begin=54, length=27]", rowIntervals[1].toString());
}
// cells
{
Expand All @@ -287,23 +280,12 @@ public void test_IGridInfo() throws Exception {
}
{
Rectangle cells = new Rectangle(2, 0, 1, 1);
Rectangle expected = new Rectangle(265, 7, 50 + 1, 40 + 1);
Rectangle expected = new Rectangle(271, 7, 50 + 1, 40 + 1);
assertEquals(expected, gridInfo.getCellsRectangle(cells));
}
{
Rectangle cells = new Rectangle(0, 0, 2, 2);
Rectangle expected =
Expectations.get(
new Rectangle(7, 7, 100 + 4 + 150 + 1, 40 + 4 + 23 + 1),
new RectValue[]{
new RectValue("kosta-home", new Rectangle(7,
7,
100 + 4 + 150 + 1,
40 + 4 + 25 + 1)),
new RectValue("scheglov-win", new Rectangle(7,
7,
100 + 4 + 150 + 1,
40 + 4 + 23 + 1))});
Rectangle expected = new Rectangle(7, 7, 100 + 150 + 7 + 1, 40 + 7 + 27 + 1);
assertEquals(expected, gridInfo.getCellsRectangle(cells));
}
}
Expand Down Expand Up @@ -1341,7 +1323,6 @@ public void test_dimensionSize_setCheck() throws Exception {
/**
* Test for {@link MigDimensionInfo#toUnitString(int, String)}.
*/
@Disabled
@Test
public void test_dimensionSize_toUnitString() throws Exception {
ContainerInfo panel =
Expand All @@ -1353,37 +1334,24 @@ public void test_dimensionSize_toUnitString() throws Exception {
"}");
panel.refresh();
MigLayoutInfo layout = (MigLayoutInfo) panel.getLayout();
int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
{
MigColumnInfo column = layout.getColumns().get(0);
assertEquals("2.65cm", column.toUnitString(100, "cm"));
assertEquals(String.format("%.2fcm", Locale.ENGLISH, (2.54 * 100 / dpi)), column.toUnitString(100, "cm"));
assertEquals("22.22%", column.toUnitString(100, "%"));
// check "sp" unit
String expected_sp;
int displayWidth = Display.getDefault().getBounds().width;
if (displayWidth == 1920) {
expected_sp = "5.21sp";
} else if (displayWidth == 1680) {
expected_sp = "5.95sp";
} else {
throw new AssertionError("Unknown display width: " + displayWidth);
}
assertEquals(expected_sp, column.toUnitString(100, "sp"));
int monitorWidth = Display.getCurrent().getPrimaryMonitor().getBounds().width;
assertEquals(String.format(Locale.ENGLISH, "%.2fsp", 100.0 * (100.0 / monitorWidth)),
column.toUnitString(100, "sp"));
}
{
MigRowInfo row = layout.getRows().get(0);
assertEquals("2.65cm", row.toUnitString(100, "cm"));
assertEquals(String.format("%.2fcm", Locale.ENGLISH, (2.54 * 100 / dpi)), row.toUnitString(100, "cm"));
assertEquals("33.33%", row.toUnitString(100, "%"));
// check "sp" unit
int displayHeight = Display.getDefault().getBounds().height;
String expected_sp;
if (displayHeight == 1200) {
expected_sp = "8.33sp";
} else if (displayHeight == 1050) {
expected_sp = "9.52sp";
} else {
throw new AssertionError("Unknown display width: " + displayHeight);
}
assertEquals(expected_sp, row.toUnitString(100, "sp"));
int monitorHeight = Display.getCurrent().getPrimaryMonitor().getBounds().height;
assertEquals(String.format(Locale.ENGLISH, "%.2fsp", 100.0 * (100.0 / monitorHeight)),
row.toUnitString(100, "sp"));
}
}

Expand Down
Loading