Skip to content

Log resource deltas in all of MarkerTest, cancel and join descriptions cache flush #2620

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
trancexpress merged 1 commit into from
Apr 9, 2026
+10 −2
Merged

Log resource deltas in all of MarkerTest, cancel and join descriptions cache flush #2620

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
12 changes: 10 additions & 2 deletions ...sts/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.util.Vector;
import java.util.concurrent.atomic.AtomicReference;
import org.assertj.core.api.ObjectAssert;
import org.eclipse.core.internal.resources.ContentDescriptionManager;
import org.eclipse.core.internal.resources.MarkerManager;
import org.eclipse.core.internal.resources.MarkerReader;
import org.eclipse.core.internal.resources.Resource;
Expand Down Expand Up @@ -208,6 +209,8 @@ public void setUp() throws Exception {
prefs.putBoolean(ResourcesPlugin.PREF_AUTO_REFRESH, false);
Job.getJobManager().wakeUp(ResourcesPlugin.FAMILY_AUTO_REFRESH);
Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, null);
ResourcesPlugin.getWorkspace().addResourceChangeListener(LOG_RESOURCE_DELTA);
cancelAndJoin(ContentDescriptionManager.FAMILY_DESCRIPTION_CACHE_FLUSH);
}


Expand Down Expand Up @@ -958,7 +961,6 @@ public void testMarkerDeltasMoveFolder(TestInfo testInfo) throws CoreException {
*/
@Test
public void testMarkerDeltasMoveFile(TestInfo testInfo) throws CoreException {
ResourcesPlugin.getWorkspace().addResourceChangeListener(LOG_RESOURCE_DELTA);
IWorkspaceRoot root = getWorkspace().getRoot();
final IProject project = root.getProject("MyProject");
IFolder folder = project.getFolder("folder");
Expand Down Expand Up @@ -1006,7 +1008,7 @@ public void testMarkerDeltasMoveFile(TestInfo testInfo) throws CoreException {
* Tests the appearance of marker changes in the resource delta.
*/
@Test
public void testMarkerDeltasMoveProject() throws CoreException {
public void testMarkerDeltasMoveProject() throws Exception {
// Create and register a listener.
final MarkersChangeListener listener = new MarkersChangeListener();
setResourceChangeListener(listener);
Expand Down Expand Up @@ -1036,6 +1038,7 @@ public void testMarkerDeltasMoveProject() throws CoreException {
IPath destination = IPath.fromOSString(project.getName() + "move");
project.move(destination, true, createTestMonitor());
}
cancelAndJoin(ContentDescriptionManager.FAMILY_DESCRIPTION_CACHE_FLUSH);

// verify marker deltas
IResourceVisitor visitor = resource -> {
Expand Down Expand Up @@ -1393,6 +1396,11 @@ public void testSetGetAttribute2() throws CoreException {
}
}

private static void cancelAndJoin(Object family) throws Exception {
Job.getJobManager().cancel(family);
Job.getJobManager().join(family, null);
}

private static void logDeltaEvent(IResourceChangeEvent event) {
StringBuilder s = new StringBuilder();
s.append("Logging resource change event");
Expand Down
Loading