Skip to content

Repair and execute disabled Swing tests #24

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
ptziegler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Repair and execute disabled Swing tests #24

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
1 change: 1 addition & 0 deletions org.eclipse.wb.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ Export-Package: org.eclipse.wb.tests.designer;x-internal:=true,
org.eclipse.wb.tests.utils;x-internal:=true
Import-Package: com.jgoodies.forms.factories;version="[1.9.0,2.0.0]",
com.jgoodies.forms.layout;version="[1.9.0,2.0.0]",
com.jgoodies.forms.util;version="[1.9.0,2.0.0)",
net.miginfocom.layout;version="[11.3.0,12.0.0]",
net.miginfocom.swing;version="[11.3.0,12.0.0]",
org.apache.commons.collections4;version="[4.4.0,5.0.0)",
Expand Down
2 changes: 0 additions & 2 deletions org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/bean/ActionGefTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

import org.apache.commons.lang3.function.FailableConsumer;
import org.apache.commons.lang3.function.FailableRunnable;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import javax.swing.JButton;
Expand Down Expand Up @@ -232,7 +231,6 @@ public Test() {
/**
* Test for {@link ActionExternalEntryInfo}.
*/
@Disabled
@Test
public void test_JToolBar_ActionExternalEntryInfo() throws Exception {
createExternalAction();
Expand Down
4 changes: 1 addition & 3 deletions ...lipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/ComponentTest.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 @@ -31,7 +31,6 @@
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.RGB;

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

import java.awt.Component;
Expand Down Expand Up @@ -88,7 +87,6 @@ public void test_clearSwingTree_removeAll_NPE() throws Exception {
/**
* We can not create {@link java.awt.Image} with zero size, so we should check this.
*/
@Disabled
@Test
public void test_zeroSize() throws Exception {
ContainerInfo panel =
Expand Down
4 changes: 1 addition & 3 deletions ...clipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/component/JSpinnerTest.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 @@ -23,7 +23,6 @@
import org.eclipse.wb.tests.designer.Expectations.StrValue;
import org.eclipse.wb.tests.designer.swing.SwingModelTest;

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

import java.lang.reflect.Field;
Expand Down Expand Up @@ -142,7 +141,6 @@ public void test_dateModel_getDateStep() throws Exception {
0xDEADBEEF));
}

@Disabled
@Test
public void test_dateModel() throws Exception {
String source =
Expand Down
22 changes: 21 additions & 1 deletion ...c/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/AbstractFormLayoutTest.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 @@ -17,22 +17,42 @@
import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest;

import com.jgoodies.forms.layout.FormLayout;
import com.jgoodies.forms.util.DefaultUnitConverter;

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

import java.awt.Font;

/**
* Abstract test for {@link FormLayout}.
*
* @author scheglov_ke
*/
public abstract class AbstractFormLayoutTest extends AbstractLayoutTest {
private static Font m_font;
protected boolean m_useFormsImports = true;

////////////////////////////////////////////////////////////////////////////
//
// Life cycle
//
////////////////////////////////////////////////////////////////////////////

@BeforeAll
public static void setUpAll() {
m_font = DefaultUnitConverter.getInstance().getDefaultDialogFont();
Font newFont = new Font(Font.SANS_SERIF, Font.PLAIN, 12);
DefaultUnitConverter.getInstance().setDefaultDialogFont(newFont);
}

@AfterAll
public static void tearDownAll() {
DefaultUnitConverter.getInstance().setDefaultDialogFont(m_font);
m_font = null;
}

@Override
@BeforeEach
public void setUp() throws Exception {
Expand Down
4 changes: 1 addition & 3 deletions .../eclipse/wb/tests/designer/swing/model/layout/FormLayout/DefaultComponentFactoryTest.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 @@ -29,7 +29,6 @@
import com.jgoodies.forms.factories.DefaultComponentFactory;

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

/**
Expand Down Expand Up @@ -109,7 +108,6 @@ public void test_createLabel() throws Exception {
* Test for {@link DefaultComponentFactoryCreateLabelEntryInfo}.
*/
@DisposeProjectAfter
@Disabled
@Test
public void test_createLabel_tool() throws Exception {
do_projectDispose();
Expand Down
5 changes: 1 addition & 4 deletions ...rc/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormDimensionInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2023 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 @@ -26,7 +26,6 @@
import com.jgoodies.forms.layout.Size;
import com.jgoodies.forms.layout.Sizes;

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

import java.lang.reflect.Method;
Expand Down Expand Up @@ -266,7 +265,6 @@ public void test_rowTemplates() throws Exception {
// Convert to GAP template
//
////////////////////////////////////////////////////////////////////////////
@Disabled
@Test
public void test_convertToNearestGap_columns() throws Exception {
check_convertToNearestGap_column("4px", 5, "LABEL_COMPONENT_GAP_COLSPEC");
Expand All @@ -284,7 +282,6 @@ public void test_convertToNearestGap_columns() throws Exception {
check_convertToNearestGap_column("20px", 5, null);
}

@Disabled
@Test
public void test_convertToNearestGap_rows() throws Exception {
check_convertToNearestGap_row("4px", 5, "LABEL_COMPONENT_GAP_ROWSPEC");
Expand Down
20 changes: 8 additions & 12 deletions .../org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/FormLayoutConverterTest.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 com.jgoodies.forms.layout.FormLayout;

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

/**
Expand Down Expand Up @@ -60,7 +59,6 @@ public void test_empty() throws Exception {
"}");
}

@Disabled
@Test
public void test_oneRow() throws Exception {
ContainerInfo panel =
Expand Down Expand Up @@ -96,7 +94,7 @@ public void test_oneRow() throws Exception {
" setLayout(new FormLayout(new ColumnSpec[] {",
" FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,",
" ColumnSpec.decode('100px'),",
" ColumnSpec.decode('16px'),",
" FormSpecs.UNRELATED_GAP_COLSPEC,",
" ColumnSpec.decode('80px'),},",
" new RowSpec[] {",
" FormSpecs.UNRELATED_GAP_ROWSPEC,",
Expand All @@ -118,7 +116,6 @@ public void test_oneRow() throws Exception {
}
}

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

@Disabled
@Test
public void test_Switching_fromGridBagLayout() throws Exception {
ContainerInfo panel =
Expand Down Expand Up @@ -243,17 +239,17 @@ public void test_Switching_fromGridBagLayout() throws Exception {
"public class Test extends JPanel {",
" public Test() {",
" setLayout(new FormLayout(new ColumnSpec[] {",
" ColumnSpec.decode('46px'),",
" ColumnSpec.decode('60px'),",
" FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,",
" ColumnSpec.decode('305px'),",
" ColumnSpec.decode('275px'),",
" FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,",
" ColumnSpec.decode('89px'),},",
" ColumnSpec.decode('105px'),},",
" new RowSpec[] {",
" RowSpec.decode('20px'),",
" RowSpec.decode('26px'),",
" FormSpecs.LINE_GAP_ROWSPEC,",
" RowSpec.decode('20px'),",
" RowSpec.decode('21px'),",
" FormSpecs.LINE_GAP_ROWSPEC,",
" RowSpec.decode('23px'),}));",
" RowSpec.decode('27px'),}));",
" {",
" JComboBox comboBox = new JComboBox();",
" add(comboBox, '3, 1, fill, center');",
Expand Down
Loading
Loading