Added debugging and cleanup to link test

Change-Id: I0a7dc2f08267e13246637d6336af13f909bbe2b4

2 files changed, 16 insertions, 4 deletions

diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java
index 7c6b23933..1f8b09d29 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java
@@ -1953,18 +1953,22 @@ public class LinkedResourceTest extends ResourceTest {
 		if (!canCreateSymLinks())
 			return;
 		IPath baseLocation = getRandomLocation();
+		deleteOnTearDown(baseLocation);
 		IPath symlinkTarget = baseLocation.append("dir1/target");
 		symlinkTarget.toFile().mkdirs();
 		createSymLink(baseLocation.toFile(), "symlink", symlinkTarget.toOSString(), true);
-		IPath location = baseLocation.append("symlink/dir2");
-		location.toFile().mkdir();
+		IPath linkChildLocation = baseLocation.append("symlink/dir2");
+		File linkChild = linkChildLocation.toFile();
+		linkChild.mkdir();
+		assertTrue("Could not create link at location: " + linkChild, linkChild.exists());
+
 		IFolder folder = nonExistingFolderInExistingProject;
 		try {
-			folder.createLink(location, IResource.NONE, getMonitor());
+			folder.createLink(linkChildLocation, IResource.NONE, getMonitor());
 		} catch (CoreException e) {
 			fail("1.1", e);
 		}
 		// Check that the symlink is preserved.
-		assertEquals("1.2", resolve(location), folder.getLocation());
+		assertEquals("1.2", resolve(linkChildLocation), folder.getLocation());
 	}
 }
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java
index 5d33e51ce..b0c07cd93 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java
@@ -771,6 +771,14 @@ public abstract class ResourceTest extends CoreTest {
 		return store;
 	}
 
+	/**
+	 * Ensures that the file system location associated with the corresponding path is deleted during test tear down.
+	 */
+	protected void deleteOnTearDown(IPath path) {
+		storesToDelete.add(EFS.getLocalFileSystem().getStore(path));
+
+	}
+
 	public String getUniqueString() {
 		return new UniversalUniqueIdentifier().toString();
 	}