Remove JUnit 3 fail operations from ResourceTest

Replaces fail(String, Throwable) operations in ResourceTest utility
methods by rethrowing the exception in order to separate those methods
to a utility class and prepare for a migration to JUnit 4/5.

Author: HeikoKlare

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java

@@ -19,6 +19,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -834,7 +835,7 @@ public void testForgetLastBuiltState() throws CoreException {
 	 * Tests that a client invoking a manual incremental build before autobuild has had
 	 * a chance to run will block until the build completes. See bug 275879.
 	 */
-	public void testIncrementalBuildBeforeAutobuild() throws CoreException {
+	public void testIncrementalBuildBeforeAutobuild() throws Exception {
 		// Create some resource handles
 		final IProject project = getWorkspace().getRoot().getProject("PROJECT");
 		final IFile input = project.getFolder(SortBuilder.DEFAULT_UNSORTED_FOLDER).getFile("File.txt");
@@ -856,11 +857,19 @@ public void testIncrementalBuildBeforeAutobuild() throws CoreException {
 
 		//change the file and then immediately perform build
 		final ByteArrayOutputStream out = new ByteArrayOutputStream();
+		AtomicReference<IOException> exception = new AtomicReference<>();
 		getWorkspace().run((IWorkspaceRunnable) monitor -> {
 			input.setContents(new ByteArrayInputStream(new byte[] { 5, 4, 3, 2, 1 }), IResource.NONE, getMonitor());
 			project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, getMonitor());
-			transferStreams(output.getContents(), out, null);
+			try {
+				transferStreams(output.getContents(), out, null);
+			} catch (IOException e) {
+				exception.set(e);
+			}
 		}, getMonitor());
+		if (exception.get() != null) {
+			throw exception.get();
+		}
 
 		byte[] result = out.toByteArray();
 		byte[] expected = new byte[] {1, 2, 3, 4, 5};

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java

@@ -305,13 +305,18 @@ public void testBuilderDeltaUsingRelaxedRuleBug343256() throws Throwable {
 		project.build(IncrementalProjectBuilder.FULL_BUILD, getMonitor());
 
 		final TestBarrier2 tb = new TestBarrier2(TestBarrier2.STATUS_WAIT_FOR_START);
-		AtomicReference<Throwable> error = new AtomicReference<>();
+		AtomicReference<Throwable> errorInBuildTriggeringJob = new AtomicReference<>();
+		AtomicReference<Throwable> errorInWorkspaceChangingJob = new AtomicReference<>();
 
 		Job workspaceChangingJob = new Job("Workspace Changing Job") {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				tb.setStatus(TestBarrier2.STATUS_WAIT_FOR_RUN);
-				ensureExistsInWorkspace(foo, new ByteArrayInputStream(new byte[0]));
+				try {
+					ensureExistsInWorkspace(foo, new ByteArrayInputStream(new byte[0]));
+				} catch (CoreException e) {
+					errorInWorkspaceChangingJob.set(e);
+				}
 				return Status.OK_STATUS;
 			}
 		};
@@ -326,9 +331,9 @@ protected IStatus run(IProgressMonitor monitor) {
 					IStatus status = e.getStatus();
 					IStatus[] children = status.getChildren();
 					if (children.length > 0) {
-						error.set(children[0].getException());
+						errorInBuildTriggeringJob.set(children[0].getException());
 					} else {
-						error.set(e);
+						errorInBuildTriggeringJob.set(e);
 					}
 				}
 				return Status.OK_STATUS;
@@ -403,8 +408,11 @@ public IProject[] build(int kind, Map<String, String> args, IProgressMonitor mon
 
 		workspaceChangingJob.join(timeout, null);
 		buildTriggeringJob.join(timeout, null);
-		if (error.get() != null) {
-			throw error.get();
+		if (errorInBuildTriggeringJob.get() != null) {
+			throw errorInBuildTriggeringJob.get();
+		}
+		if (errorInWorkspaceChangingJob.get() != null) {
+			throw errorInWorkspaceChangingJob.get();
 		}
 		tb.waitForStatus(TestBarrier2.STATUS_DONE);
 		errorLogging.assertNoErrorsLogged();

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java

@@ -320,7 +320,7 @@ public void testWriteDeletedFile() throws CoreException {
 	}
 
 	@Test
-	public void testWriteFileNotInWorkspace() {
+	public void testWriteFileNotInWorkspace() throws CoreException {
 		// Bug 571133
 		IProject project = projects[0];
 		IFile file = project.getFile("testWriteFile2");

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java

@@ -296,7 +296,7 @@ public void testAddStateAndPolicies() throws Exception {
 		assertEquals("3.5", 0, states.length);
 	}
 
-	public void testBug28238() {
+	public void testBug28238() throws CoreException {
 		// paths to mimic files in the workspace
 		IProject project = getWorkspace().getRoot().getProject("myproject28238");
 		IFolder folder = project.getFolder("myfolder");

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/LocalSyncTest.java

@@ -40,7 +40,7 @@ private boolean existsInFileSystemWithNoContent(IResource resource) {
 		return path.toFile().exists() && path.toFile().length() == 0;
 	}
 
-	public void testProjectDeletion() {
+	public void testProjectDeletion() throws CoreException {
 		/* initialize common objects */
 		Project project = (Project) projects[0];
 

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java

@@ -160,7 +160,7 @@ public void testConcurrentAccess() {
 	 * Tests concurrent access to the property store while the project is being
 	 * deleted.
 	 */
-	public void testConcurrentDelete() {
+	public void testConcurrentDelete() throws CoreException {
 		Thread[] threads;
 		final IFile target = projects[0].getFile("target");
 		final int REPEAT = 8;
@@ -403,7 +403,7 @@ public void testDeleteProperties() throws Throwable {
 	/**
 	 * See bug 93849.
 	 */
-	public void testFileRename() {
+	public void testFileRename() throws CoreException {
 		IWorkspaceRoot root = getWorkspace().getRoot();
 		IProject project = root.getProject("proj");
 		IFolder folder = project.getFolder("folder");
@@ -442,7 +442,7 @@ public void testFileRename() {
 	/**
 	 * See bug 93849.
 	 */
-	public void testFolderRename() {
+	public void testFolderRename() throws CoreException {
 		IWorkspaceRoot root = getWorkspace().getRoot();
 		IProject project = root.getProject("proj");
 		IFolder folder1a = project.getFolder("folder1");
@@ -515,7 +515,7 @@ public void testLargeProperty() {
 	/**
 	 * See bug 93849.
 	 */
-	public void testProjectRename() {
+	public void testProjectRename() throws CoreException {
 		IWorkspaceRoot root = getWorkspace().getRoot();
 		IProject project1a = root.getProject("proj1");
 		ensureExistsInWorkspace(project1a, true);

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java

@@ -220,7 +220,7 @@ public void testComputeProjectOrder() throws CoreException {
 		assertFalse("No cycles", projectOrder.hasCycles);
 	}
 
-	public void testBug543776() throws CoreException {
+	public void testBug543776() throws Exception {
 		IFile projectFile = project0.getFile(IProjectDescription.DESCRIPTION_FILE_NAME);
 		String projectDescription = readStringInFileSystem(projectFile);
 		projectDescription = projectDescription.replace(PROJECT_0_NAME, "anotherName");

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java

@@ -112,7 +112,7 @@ public void preferenceChange(PreferenceChangeEvent event) {
 		}
 	}
 
-	public void testSimple() {
+	public void testSimple() throws CoreException {
 		IProject project = getProject("foo");
 		String qualifier = "org.eclipse.core.tests.resources";
 		String key = "key" + getUniqueString();

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java

@@ -142,7 +142,7 @@ public void generateInterestingFiles(IContainer container) {
 	 * Returns some interesting files.  These files are created
 	 * during setup.
 	 */
-	public IFile[] interestingFiles() {
+	public IFile[] interestingFiles() throws CoreException {
 		refreshFiles();
 		IFile[] result = new IFile[allFiles.size()];
 		allFiles.toArray(result);
@@ -207,7 +207,7 @@ public boolean outOfSync(IFile file) {
 	/**
 	 * Makes sure file requirements are met (out of sync, workspace only, etc).
 	 */
-	public void refreshFile(IFile file) {
+	public void refreshFile(IFile file) throws CoreException {
 		if (file.getName().equals(LOCAL_ONLY)) {
 			ensureDoesNotExistInWorkspace(file);
 			//project must exist to access file system store.
@@ -243,7 +243,7 @@ public void refreshFile(IFile file) {
 	/**
 	 * Makes sure file requirements are met (out of sync, workspace only, etc).
 	 */
-	public void refreshFiles() {
+	public void refreshFiles() throws CoreException {
 		for (IFile file : allFiles) {
 			refreshFile(file);
 		}
@@ -360,7 +360,7 @@ public void testCreate() throws Exception {
 		Object[][] inputs = new Object[][] {interestingFiles(), interestingStreams(), TRUE_AND_FALSE, PROGRESS_MONITORS};
 		new TestPerformer("IFileTest.testCreate") {
 			@Override
-			public void cleanUp(Object[] args, int count) {
+			public void cleanUp(Object[] args, int count) throws CoreException {
 				IFile file = (IFile) args[0];
 				refreshFile(file);
 			}
@@ -597,7 +597,7 @@ public int read() throws IOException {
 	}
 
 	@Test
-	public void testFileCreation_Bug107188() {
+	public void testFileCreation_Bug107188() throws CoreException {
 		//create from stream that is canceled
 		IFile target = projects[0].getFile("file1");
 		ensureDoesNotExistInWorkspace(target);
@@ -718,7 +718,7 @@ public void testGetContents() throws Exception {
 		Object[][] inputs = new Object[][] {interestingFiles()};
 		new TestPerformer("IFileTest.testGetContents") {
 			@Override
-			public void cleanUp(Object[] args, int count) {
+			public void cleanUp(Object[] args, int count) throws CoreException {
 				IFile file = (IFile) args[0];
 				refreshFile(file);
 			}
@@ -860,7 +860,7 @@ public void testSetContents1() throws Exception {
 		Object[][] inputs = new Object[][] {interestingFiles(), interestingStreams(), TRUE_AND_FALSE, PROGRESS_MONITORS};
 		new TestPerformer("IFileTest.testSetContents1") {
 			@Override
-			public void cleanUp(Object[] args, int count) {
+			public void cleanUp(Object[] args, int count) throws CoreException {
 				IFile file = (IFile) args[0];
 				refreshFile(file);
 			}

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java

@@ -57,7 +57,7 @@ public void testChangeCase() throws CoreException {
 		assertExistsInWorkspace("1.1", afterFile);
 	}
 
-	public void testCopyMissingFolder() {
+	public void testCopyMissingFolder() throws CoreException {
 		//tests copying a folder that is missing from the file system
 		IProject project = getWorkspace().getRoot().getProject("Project");
 		IFolder before = project.getFolder("OldFolder");