From ee259bd1df155bb101aa7c44692f6f050034aa4b Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Sat, 19 Sep 2026 09:53:16 +0200 Subject: [PATCH] Build and test against MacOS --- .github/workflows/maven.yaml | 2 +- .../wb/tests/designer/core/model/ClassLoadingTest.java | 3 +++ .../model/association/ImplicitObjectAssociationTest.java | 3 +++ .../association/InvocationSecondaryAssociationTest.java | 3 +++ .../model/description/ComponentDescriptionHelperTest.java | 5 ++++- .../model/description/DescriptionVersionsProvidersTest.java | 5 ++++- .../wb/tests/designer/core/model/operations/DeleteTest.java | 5 ++++- .../wb/tests/designer/core/model/util/JavaInfoUtilsTest.java | 3 +++ .../wb/tests/designer/core/model/util/MethodOrderTest.java | 3 +++ .../designer/swt/model/layouts/grid/GridLayoutGefTest.java | 3 +++ 10 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index ef48a57299..85b20fc8f4 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest, macos-26-intel] java: [ 25 ] target: [ 2024-06, master ] runs-on: ${{ matrix.os }} diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java index fafad4ed4f..550f1865a1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/ClassLoadingTest.java @@ -21,6 +21,8 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.osgi.framework.Bundle; import java.util.List; @@ -30,6 +32,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class ClassLoadingTest extends SwingModelTest { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java index 4db059cd2c..dbc8f9ffd3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ImplicitObjectAssociationTest.java @@ -19,12 +19,15 @@ import org.apache.commons.lang3.NotImplementedException; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; /** * Tests for {@link ImplicitObjectAssociation}. * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class ImplicitObjectAssociationTest extends SwingModelTest { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java index f4f943314d..e65004ff26 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/InvocationSecondaryAssociationTest.java @@ -20,6 +20,8 @@ import org.apache.commons.lang3.NotImplementedException; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.awt.BorderLayout; import java.awt.Component; @@ -30,6 +32,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class InvocationSecondaryAssociationTest extends SwingModelTest { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java index 569cb4694b..06a2c177b4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/ComponentDescriptionHelperTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 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 @@ -49,6 +49,8 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.osgi.framework.Bundle; import org.xml.sax.SAXParseException; @@ -65,6 +67,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class ComponentDescriptionHelperTest extends SwingModelTest { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java index c8cd9f1316..1e89f3fc79 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/description/DescriptionVersionsProvidersTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 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 @@ -29,6 +29,8 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.osgi.framework.Bundle; import java.awt.Component; @@ -42,6 +44,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class DescriptionVersionsProvidersTest extends SwingModelTest { private static final String POINT_TOOLKITS = "org.eclipse.wb.core.toolkits"; private static final String POINT_VER_FACTORIES = diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java index 744a568863..ce13455838 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/operations/DeleteTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2026 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 @@ -19,6 +19,8 @@ import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import javax.swing.JPanel; @@ -27,6 +29,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class DeleteTest extends SwingModelTest { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java index 749bdc225e..16f98ce7f0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/JavaInfoUtilsTest.java @@ -77,6 +77,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.mockito.ArgumentCaptor; import java.awt.FlowLayout; @@ -96,6 +98,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class JavaInfoUtilsTest extends SwingModelTest { private static final IPreferenceStore PREFERENCES = ToolkitProvider.DESCRIPTION.getPreferences(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java index 7e536701e4..1119b73e2b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/MethodOrderTest.java @@ -36,6 +36,8 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.util.List; @@ -44,6 +46,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests get stuck on the GitHub runner") public class MethodOrderTest extends SwingModelTest { //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java index d1e4bf7b22..5d40ecd4d0 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/layouts/grid/GridLayoutGefTest.java @@ -35,6 +35,8 @@ import org.eclipse.swt.widgets.Control; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.util.List; @@ -43,6 +45,7 @@ * * @author scheglov_ke */ +@DisabledOnOs(value = OS.MAC, disabledReason = "The tests crashes on the GitHub runner") public class GridLayoutGefTest extends RcpGefTest { private static final int M = 5; private static final int S = 5;