diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java index 0ca45f9ee..026d2e806 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.java @@ -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 @@ -21,7 +21,6 @@ import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.tests.designer.swing.SwingModelTest; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.util.List; @@ -200,7 +199,6 @@ public void test_delete_noDelete() throws Exception { /** * Can not delete because only one constructor in parent, so it can not be created without child. */ - @Disabled @Test public void test_delete_noDelete_withGenerics() throws Exception { setFileContentSrc( diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java index b58f5e26e..4a6124704 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.java @@ -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 @@ -30,10 +30,8 @@ import org.apache.commons.collections4.BidiMap; import org.apache.commons.collections4.bidimap.DualHashBidiMap; import org.apache.commons.collections4.bidimap.UnmodifiableBidiMap; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.text.MessageFormat; import java.util.List; /** @@ -75,7 +73,6 @@ public void test_getExpression() throws Exception { /** * Test for {@link TemplateUtils#format(String, Object...)}. */ - @Disabled @Test public void test_format() throws Exception { ContainerInfo panel = @@ -88,7 +85,7 @@ public void test_format() throws Exception { String id = ObjectInfoUtils.getId(panel); { String expected = TemplateUtils.ID_PREFIX + id + ".setEnabled(false)"; - assertEquals(expected, MessageFormat.format("{0}.setEnabled({1})", panel, "false")); + assertEquals(expected, TemplateUtils.format("{0}.setEnabled({1})", panel, "false")); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java index ec84d2d35..03f69d510 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java @@ -33,7 +33,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 java.util.concurrent.atomic.AtomicBoolean; @@ -210,8 +209,6 @@ public void accept(SWTBot bot) { * So, we detect {@link IType} presence and ask about reparse. */ @DisposeProjectAfter - // Test may get stuck on the Linux build... - @Disabled @Test public void test_createTool_inProject_butNotInClassLoader() throws Exception { JavaInfo panel = parseEmptyPanel(); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java index ac339afb3..9a8db2df3 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java @@ -24,7 +24,6 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** @@ -61,7 +60,6 @@ public void _test_exit() throws Exception { // getTooltip // //////////////////////////////////////////////////////////////////////////// - @Disabled @Test public void test_getTooltip_basic() throws Exception { TypeDeclaration typeDeclaration = createTypeDeclaration_Test(""" @@ -70,7 +68,7 @@ void test() { foo_1(); foo_2(); bar(); - new sun.awt.Mutex().lock(); + new java.util.concurrent.locks.ReentrantLock().lock(); } /** * My tooltip. diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java index 8e17b9418..509d68631 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.java @@ -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 @@ -42,7 +42,6 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; @@ -216,7 +215,6 @@ public void test_waitForAutoBuild() throws Exception { * Test for {@link ProjectUtils#ensureResourceType(IJavaProject, Bundle, String)}. */ @DisposeProjectAfter - @Disabled @Test public void test_ensureResourceType_existsButNotUpToDate() throws Exception { String managerClassName = "pkg.MyManager"; @@ -242,7 +240,7 @@ public void test_ensureResourceType_existsButNotUpToDate() throws Exception { " // recent version", " // filler filler filler", "}"); - testBundle.setFile("resources/1.5/pkg/MyManager.java", managerSource); + testBundle.setFile("resources/1.8/pkg/MyManager.java", managerSource); testBundle.install(); // do ensure ProjectUtils.ensureResourceType(m_javaProject, testBundle.getBundle(), managerClassName); @@ -268,7 +266,6 @@ public void test_ensureResourceType_existsButNotUpToDate() throws Exception { * update it in required project; not generate new copy in given {@link IJavaProject}. */ @DisposeProjectAfter - @Disabled @Test public void test_ensureResourceType_existsInDifferentProject_butNotUpToDate() throws Exception { @@ -308,7 +305,7 @@ public void test_ensureResourceType_existsInDifferentProject_butNotUpToDate() " // recent version", " // filler filler filler", "}"); - testBundle.setFile("resources/1.5/pkg/MyManager.java", managerSource); + testBundle.setFile("resources/1.8/pkg/MyManager.java", managerSource); testBundle.install(); // do ensure ProjectUtils.ensureResourceType(m_javaProject, testBundle.getBundle(), managerClassName); @@ -329,7 +326,6 @@ public void test_ensureResourceType_existsInDifferentProject_butNotUpToDate() * We should ignore {@link IType} if it is declared in binary file. */ @DisposeProjectAfter - @Disabled @Test public void test_ensureResourceType_binary() throws Exception { String managerClassName = "pkg.MyManager"; @@ -369,7 +365,7 @@ public void test_ensureResourceType_binary() throws Exception { " // filler filler filler", " public int newField;", "}"); - testBundle.setFile("resources/1.5/pkg/MyManager.java", managerSourceNew); + testBundle.setFile("resources/1.8/pkg/MyManager.java", managerSourceNew); testBundle.install(); // add "manager" IType using Jar m_testProject.addExternalJar(managerJar); @@ -397,7 +393,6 @@ public void test_ensureResourceType_binary() throws Exception { * We should not try to update {@link IType} if it is in "read-only" unit. */ @DisposeProjectAfter - @Disabled @Test public void test_ensureResourceType_readOnly() throws Exception { String managerClassName = "pkg.MyManager"; @@ -429,7 +424,7 @@ public void test_ensureResourceType_readOnly() throws Exception { " // recent version", " // filler filler filler filler filler", "}"); - testBundle.setFile("resources/1.5/pkg/MyManager.java", newSource); + testBundle.setFile("resources/1.8/pkg/MyManager.java", newSource); testBundle.install(); // do ensure, ignored because file is read-only ProjectUtils.ensureResourceType(m_javaProject, testBundle.getBundle(), managerClassName); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java index b95308c0b..f8fa02962 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.java @@ -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 @@ -22,7 +22,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** @@ -124,7 +123,6 @@ public void test_deprecated() throws Exception { assertTrue(scope.includesClasspaths()); } - @Disabled @Test public void test_otherScope() throws Exception { SubtypesScope scope2 = new SubtypesScope(javaProject.findType("java.util.List"));