Skip to content

Repair and execute disabled Core tests #1109

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

Merged
merged 1 commit into from
Jul 23, 2025
Merged

Repair and execute disabled Core tests #1109

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
4 changes: 1 addition & 3 deletions ...org/eclipse/wb/tests/designer/core/model/association/ConstructorChildAssociationTest.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 @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
7 changes: 2 additions & 5 deletions ...eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/util/TemplateUtilsTest.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 @@ -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;

/**
Expand Down Expand Up @@ -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 =
Expand All @@ -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"));
}
}

Expand Down
3 changes: 0 additions & 3 deletions ...wb.tests/src/org/eclipse/wb/tests/designer/core/palette/ChooseComponentEntryInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 1 addition & 3 deletions ...lipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/JavaDocUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -61,7 +60,6 @@ public void _test_exit() throws Exception {
// getTooltip
//
////////////////////////////////////////////////////////////////////////////
@Disabled
@Test
public void test_getTooltip_basic() throws Exception {
TypeDeclaration typeDeclaration = createTypeDeclaration_Test("""
Expand All @@ -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.
Expand Down
15 changes: 5 additions & 10 deletions ...lipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/ProjectUtilsTest.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 @@ -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;

Expand Down Expand Up @@ -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";
Expand All @@ -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);
Expand All @@ -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 {
Expand Down Expand Up @@ -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);
Expand All @@ -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";
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions ...ipse.wb.tests/src/org/eclipse/wb/tests/designer/core/util/jdt/core/SubtypesScopeTest.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 @@ -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;

/**
Expand Down Expand Up @@ -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"));
Expand Down
Loading