Attachment 156217 Details for Bug 298870 – Test v01

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Test v01

298870_20100115.txt (text/plain), 24.19 KB, created by Szymon Brandys

on 2010-01-15 07:41:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Brandys

Created: 2010-01-15 07:41:22 EST

Size: 24.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.tests.resources
>Index: src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 LinkedResourceSyncMoveAndCopyTest.java
>--- src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java	14 Jan 2010 18:18:45 -0000	1.2
>+++ src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java	15 Jan 2010 12:40:41 -0000
>@@ -65,26 +65,28 @@
> 		super.tearDown();
> 	}
> 
>-	public void internalMovedAndCopyTest(IResource resource, int copyMoveFlag, boolean copyMoveSucceeds) {
>-		//		try {
>-		//			resource.copy(otherExistingProject.getFullPath().append(resource.getProjectRelativePath()), copyMoveFlag, getMonitor());
>-		//			if (!copyMoveSucceeds)
>-		//				fail("1.0");
>-		//		} catch (CoreException e) {
>-		//			if (copyMoveSucceeds)
>-		//				fail("4.99", e);
>-		//		} finally {
>-		//			if (otherExistingProject.findMember(resource.getProjectRelativePath()) != null)
>-		//				ensureDoesNotExistInWorkspace(otherExistingProject.findMember(resource.getProjectRelativePath()));
>-		//		}
>+	public void internalCopyTest(IResource resource, int copyFlag, boolean copyOk) {
>+		try {
>+			resource.copy(otherExistingProject.getFullPath().append(resource.getProjectRelativePath()), copyFlag, getMonitor());
>+			if (!copyOk)
>+				fail("1.0");
>+		} catch (CoreException e) {
>+			if (copyOk)
>+				fail("2.0", e);
>+		} finally {
>+			if (otherExistingProject.findMember(resource.getProjectRelativePath()) != null)
>+				ensureDoesNotExistInWorkspace(otherExistingProject.findMember(resource.getProjectRelativePath()));
>+		}
>+	}
> 
>+	public void internalMoveTest(IResource resource, int moveFlag, boolean moveOk) {
> 		//		try {
>-		//			resource.move(otherExistingProject.getFullPath().append(resource.getProjectRelativePath()), copyMoveFlag, getMonitor());
>-		//			if (!copyMoveSucceeds)
>+		//			resource.move(otherExistingProject.getFullPath().append(resource.getProjectRelativePath()), moveFlag, getMonitor());
>+		//			if (!moveOk)
> 		//				fail("1.0");
> 		//		} catch (CoreException e) {
>-		//			if (copyMoveSucceeds)
>-		//				fail("4.99", e);
>+		//			if (moveOk)
>+		//				fail("2.0", e);
> 		//		} finally {
> 		//			if (otherExistingProject.findMember(resource.getProjectRelativePath()) != null)
> 		//				ensureDoesNotExistInWorkspace(otherExistingProject.findMember(resource.getProjectRelativePath()));
>@@ -100,39 +102,68 @@
> 			fail("1.0", e);
> 		}
> 
>+		assertTrue("2.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>+		internalCopyTest(fileLink, IResource.NONE, false);
>+		internalMoveTest(fileLink, IResource.NONE, false);
>+	}
>+
>+	public void testFileLinkedToNonExistent_Deep2() {
>+		IFile fileLink = existingProject.getFile(getUniqueString());
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLink.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e) {
>+			fail("1.0", e);
>+		}
>+
> 		try {
> 			fileLink.setContents(new ByteArrayInputStream(getRandomString().getBytes()), IResource.NONE, getMonitor());
>-			fail("1.1");
>+			fail("2.0");
> 		} catch (CoreException e) {
> 			// should fail
>-			assertEquals("1.2", IResourceStatus.NOT_FOUND_LOCAL, e.getStatus().getCode());
>+			assertEquals("2.1", IResourceStatus.NOT_FOUND_LOCAL, e.getStatus().getCode());
> 		}
> 
>-		assertTrue("2.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(fileLink, IResource.NONE, false);
>-
> 		createFileInFileSystem(fileLocation);
> 
> 		try {
> 			fileLink.setContents(new ByteArrayInputStream(getRandomString().getBytes()), IResource.NONE, getMonitor());
>-			fail("2.1");
>+			fail("3.0");
> 		} catch (CoreException e) {
> 			// should fail
>-			assertEquals("2.2", IResourceStatus.OUT_OF_SYNC_LOCAL, e.getStatus().getCode());
>+			assertEquals("3.1", IResourceStatus.OUT_OF_SYNC_LOCAL, e.getStatus().getCode());
> 		}
> 
> 		try {
>-			assertFalse("3.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(fileLink, IResource.NONE, false);
>+			assertFalse("4.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(fileLink, IResource.NONE, false);
>+			internalMoveTest(fileLink, IResource.NONE, false);
>+		} finally {
>+			Workspace.clear(resolve(fileLocation).toFile());
>+		}
>+	}
> 
>+	public void testFileLinkedToNonExistent_Deep3() {
>+		IFile fileLink = existingProject.getFile(getUniqueString());
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLink.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e) {
>+			fail("1.0", e);
>+		}
>+
>+		createFileInFileSystem(fileLocation);
>+
>+		try {
> 			try {
> 				fileLink.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
> 			} catch (CoreException e) {
>-				fail("4.0", e);
>+				fail("2.0", e);
> 			}
> 
>-			assertTrue("5.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(fileLink, IResource.NONE, true);
>+			assertTrue("3.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(fileLink, IResource.NONE, true);
>+			internalMoveTest(fileLink, IResource.NONE, true);
> 		} finally {
> 			Workspace.clear(resolve(fileLocation).toFile());
> 		}
>@@ -148,22 +179,67 @@
> 		}
> 
> 		assertTrue("2.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(fileLink, IResource.SHALLOW, true);
>+		internalCopyTest(fileLink, IResource.SHALLOW, true);
>+		internalMoveTest(fileLink, IResource.SHALLOW, true);
>+	}
>+
>+	public void testFileLinkedToNonExistent_Shallow2() {
>+		IFile fileLink = existingProject.getFile(getUniqueString());
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLink.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e) {
>+			fail("1.0", e);
>+		}
>+
>+		try {
>+			fileLink.setContents(new ByteArrayInputStream(getRandomString().getBytes()), IResource.NONE, getMonitor());
>+			fail("2.0");
>+		} catch (CoreException e) {
>+			// should fail
>+			assertEquals("2.1", IResourceStatus.NOT_FOUND_LOCAL, e.getStatus().getCode());
>+		}
> 
> 		createFileInFileSystem(fileLocation);
> 
> 		try {
>-			assertFalse("3.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(fileLink, IResource.SHALLOW, true);
>+			fileLink.setContents(new ByteArrayInputStream(getRandomString().getBytes()), IResource.NONE, getMonitor());
>+			fail("3.0");
>+		} catch (CoreException e) {
>+			// should fail
>+			assertEquals("3.1", IResourceStatus.OUT_OF_SYNC_LOCAL, e.getStatus().getCode());
>+		}
>+
>+		try {
>+			assertFalse("4.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(fileLink, IResource.SHALLOW, true);
>+			internalMoveTest(fileLink, IResource.SHALLOW, true);
>+		} finally {
>+			Workspace.clear(resolve(fileLocation).toFile());
>+		}
>+	}
>+
>+	public void testFileLinkedToNonExistent_Shallow3() {
>+		IFile fileLink = existingProject.getFile(getUniqueString());
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLink.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e) {
>+			fail("1.0", e);
>+		}
>+
>+		createFileInFileSystem(fileLocation);
> 
>+		try {
> 			try {
> 				fileLink.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
> 			} catch (CoreException e) {
>-				fail("4.0", e);
>+				fail("2.0", e);
> 			}
> 
>-			assertTrue("5.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(fileLink, IResource.SHALLOW, true);
>+			assertTrue("3.0", fileLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(fileLink, IResource.SHALLOW, true);
>+			internalMoveTest(fileLink, IResource.SHALLOW, true);
> 		} finally {
> 			Workspace.clear(resolve(fileLocation).toFile());
> 		}
>@@ -178,29 +254,32 @@
> 			fail("1.0", e);
> 		}
> 
>-		assertTrue("3.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(folderLink, IResource.NONE, false);
>-
>-		folderLocation.toFile().mkdir();
>+		assertTrue("2.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>+		internalCopyTest(folderLink, IResource.NONE, true);
>+		internalMoveTest(folderLink, IResource.NONE, true);
>+	}
> 
>+	public void testFolderLinkedToNonExistent_Deep2() {
>+		IFolder folderLink = existingProject.getFolder(getUniqueString());
>+		IPath folderLocation = getRandomLocation();
> 		try {
>-			assertFalse("3.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folderLink, IResource.NONE, true);
>+			folderLink.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e) {
>+			fail("1.0", e);
>+		}
> 
>-			try {
>-				folderLink.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
>-			} catch (CoreException e) {
>-				fail("4.0", e);
>-			}
>+		folderLocation.toFile().mkdir();
> 
>-			assertTrue("5.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folderLink, IResource.NONE, true);
>+		try {
>+			assertFalse("2.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(folderLink, IResource.NONE, false);
>+			internalMoveTest(folderLink, IResource.NONE, false);
> 		} finally {
> 			Workspace.clear(resolve(folderLocation).toFile());
> 		}
> 	}
> 
>-	public void testFolderLinkedToNonExistent_Shallow() {
>+	public void testFolderLinkedToNonExistent_Deep3() {
> 		IFolder folderLink = existingProject.getFolder(getUniqueString());
> 		IPath folderLocation = getRandomLocation();
> 		try {
>@@ -209,114 +288,102 @@
> 			fail("1.0", e);
> 		}
> 
>-		assertTrue("2.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(folderLink, IResource.SHALLOW, true);
>-
> 		folderLocation.toFile().mkdir();
> 
> 		try {
>-			assertFalse("3.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folderLink, IResource.SHALLOW, true);
>-
> 			try {
> 				folderLink.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
> 			} catch (CoreException e) {
>-				fail("4.0", e);
>+				fail("2.0", e);
> 			}
> 
>-			assertTrue("5.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folderLink, IResource.SHALLOW, true);
>+			assertTrue("3.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(folderLink, IResource.NONE, true);
>+			internalMoveTest(folderLink, IResource.NONE, true);
> 		} finally {
> 			Workspace.clear(resolve(folderLocation).toFile());
> 		}
> 	}
> 
>-	/**
>-	 * Tests bug 299024.
>-	 */
>-	public void _testMoveFolderWithLinksToNonExisitngLocations_withShallow() {
>-		// create a folder
>-		IFolder folderWithLinks = existingProject.getFolder(getUniqueString());
>+	public void testFolderLinkedToNonExistent_Shallow() {
>+		IFolder folderLink = existingProject.getFolder(getUniqueString());
>+		IPath folderLocation = getRandomLocation();
> 		try {
>-			folderWithLinks.create(true, true, getMonitor());
>+			folderLink.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
> 		} catch (CoreException e) {
> 			fail("1.0", e);
> 		}
> 
>-		// non-exisitng location
>-		IPath fileLocation = getRandomLocation();
>+		assertTrue("2.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>+		internalCopyTest(folderLink, IResource.SHALLOW, true);
>+		internalMoveTest(folderLink, IResource.SHALLOW, true);
>+	}
> 
>-		// create a linked file in the folder
>-		IFile linkedFile = folderWithLinks.getFile(getUniqueString());
>+	public void testFolderLinkedToNonExistent_Shallow2() {
>+		IFolder folderLink = existingProject.getFolder(getUniqueString());
>+		IPath folderLocation = getRandomLocation();
> 		try {
>-			linkedFile.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+			folderLink.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
> 		} catch (CoreException e) {
>-			fail("2.0", e);
>+			fail("1.0", e);
> 		}
> 
>-		// move the folder
>-		try {
>-			folderWithLinks.move(otherExistingProject.getFolder(getUniqueString()).getFullPath(), IResource.SHALLOW, getMonitor());
>-		} catch (CoreException e) {
>-			fail("3.0", e);
>-		}
>+		folderLocation.toFile().mkdir();
> 
>-		// move the folder
> 		try {
>-			folderWithLinks.move(otherExistingProject.getFolder(getUniqueString()).getFullPath(), IResource.NONE, getMonitor());
>-			fail("3.0");
>-		} catch (CoreException e) {
>-
>+			assertFalse("2.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(folderLink, IResource.SHALLOW, true);
>+			internalMoveTest(folderLink, IResource.SHALLOW, true);
>+		} finally {
>+			Workspace.clear(resolve(folderLocation).toFile());
> 		}
>-
>-		// both the folder and link in the source project should not exist
>-		assertFalse("5.0", folderWithLinks.exists());
>-		assertFalse("6.0", linkedFile.exists());
> 	}
> 
>-	/**
>-	 * Tests bug 299024.
>-	 */
>-	public void _testCopyFolderWithLinksToNonExisitngLocations_withShallow() {
>-		// create a folder
>-		IFolder folderWithLinks = existingProject.getFolder(getUniqueString());
>+	public void testFolderLinkedToNonExistent_Shallow3() {
>+		IFolder folderLink = existingProject.getFolder(getUniqueString());
>+		IPath folderLocation = getRandomLocation();
> 		try {
>-			folderWithLinks.create(true, true, getMonitor());
>+			folderLink.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
> 		} catch (CoreException e) {
> 			fail("1.0", e);
> 		}
> 
>-		// non-exisitng location
>-		IPath fileLocation = getRandomLocation();
>+		folderLocation.toFile().mkdir();
> 
>-		// create a linked file in the folder
>-		IFile linkedFile = folderWithLinks.getFile(getUniqueString());
> 		try {
>-			linkedFile.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>-		} catch (CoreException e) {
>-			fail("2.0", e);
>-		}
>+			try {
>+				folderLink.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
>+			} catch (CoreException e) {
>+				fail("2.0", e);
>+			}
> 
>-		// copy the folder
>-		try {
>-			folderWithLinks.copy(otherExistingProject.getFolder(getUniqueString()).getFullPath(), IResource.SHALLOW, getMonitor());
>-		} catch (CoreException e) {
>-			fail("3.0", e);
>+			assertTrue("3.0", folderLink.isSynchronized(IResource.DEPTH_INFINITE));
>+			internalCopyTest(folderLink, IResource.SHALLOW, true);
>+			internalMoveTest(folderLink, IResource.SHALLOW, true);
>+		} finally {
>+			Workspace.clear(resolve(folderLocation).toFile());
> 		}
>+	}
> 
>-		try {
>-			folderWithLinks.copy(otherExistingProject.getFolder(getUniqueString()).getFullPath(), IResource.NONE, getMonitor());
>-			fail("3.0");
>-		} catch (CoreException e) {
>+	public void testFolderWithFileLinkedToNonExistent_Deep() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFile fileLinkInFolder = folder.getFile(getUniqueString());
> 
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLinkInFolder.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
> 		}
> 
>-		// both the folder and link in the source project should exist
>-		assertTrue("5.0", folderWithLinks.exists());
>-		assertTrue("6.0", linkedFile.exists());
>+		assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>+		internalCopyTest(folder, IResource.NONE, false);
>+		internalMoveTest(folder, IResource.NONE, false);
> 	}
> 
>-	public void testFolderWithFileLinkedToNonExistent_Deep() {
>+	public void testFolderWithFileLinkedToNonExistent_Deep2() {
> 		IFolder folder = existingProject.getFolder(getUniqueString());
> 		ensureExistsInWorkspace(folder, true);
> 
>@@ -326,26 +393,45 @@
> 		try {
> 			fileLinkInFolder.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
> 		} catch (CoreException e1) {
>-			fail("4.99", e1);
>+			fail("1.0", e1);
> 		}
> 
>-		assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(folder, IResource.NONE, false);
>-
> 		createFileInFileSystem(fileLocation);
> 
> 		try {
> 			assertFalse(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.NONE, false);
>+			internalCopyTest(folder, IResource.NONE, false);
>+			internalMoveTest(folder, IResource.NONE, false);
>+		} finally {
>+			Workspace.clear(resolve(fileLocation).toFile());
>+		}
>+	}
> 
>+	public void testFolderWithFileLinkedToNonExistent_Deep3() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFile fileLinkInFolder = folder.getFile(getUniqueString());
>+
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLinkInFolder.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
>+		}
>+
>+		createFileInFileSystem(fileLocation);
>+
>+		try {
> 			try {
> 				folder.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
> 			} catch (CoreException e) {
>-				fail("4.99", e);
>+				fail("2.0", e);
> 			}
> 
> 			assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.NONE, true);
>+			internalCopyTest(folder, IResource.NONE, true);
>+			internalMoveTest(folder, IResource.NONE, true);
> 		} finally {
> 			Workspace.clear(resolve(fileLocation).toFile());
> 		}
>@@ -361,26 +447,63 @@
> 		try {
> 			fileLinkInFolder.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
> 		} catch (CoreException e1) {
>-			fail("4.99", e1);
>+			fail("1.0", e1);
> 		}
> 
> 		assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(folder, IResource.SHALLOW, true);
>+		internalCopyTest(folder, IResource.SHALLOW, true);
>+		internalMoveTest(folder, IResource.SHALLOW, true);
>+	}
>+
>+	public void testFolderWithFileLinkedToNonExistent_Shallow2() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFile fileLinkInFolder = folder.getFile(getUniqueString());
>+
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLinkInFolder.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
>+		}
> 
> 		createFileInFileSystem(fileLocation);
> 
> 		try {
> 			assertFalse(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.SHALLOW, true);
>+			internalCopyTest(folder, IResource.SHALLOW, true);
>+			internalMoveTest(folder, IResource.SHALLOW, true);
>+		} finally {
>+			Workspace.clear(resolve(fileLocation).toFile());
>+		}
>+	}
>+
>+	public void testFolderWithFileLinkedToNonExistent_Shallow3() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFile fileLinkInFolder = folder.getFile(getUniqueString());
>+
>+		IPath fileLocation = getRandomLocation();
>+		try {
>+			fileLinkInFolder.createLink(fileLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
>+		}
>+
>+		createFileInFileSystem(fileLocation);
> 
>+		try {
> 			try {
> 				folder.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
> 			} catch (CoreException e) {
>-				fail("4.99", e);
>+				fail("2.0", e);
> 			}
> 
> 			assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.SHALLOW, true);
>+			internalCopyTest(folder, IResource.SHALLOW, true);
>+			internalMoveTest(folder, IResource.SHALLOW, true);
> 		} finally {
> 			Workspace.clear(resolve(fileLocation).toFile());
> 		}
>@@ -396,26 +519,63 @@
> 		try {
> 			folderLinkInFolder.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
> 		} catch (CoreException e1) {
>-			fail("4.99", e1);
>+			fail("1.0", e1);
> 		}
> 
> 		assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(folder, IResource.NONE, false);
>+		internalCopyTest(folder, IResource.NONE, true);
>+		internalMoveTest(folder, IResource.NONE, true);
>+	}
>+
>+	public void testFolderWithFolderLinkedToNonExistent_Deep2() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFolder folderLinkInFolder = folder.getFolder(getUniqueString());
>+
>+		IPath folderLocation = getRandomLocation();
>+		try {
>+			folderLinkInFolder.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
>+		}
> 
> 		folderLocation.toFile().mkdir();
> 
> 		try {
> 			assertFalse(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.NONE, true);
>+			internalCopyTest(folder, IResource.NONE, false);
>+			internalMoveTest(folder, IResource.NONE, false);
>+		} finally {
>+			Workspace.clear(resolve(folderLocation).toFile());
>+		}
>+	}
>+
>+	public void testFolderWithFolderLinkedToNonExistent_Deep3() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFolder folderLinkInFolder = folder.getFolder(getUniqueString());
>+
>+		IPath folderLocation = getRandomLocation();
>+		try {
>+			folderLinkInFolder.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
>+		}
>+
>+		folderLocation.toFile().mkdir();
> 
>+		try {
> 			try {
> 				folder.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
> 			} catch (CoreException e) {
>-				fail("4.99", e);
>+				fail("2.0", e);
> 			}
> 
> 			assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.NONE, true);
>+			internalCopyTest(folder, IResource.NONE, true);
>+			internalMoveTest(folder, IResource.NONE, true);
> 		} finally {
> 			Workspace.clear(resolve(folderLocation).toFile());
> 		}
>@@ -431,29 +591,65 @@
> 		try {
> 			folderLinkInFolder.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
> 		} catch (CoreException e1) {
>-			fail("4.99", e1);
>+			fail("1.0", e1);
> 		}
> 
> 		assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-		internalMovedAndCopyTest(folder, IResource.SHALLOW, true);
>+		internalCopyTest(folder, IResource.SHALLOW, true);
>+		internalMoveTest(folder, IResource.SHALLOW, true);
>+	}
>+
>+	public void testFolderWithFolderLinkedToNonExistent_Shallow2() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFolder folderLinkInFolder = folder.getFolder(getUniqueString());
>+
>+		IPath folderLocation = getRandomLocation();
>+		try {
>+			folderLinkInFolder.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
>+		}
> 
> 		folderLocation.toFile().mkdir();
> 
> 		try {
> 			assertFalse(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.SHALLOW, true);
>+			internalCopyTest(folder, IResource.SHALLOW, true);
>+			internalMoveTest(folder, IResource.SHALLOW, true);
>+		} finally {
>+			Workspace.clear(resolve(folderLocation).toFile());
>+		}
>+	}
>+
>+	public void testFolderWithFolderLinkedToNonExistent_Shallow3() {
>+		IFolder folder = existingProject.getFolder(getUniqueString());
>+		ensureExistsInWorkspace(folder, true);
>+
>+		IFolder folderLinkInFolder = folder.getFolder(getUniqueString());
>+
>+		IPath folderLocation = getRandomLocation();
>+		try {
>+			folderLinkInFolder.createLink(folderLocation, IResource.ALLOW_MISSING_LOCAL, getMonitor());
>+		} catch (CoreException e1) {
>+			fail("1.0", e1);
>+		}
> 
>+		folderLocation.toFile().mkdir();
>+
>+		try {
> 			try {
> 				folder.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
> 			} catch (CoreException e) {
>-				fail("4.99", e);
>+				fail("2.0", e);
> 			}
> 
> 			assertTrue(folder.isSynchronized(IResource.DEPTH_INFINITE));
>-			internalMovedAndCopyTest(folder, IResource.SHALLOW, true);
>+			internalCopyTest(folder, IResource.SHALLOW, true);
>+			internalMoveTest(folder, IResource.SHALLOW, true);
> 		} finally {
> 			Workspace.clear(resolve(folderLocation).toFile());
> 		}
> 	}
>-
> }

Actions: View | Diff

Attachments on bug 298870: 156217 | 209908