Skip to content

Commit 157e7ed

Browse files
committed
Wait for refresh job at FileBufferFunctions.tearDown()
FileBuffersForFilesInLinkedFolders.test16_3() fails infrequently during CI jobs, the fail indicates a missing resource delta notification. RefreshJob is triggered during file buffer operations in test2 and test6, and can notify test listeners of deltas. To avoid this potential problem, this change adds a wait for the refresh family at: tearDown() See: #2528
1 parent 04a5221 commit 157e7ed

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@
3737
import org.eclipse.core.filesystem.IFileStore;
3838

3939
import org.eclipse.core.runtime.IPath;
40+
import org.eclipse.core.runtime.jobs.Job;
4041

4142
import org.eclipse.core.resources.IProject;
43+
import org.eclipse.core.resources.ResourcesPlugin;
4244

4345
import org.eclipse.core.filebuffers.FileBuffers;
4446
import org.eclipse.core.filebuffers.IFileBuffer;
@@ -89,10 +91,11 @@ protected IProject getProject() {
8991
}
9092

9193
@AfterEach
92-
public void tearDown() {
94+
public void tearDown() throws Exception {
9395
ITextFileBuffer buffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
9496
assertNull(buffer);
9597
ResourceHelper.deleteProject("project");
98+
Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, null);
9699
}
97100

98101
protected IPath getPath() {

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForExternalFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class FileBuffersForExternalFiles extends FileBufferFunctions {
3737

3838
@Override
3939
@AfterEach
40-
public void tearDown() {
40+
public void tearDown() throws Exception {
4141
FileTool.delete(getPath());
4242
FileTool.delete(FileBuffers.getSystemFileAtLocation(getPath()).getParentFile());
4343
super.tearDown();

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions {
4747

4848
@Override
4949
@AfterEach
50-
public void tearDown() {
50+
public void tearDown() throws Exception {
5151
FileTool.delete(getPath());
5252
File file= fExternalFile;
5353
FileTool.delete(file); // externalResources/linkedFolderTarget/FileInLinkedFolder

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class FileBuffersForLinkedFiles extends FileBufferFunctions {
4141

4242
@Override
4343
@AfterEach
44-
public void tearDown() {
44+
public void tearDown() throws Exception {
4545
FileTool.delete(fExternalFile);
4646
FileTool.delete(fExternalFile.getParentFile());
4747
super.tearDown();

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonAccessibleWorkspaceFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected IPath createPath(IProject project) throws Exception {
5454

5555
@Override
5656
@AfterEach
57-
public void tearDown() {
57+
public void tearDown() throws Exception {
5858
FileTool.delete(getPath());
5959
super.tearDown();
6060
}

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingExternalFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class FileBuffersForNonExistingExternalFiles extends FileBufferFunctions
3535

3636
@Override
3737
@AfterEach
38-
public void tearDown() {
38+
public void tearDown() throws Exception {
3939
FileTool.delete(getPath());
4040
super.tearDown();
4141
}

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingWorkspaceFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class FileBuffersForNonExistingWorkspaceFiles extends FileBufferFunctions
4444

4545
@Override
4646
@AfterEach
47-
public void tearDown() {
47+
public void tearDown() throws Exception {
4848
FileTool.delete(getPath());
4949
super.tearDown();
5050
}

0 commit comments

Comments
 (0)