diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.java index 5c9e87fbb..df2ff0b1a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/description/RcpDescriptionVersionsProviderFactoryTest.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 @@ -18,10 +18,6 @@ import org.eclipse.wb.tests.designer.core.annotations.DisposeProjectAfter; import org.eclipse.wb.tests.designer.rcp.RcpModelTest; -import static org.assertj.core.data.MapEntry.entry; - -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.util.List; @@ -32,14 +28,6 @@ * @author scheglov_ke */ public class RcpDescriptionVersionsProviderFactoryTest extends RcpModelTest { - //////////////////////////////////////////////////////////////////////////// - // - // Exit zone :-) XXX - // - //////////////////////////////////////////////////////////////////////////// - public void _test_exit() throws Exception { - System.exit(0); - } //////////////////////////////////////////////////////////////////////////// // @@ -51,60 +39,51 @@ public void _test_exit() throws Exception { public void test_notRCP() throws Exception { do_projectDispose(); do_projectCreate(); - parseSource( - "test", - "Test.java", - getSource( - "import javax.swing.*;", - "public class Test extends JPanel {", - " public Test() {", - " }", - "}")); + parseSource("test", "Test.java", getSource(""" + import javax.swing.*; + public class Test extends JPanel { + public Test() { + } + }""")); // check IDescriptionVersionsProviderFactory - IDescriptionVersionsProviderFactory providerFactory = - RcpDescriptionVersionsProviderFactory.INSTANCE; - IDescriptionVersionsProvider provider = - providerFactory.getProvider(m_javaProject, m_lastLoader); + IDescriptionVersionsProviderFactory providerFactory = RcpDescriptionVersionsProviderFactory.INSTANCE; + IDescriptionVersionsProvider provider = providerFactory.getProvider(m_javaProject, m_lastLoader); // not RCP project, so RCP factory returns no provider assertNull(provider); // also no versions - Assertions.assertThat(providerFactory.getVersions(m_javaProject, m_lastLoader)).isEmpty(); + assertTrue(providerFactory.getVersions(m_javaProject, m_lastLoader).isEmpty(), "Component descriptions unsupported for non-RCP classes "); } - @Disabled @Test - public void test_37() throws Exception { - parseComposite( - "// filler filler filler", - "public class Test extends Shell {", - " public Test() {", - " }", - "}"); + public void test_getDescriptionVersions() throws Exception { + parseComposite(""" + // filler filler filler + public class Test extends Shell { + public Test() { + } + }"""); // check IDescriptionVersionsProviderFactory - IDescriptionVersionsProviderFactory providerFactory = - RcpDescriptionVersionsProviderFactory.INSTANCE; - IDescriptionVersionsProvider provider = - providerFactory.getProvider(m_javaProject, m_lastLoader); + IDescriptionVersionsProviderFactory providerFactory = RcpDescriptionVersionsProviderFactory.INSTANCE; + IDescriptionVersionsProvider provider = providerFactory.getProvider(m_javaProject, m_lastLoader); // RCP class: Button { Class componentClass = m_lastLoader.loadClass("org.eclipse.swt.widgets.Button"); List versions = provider.getVersions(componentClass); - Assertions.assertThat(versions).containsExactly("3.7", "3.6", "3.5", "3.4", "3.3", "3.2"); + assertEquals(List.of("4.10", "4.9", "4.8", "4.7", "4.6", "4.5", "4.4", "4.3", "4.2", "3.8", "3.7"), versions); } // RCP class: TableViewer { Class componentClass = m_lastLoader.loadClass("org.eclipse.jface.viewers.TableViewer"); List versions = provider.getVersions(componentClass); - Assertions.assertThat(versions).containsExactly("3.7", "3.6", "3.5", "3.4", "3.3", "3.2"); + assertEquals(List.of("4.10", "4.9", "4.8", "4.7", "4.6", "4.5", "4.4", "4.3", "4.2", "3.8", "3.7"), versions); } // not RCP class { List versions = provider.getVersions(Object.class); - Assertions.assertThat(versions).isEmpty(); + assertTrue(versions.isEmpty(), "Component descriptions unsupported for non-RCP classes "); } // check versions - Assertions.assertThat(providerFactory.getVersions(m_javaProject, m_lastLoader)).contains( - entry("rcp_version", "3.7")); - Assertions.assertThat(m_lastState.getVersions()).contains(entry("rcp_version", "3.7")); + assertEquals("4.10", providerFactory.getVersions(m_javaProject, m_lastLoader).get("rcp_version")); + assertEquals("4.10", m_lastState.getVersions().get("rcp_version")); } } \ No newline at end of file