Skip to content

Bound resource deletion in tests and drop fixed auto-build delay #1649

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
ptziegler merged 1 commit into from
Sep 29, 2026
Merged

Bound resource deletion in tests and drop fixed auto-build delay #1649

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
40 changes: 19 additions & 21 deletions org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
@ExtendWith(AnnotationExtension.class)
public abstract class AbstractJavaProjectTest extends DesignerTestCase {
private static final List<IFile> m_createdResources = new ArrayList<>();
private static final long DELETE_TIMEOUT_MILLIS = 30_000;

////////////////////////////////////////////////////////////////////////////
//
Expand All @@ -71,28 +72,16 @@ public abstract class AbstractJavaProjectTest extends DesignerTestCase {
@Override
@AfterEach
public void tearDown() throws Exception {
// remove resources (with retries)
// remove resources
{
for (IFile resource : m_createdResources) {
int maxCount = 5000;
for (int i = 0; i < maxCount; i++) {
try {
// remove read-only attr, if has
if (resource.isReadOnly()) {
ResourceAttributes attributes = new ResourceAttributes();
attributes.setReadOnly(false);
resource.setResourceAttributes(attributes);
}
// do deleting
forceDeleteResource(resource);
break;
} catch (Exception e) {
if (i == maxCount - 1) {
throw e;
}
}
waitEventLoop(10);
// remove read-only attr, if has
if (resource.isReadOnly()) {
ResourceAttributes attributes = new ResourceAttributes();
attributes.setReadOnly(false);
resource.setResourceAttributes(attributes);
}
forceDeleteResource(resource);
}
m_createdResources.clear();
}
Expand Down Expand Up @@ -226,8 +215,7 @@ public static void forgetCreatedResources() {
* problems.
*/
public static void waitForAutoBuild() throws Exception {
// Wait for workspace jobs such as file creation
waitEventLoop(25);
waitEventLoop(0);
// Wait for auto-builder to handle all newly created files
TestProject.waitForAutoBuild();
// check for compilation problems
Expand Down Expand Up @@ -584,6 +572,7 @@ public static void forceDeleteResource(IResource resource) {
forceDeleteCompilationUnit(cu);
return;
}
long deadline = System.currentTimeMillis() + DELETE_TIMEOUT_MILLIS;
while (resource.exists()) {
try {
resource.refreshLocal(IResource.DEPTH_INFINITE, null);
Expand All @@ -592,6 +581,7 @@ public static void forceDeleteResource(IResource resource) {
try {
resource.delete(true, null);
} catch (Throwable e) {
failIfPastDeadline(deadline, resource, e);
waitEventLoop(100);
}
}
Expand All @@ -601,6 +591,7 @@ public static void forceDeleteResource(IResource resource) {
* Force deletes {@link ICompilationUnit}.
*/
public static void forceDeleteCompilationUnit(ICompilationUnit cu) {
long deadline = System.currentTimeMillis() + DELETE_TIMEOUT_MILLIS;
while (cu.exists()) {
try {
cu.discardWorkingCopy();
Expand All @@ -613,11 +604,18 @@ public static void forceDeleteCompilationUnit(ICompilationUnit cu) {
try {
cu.delete(true, null);
} catch (Throwable e) {
failIfPastDeadline(deadline, cu.getResource(), e);
waitEventLoop(100);
}
}
}

private static void failIfPastDeadline(long deadline, IResource resource, Throwable cause) {
if (System.currentTimeMillis() > deadline) {
throw new IllegalStateException("Could not delete " + resource.getFullPath(), cause);
}
}

////////////////////////////////////////////////////////////////////////////
//
// PNG image creation
Expand Down
Loading