Skip to content

Migrate org.eclipse.core.tests.resources to JUnit 5 #903 #2366

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
HeikoKlare merged 1 commit into from
Jan 2, 2026
Merged

Migrate org.eclipse.core.tests.resources to JUnit 5 #903 #2366

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
5 changes: 3 additions & 2 deletions ...ts/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.FileWriter;
import java.io.IOException;
Expand Down Expand Up @@ -1389,7 +1390,7 @@ public void verifyDelta(IResourceDelta delta) {
* This verifier succeeds if either all expected changes are received in a
* single delta, or if each expected change is received in a delta of its own.
*/
private class MultipleDeltasCharsetVerifier extends org.junit.Assert implements IResourceChangeListener {
private class MultipleDeltasCharsetVerifier implements IResourceChangeListener {

private final int flags;
private final CharsetVerifier singleDeltaVerifier;
Expand Down Expand Up @@ -1482,7 +1483,7 @@ void assertExpectedDeltasWereReceived() {
failMessage.append(deltaVerifier.getMessage());
failMessage.append(System.lineSeparator());
}
assertTrue(failMessage.toString(), validDeltas);
assertTrue(validDeltas, failMessage.toString());
}
}
}
Expand Down
23 changes: 14 additions & 9 deletions ...lipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.io.ByteArrayOutputStream;
import java.io.File;
Expand All @@ -49,9 +49,12 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.eclipse.core.tests.resources.util.FileStoreAutoDeleteExtension;
import org.eclipse.core.tests.resources.util.WorkspaceResetExtension;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;

/**
* Tests the following API methods:
Expand All @@ -61,12 +64,14 @@
* This test tests resource filters with projects, folders, linked resource folders,
* and moving those resources to different parents.
*/
@ExtendWith(WorkspaceResetExtension.class)
public class FilteredResourceTest {

@Rule
public WorkspaceTestRule workspaceRule = new WorkspaceTestRule();

private static final String REGEX_FILTER_PROVIDER = "org.eclipse.core.resources.regexFilterMatcher";

@RegisterExtension
private final FileStoreAutoDeleteExtension fileStoreExtension = new FileStoreAutoDeleteExtension();

protected String childName = "File.txt";
protected IProject closedProject;
protected IFile existingFileInExistingProject;
Expand Down Expand Up @@ -106,7 +111,7 @@ protected URI resolve(URI uri) {
return uri;
}

@Before
@BeforeEach
public void setUp() throws Exception {
existingProject = getWorkspace().getRoot().getProject("ExistingProject");
otherExistingProject = getWorkspace().getRoot().getProject("OtherExistingProject");
Expand All @@ -122,7 +127,7 @@ public void setUp() throws Exception {
nonExistingFileInOtherExistingProject = otherExistingProject.getFile("nonExistingFileInOtherExistingProject");
nonExistingFileInExistingFolder = existingFolderInExistingProject.getFile("nonExistingFileInExistingFolder");
localFolder = getRandomLocation();
workspaceRule.deleteOnTearDown(resolve(localFolder));
fileStoreExtension.deleteOnTearDown(resolve(localFolder));
localFile = localFolder.append(childName);
doCleanup();
}
Expand Down
2 changes: 1 addition & 1 deletion ...ests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureOutOfSync;
import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace;
import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
Expand Down
Loading
Loading