31895: [CVS Core] RepositoryManager is grab bag, needs refactoringRoot_branch_20040329_DateTag

9 files changed, 59 insertions, 70 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index a5a638414..07e7b8c2b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -90,10 +90,11 @@ public class EclipseTest extends EclipseWorkspaceTest {
 		return newResources;
 	}
 	
-	protected void addResources(IResource[] newResources) throws TeamException, CoreException {
+	protected void addResources(IResource[] newResources) throws CoreException {
 		if (newResources.length == 0) return;
-		getProvider(newResources[0]).add(newResources, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		executeHeadless(new AddOperation(null, newResources));
 	}
+	
 	/**
 	 * Perform a CVS edit of the given resources
 	 */
@@ -176,9 +177,17 @@ public class EclipseTest extends EclipseWorkspaceTest {
 		return resources;
 	}
 	
+	/**
+	 * Delete the resources and mark them as outgoing deletions.
+	 * Deleting the resources is enough since the move/delete hook will
+	 * tak care of making them outgoing deletions.
+	 */
 	protected void deleteResources(IResource[] resources) throws TeamException, CoreException {
 		if (resources.length == 0) return;
-		getProvider(resources[0]).delete(resources, DEFAULT_MONITOR);
+		for (int i = 0; i < resources.length; i++) {
+			IResource resource = resources[i];
+			resource.delete(false, DEFAULT_MONITOR);
+		}
 	}
 	/**
 	 * Unmanage the resources
@@ -201,8 +210,8 @@ public class EclipseTest extends EclipseWorkspaceTest {
 		LocalOption[] options = Command.NO_LOCAL_OPTIONS;
 		if(ignoreLocalChanges) {
 			options = new LocalOption[] {Update.IGNORE_LOCAL_CHANGES};
-		}	
-		getProvider(container).update(resources, options, null, true /*createBackups*/, DEFAULT_MONITOR);
+		}
+		executeHeadless(new UpdateOperation(null, resources, options, null));
 		return resources;
 	}
 	
@@ -222,7 +231,7 @@ public class EclipseTest extends EclipseWorkspaceTest {
 		if(ignoreLocalChanges) {
 			options = new LocalOption[] {Update.IGNORE_LOCAL_CHANGES};
 		}
-		getProvider(project).update(new IResource[] {project}, options, tag, true /*createBackups*/, DEFAULT_MONITOR);
+		executeHeadless(new UpdateOperation(null, new IResource[] {project}, options, tag));
 	}
 	
 	public void commitProject(IProject project) throws TeamException, CoreException {
@@ -247,7 +256,7 @@ public class EclipseTest extends EclipseWorkspaceTest {
 	 */
 	protected void commitResources(IResource[] resources, int depth) throws TeamException, CoreException {
 		if (resources.length == 0) return;
-		getProvider(resources[0]).checkin(resources, depth, DEFAULT_MONITOR);
+		executeHeadless(new CommitOperation(null, resources, new Command.LocalOption[] { Commit.makeArgumentOption(Command.MESSAGE_OPTION, "") }));
 	}
 	/**
 	 * Commit the resources from an existing container to the CVS repository
@@ -705,8 +714,8 @@ public class EclipseTest extends EclipseWorkspaceTest {
 				resourcesToAdd.add(members[i]);
 			}
 		}
-		getProvider(project).add((IResource[]) resourcesToAdd.toArray(new IResource[resourcesToAdd.size()]), IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
-		getProvider(project).checkin(new IResource[] {project}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		addResources((IResource[]) resourcesToAdd.toArray(new IResource[resourcesToAdd.size()]));
+		commitResources(new IResource[] {project}, IResource.DEPTH_INFINITE);
 		// Pause to ensure that future operations happen later than timestamp of committed resources
 		waitMsec(1500);
 	}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
index 31c55b716..9b02b246b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
@@ -101,11 +101,11 @@ public class CVSProviderTest extends EclipseTest {
 		// Perform some operations on the project
 		IResource[] newResources = buildResources(project, new String[] { "added.txt", "folder2/", "folder2/added.txt" }, false);
 		setContentsAndEnsureModified(project.getFile("changed.txt"));
-		getProvider(project).add(newResources, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
-		getProvider(project).delete(new IResource[] {project.getFile("deleted.txt")}, DEFAULT_MONITOR);
+		addResources(newResources);
+		deleteResources(new IResource[] {project.getFile("deleted.txt")});
 		assertIsModified("testDeepCheckin: ", newResources);
 		assertIsModified("testDeepCheckin: ", new IResource[] {project.getFile("deleted.txt"), project.getFile("changed.txt")});
-		getProvider(project).checkin(new IResource[] {project}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		commitResources(new IResource[] {project}, IResource.DEPTH_INFINITE);
 		assertLocalStateEqualsRemote(project);
 	}
 	
@@ -138,11 +138,11 @@ public class CVSProviderTest extends EclipseTest {
 		// Perform some operations on the copy
 		addResources(copy, new String[] { "added.txt", "folder2/", "folder2/added.txt" }, false);
 		setContentsAndEnsureModified(copy.getFile("changed.txt"));
-		getProvider(copy).delete(new IResource[] {copy.getFile("deleted.txt")}, DEFAULT_MONITOR);
+		deleteResources(new IResource[] {copy.getFile("deleted.txt")});
 		
 		// Commit the copy and update the project
-		getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
-		getProvider(project).update(new IResource[] {project}, Command.NO_LOCAL_OPTIONS, null, true /*createBackups*/, DEFAULT_MONITOR);
+		commitResources(new IResource[] {copy}, IResource.DEPTH_INFINITE);
+		updateProject(project, null, false);
 		assertEquals(project, copy);
 	}
 	
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
index fc73b503a..cc5c7c8e3 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
@@ -12,32 +12,15 @@ package org.eclipse.team.tests.ccvs.core.provider;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.*;
 import org.eclipse.team.core.TeamException;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.core.ICVSFile;
-import org.eclipse.team.internal.ccvs.core.ICVSFolder;
-import org.eclipse.team.internal.ccvs.core.ICVSResource;
-import org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor;
-import org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener;
-import org.eclipse.team.internal.ccvs.core.client.Command;
-import org.eclipse.team.internal.ccvs.core.client.Update;
+import org.eclipse.team.internal.ccvs.core.*;
 import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
 import org.eclipse.team.internal.ccvs.core.util.ResourceStateChangeListeners;
 import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
@@ -280,7 +263,7 @@ public class IsModifiedTests extends EclipseTest {
 		// create, add and commit a file
 		IResource[] addedResources = buildResources(project, new String[] {"folder1/added.txt"}, false);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/added.txt"}, true);
-		getProvider(project).add(addedResources, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(addedResources);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/added.txt"}, true);
 		commitResources(project, new String[] {"folder1/added.txt"});
 		assertModificationState(project, null, true);
@@ -299,7 +282,7 @@ public class IsModifiedTests extends EclipseTest {
 		assertModificationState(project, new String[] {".", "ignored.txt"}, true);
 		project.getFile(".cvsignore").create(new ByteArrayInputStream("ignored.txt".getBytes()), false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", ".cvsignore"}, true);
-		getProvider(project).add(new IResource[] {project.getFile(".cvsignore")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile(".cvsignore")});
 		assertModificationState(project, new String[] {".", ".cvsignore"}, true);
 		commitResources(project, new String[] {".cvsignore"});
 		assertModificationState(project, null, true);
@@ -310,7 +293,7 @@ public class IsModifiedTests extends EclipseTest {
 		assertModificationState(project, new String[] {".", "ignored.txt"}, true);
 		// re-add the ignore and then delete the ignored
 		project.getFile(".cvsignore").create(new ByteArrayInputStream("ignored.txt".getBytes()), false, DEFAULT_MONITOR);
-		getProvider(project).add(new IResource[] {project.getFile(".cvsignore")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile(".cvsignore")});
 		assertModificationState(project, new String[] {".", ".cvsignore"}, true);
 		commitResources(project, new String[] {".cvsignore"});
 		assertModificationState(project, null, true);
@@ -319,7 +302,7 @@ public class IsModifiedTests extends EclipseTest {
 		// add the ignored file to version control
 		buildResources(project, new String[] {"ignored.txt"}, false);
 		assertModificationState(project, null, true);
-		getProvider(project).add(new IResource[] {project.getFile("ignored.txt")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile("ignored.txt")});
 		assertModificationState(project, new String[] {".", "ignored.txt"}, true);
 		commitProject(project);
 		assertModificationState(project, null, true);
@@ -338,7 +321,7 @@ public class IsModifiedTests extends EclipseTest {
 		project.getFile("folder2/a.txt").copy(project.getFile("folder1/a.txt").getFullPath(), false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/a.txt", "folder2/", "folder2/a.txt"}, true);
 		// add the source, delete the destination and commit
-		getProvider(project).add(new IResource[] {project.getFile("folder1/a.txt")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile("folder1/a.txt")});
 		project.getFile("folder2/a.txt").delete(false, DEFAULT_MONITOR);
 		commitProject(project);
 		assertModificationState(project, null, true);
@@ -348,7 +331,7 @@ public class IsModifiedTests extends EclipseTest {
 		// copy the destination back to the source
 		project.getFile("folder2/a.txt").copy(project.getFile("folder1/a.txt").getFullPath(), false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder2/", "folder2/a.txt"}, true);
-		getProvider(project).add(new IResource[] {project.getFile("folder2/a.txt")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile("folder2/a.txt")});
 		commitProject(project);
 		assertModificationState(project, null, true);
 	}
@@ -358,7 +341,7 @@ public class IsModifiedTests extends EclipseTest {
 		// create a folder
 		project.getFolder("folder1/folder2").create(false, true, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/folder2/"}, true);
-		getProvider(project).add(new IResource[] {project.getFolder("folder1/folder2/")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFolder("folder1/folder2/")});
 		assertModificationState(project, null, true);
 		
 		// create a folder
@@ -382,9 +365,9 @@ public class IsModifiedTests extends EclipseTest {
 			"folder1/folder2/folder3/add1.txt",
 			"folder1/folder2/folder3/folder4/"}, true);
 		// add to version control
-		getProvider(project).add(new IResource[] {
+		addResources(new IResource[] {
 			project.getFile("folder1/folder2/folder3/add1.txt"),
-			project.getFolder("folder1/folder2/folder3/folder4/")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+			project.getFolder("folder1/folder2/folder3/folder4/")});
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/folder2/", "folder1/folder2/folder3",
 			"folder1/folder2/folder3/add1.txt"}, true);
 		// commit
@@ -400,7 +383,7 @@ public class IsModifiedTests extends EclipseTest {
 		// ignore the folder
 		project.getFile("folder1/.cvsignore").create(new ByteArrayInputStream("ignored".getBytes()), false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/.cvsignore"}, true);
-		getProvider(project).add(new IResource[] {project.getFile("folder1/.cvsignore")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile("folder1/.cvsignore")});
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/.cvsignore"}, true);
 		commitResources(project, new String[] {"folder1/.cvsignore"});
 		assertModificationState(project, null, true);
@@ -412,7 +395,7 @@ public class IsModifiedTests extends EclipseTest {
 		// re-add the .cvsignore and then delete the ignored
 		project.getFile("folder1/.cvsignore").create(new ByteArrayInputStream("ignored".getBytes()), false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/.cvsignore"}, true);
-		getProvider(project).add(new IResource[] {project.getFile("folder1/.cvsignore")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile("folder1/.cvsignore")});
 		commitResources(project, new String[] {"folder1/.cvsignore"});
 		assertModificationState(project, null, true);
 		project.getFolder("folder/ignored").delete(false, DEFAULT_MONITOR);
@@ -420,7 +403,7 @@ public class IsModifiedTests extends EclipseTest {
 		// add the ignored file to version control
 		buildResources(project, new String[] {"folder1/ignored/file.txt"}, false);
 		assertModificationState(project, null, true);
-		getProvider(project).add(new IResource[] {project.getFile("folder1/ignored/file.txt")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile("folder1/ignored/file.txt")});
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/ignored/", "folder1/ignored/file.txt"}, true);
 		commitProject(project);
 		assertModificationState(project, null, true);
@@ -474,7 +457,7 @@ public class IsModifiedTests extends EclipseTest {
 		project.getFolder("folder2/folder3/").copy(project.getFolder("folder1/folder3").getFullPath(), false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/folder3", "folder1/folder3/file.txt", "folder2/", "folder2/folder3/", "folder2/folder3/file.txt"}, true);
 		// add the source, delete the destination and commit
-		getProvider(project).add(new IResource[] {project.getFile("folder1/folder3/file.txt")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile("folder1/folder3/file.txt")});
 		project.getFolder("folder2/folder3").delete(false, DEFAULT_MONITOR);
 		commitProject(project);
 		assertModificationState(project, null, true);
@@ -484,7 +467,7 @@ public class IsModifiedTests extends EclipseTest {
 		// copy the destination back to the source
 		project.getFolder("folder2/folder3/").copy(project.getFolder("folder1/folder3").getFullPath(), false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder2/", "folder2/folder3/", "folder2/folder3/file.txt"}, true);
-		getProvider(project).add(new IResource[] {project.getFolder("folder2/folder3/")}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFolder("folder2/folder3/")});
 		commitProject(project);
 		assertModificationState(project, null, true);
 	}
@@ -501,14 +484,14 @@ public class IsModifiedTests extends EclipseTest {
 		addResources(copy, new String[] { "added.txt", "folder2/", "folder2/added.txt" }, false);
 		setContentsAndEnsureModified(copy.getFile("changed.txt"));
 		setContentsAndEnsureModified(copy.getFile("merged.txt"));
-		getProvider(copy).delete(new IResource[] {copy.getFile("deleted.txt")}, DEFAULT_MONITOR);
+		deleteResources(new IResource[] {copy.getFile("deleted.txt")});
 		assertModificationState(copy, new String[] {".", "added.txt", "folder2/", "folder2/added.txt", "changed.txt", "merged.txt", "deleted.txt"}, true);
-		getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		commitResources(new IResource[] {copy}, IResource.DEPTH_INFINITE);
 		assertModificationState(copy, null, true);
 		
 		// update the project and check status
 		setContentsAndEnsureModified(project.getFile("merged.txt"));
-		getProvider(project).update(new IResource[] {project}, Command.NO_LOCAL_OPTIONS, null, true /*createBackups*/, DEFAULT_MONITOR);
+		updateProject(project, null, false);
 		assertModificationState(project, new String[] {".", "merged.txt"}, true);
 		// can't commit because of merge
 		// commitProject(project);
@@ -524,7 +507,7 @@ public class IsModifiedTests extends EclipseTest {
 		assertModificationState(project, new String[] {".", "changed.txt"}, true);
 		
 		// peform un update -C
-		getProvider(project).update(new IResource[] {project}, new Command.LocalOption[] {Update.IGNORE_LOCAL_CHANGES}, null, true /*createBackups*/, DEFAULT_MONITOR);
+		updateProject(project, null, true /* ignore local changes */);
 		assertModificationState(project, null, true);
 	}
 	
@@ -543,7 +526,7 @@ public class IsModifiedTests extends EclipseTest {
 		// Create a project and add a .cvsignore to it
 		IProject project = createProject("testIgnoredAfterCheckout", new String[] { ".changed.txt", "deleted.txt", "folder1/", "folder1/a.txt", "folder1/folder2/b.txt"});
 		project.getFile(".cvsignore").create(new ByteArrayInputStream("ignored".getBytes()), false, DEFAULT_MONITOR);
-		getProvider(project).add(new IResource[] {project.getFile(".cvsignore")}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {project.getFile(".cvsignore")});
 		commitProject(project);
 		assertModificationState(project, null, true);
 		project.getFolder("ignored").create(false, true, DEFAULT_MONITOR);
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java
index 7c5d3572b..7a9964e9e 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java
@@ -125,7 +125,7 @@ public class ModuleTest extends EclipseTest {
 		ICVSFolder parent = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(project);
 		ICVSResource vcmmeta = CVSWorkspaceRoot.getCVSResourceFor(project.getFile(".vcm_meta"));
 		if ( ! vcmmeta.isManaged() && ! parent.getFolderSyncInfo().getIsStatic()) {
-			getProvider(project).add(new IResource[] {project.getFile(".vcm_meta")}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+			addResources(new IResource[] {project.getFile(".vcm_meta")});
 			waitMsec(1000);
 			commitProject(project);
 		}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java
index 425187f62..ed7bd96eb 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java
@@ -69,9 +69,9 @@ public class RemoteResourceTest extends EclipseTest {
 		IResource[] newResources = buildResources(copy, new String[] { "added.txt", "folder2/", "folder2/added.txt" }, false);
 		setContentsAndEnsureModified(copy.getFile("changed.txt"));
 		CVSTeamProvider provider = getProvider(copy);
-		provider.add(newResources, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
-		provider.delete(new IResource[] {copy.getFile("deleted.txt")}, DEFAULT_MONITOR);
-		provider.checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		addResources(newResources);
+		deleteResources(new IResource[] {copy.getFile("deleted.txt")});
+		commitResources(new IResource[] {copy}, IResource.DEPTH_INFINITE);
 		
 		// Build the remote tree from the original and ensure it matches the copy
 		RemoteFolderTree tree = RemoteFolderTreeBuilder.buildRemoteTree(getRepository(), project, CVSTag.DEFAULT, DEFAULT_MONITOR);
@@ -114,7 +114,7 @@ public class RemoteResourceTest extends EclipseTest {
 		// Checkout and modify a copy
 		IProject copy = checkoutCopy(project, "-copy");
 		addResources(copy, new String[] { "folder2/folder3/b.txt" }, false);
-		getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		commitResources(new IResource[] {copy}, IResource.DEPTH_INFINITE);
 
 		// Build the remote tree from the project
 		RemoteFolderTree tree = RemoteFolderTreeBuilder.buildRemoteTree(getRepository(), project, CVSTag.DEFAULT, DEFAULT_MONITOR);
@@ -136,8 +136,8 @@ public class RemoteResourceTest extends EclipseTest {
 		IProject copy = checkoutCopy(project, "-copy");
 		setContentsAndEnsureModified(copy.getFile("folder2/folder3/c.txt"));
 		addResources(copy, new String[] { "folder2/folder3/add.txt" }, false);
-		getProvider(copy).delete(new IResource[] {copy.getFile("folder2/folder3/b.txt")}, DEFAULT_MONITOR);
-		getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		deleteResources(new IResource[] {copy.getFile("folder2/folder3/b.txt")});
+		commitResources(new IResource[] {copy}, IResource.DEPTH_INFINITE);
 
 		// Build the remote tree from the project
 		RemoteFolderTree tree = RemoteFolderTreeBuilder.buildRemoteTree(getRepository(), project.getFolder("folder2"), CVSTag.DEFAULT, DEFAULT_MONITOR);
@@ -174,7 +174,7 @@ public class RemoteResourceTest extends EclipseTest {
 		file.setContents(getRandomContents(), false, false, null);
 		addResources(project, new String[] { "folder2/folder3/add.txt" }, false);
 		deleteResources(project, new String[] {"folder1/b.txt"}, false);
-		getProvider(project).checkin(new IResource[] {project}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		commitResources(new IResource[] {project}, IResource.DEPTH_INFINITE);
 		
 		// Fetch the remote tree for the version
 		ICVSRemoteResource tree = CVSWorkspaceRoot.getRemoteTree(project, v1Tag, DEFAULT_MONITOR);
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java
index 8cdcea0bf..625185247 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java
@@ -154,7 +154,7 @@ public class ResourceDeltaTest extends EclipseTest {
 		IFolder folder = project.getFolder("newfolder");
 		folder.create(false, true, null);
 		assertAdditionMarkerFor(folder, true);
-		getProvider(project).add(new IResource[] {folder}, IResource.DEPTH_ZERO, DEFAULT_MONITOR);
+		addResources(new IResource[] {folder});
 		assertAdditionMarkerFor(folder, false);
 	}
 	
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
index 0b01cf083..94dcc359d 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
@@ -23,7 +23,6 @@ import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.subscribers.Subscriber;
 import org.eclipse.team.core.synchronize.SyncInfo;
 import org.eclipse.team.internal.ccvs.core.*;
-import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
 
 
@@ -54,8 +53,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
 		IProject copy = checkoutCopy(project, "-copy");
 		tagProject(project, root, false);
 		tagProject(project, branch, false);
-		getProvider(copy).update(new IResource[] {copy}, Command.NO_LOCAL_OPTIONS,
-		branch, false /*createBackups*/, DEFAULT_MONITOR);
+		updateProject(copy, branch, false);
 		return copy;
 	}
 	
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
index ebf74c5f7..e71319bf0 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
@@ -27,7 +27,6 @@ import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.subscribers.ISubscriberChangeEvent;
 import org.eclipse.team.core.synchronize.SyncInfo;
 import org.eclipse.team.internal.ccvs.core.*;
-import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
 import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
 import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
@@ -930,7 +929,7 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 		IProject project = createProject(new String[] { "file1.txt", "file2.txt", "file3.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
 		CVSTag branch = new CVSTag("branch1", CVSTag.BRANCH);
 		tagProject(project, branch, false /* force */);
-		getProvider(project).update(new IResource[] {project}, Command.NO_LOCAL_OPTIONS, branch, true /*createBackups*/, DEFAULT_MONITOR);
+		updateProject(project, branch, false);
 
 		// Checkout and modify a copy
 		IProject copy = checkoutCopy(project, branch);
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CompareOperationTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CompareOperationTests.java
index d0c86cfa4..b21b745d0 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CompareOperationTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CompareOperationTests.java
@@ -139,7 +139,7 @@ public class CompareOperationTests extends CVSOperationTest {
 		setContentsAndEnsureModified(copy.getFile("folder1/a.txt"));
 		addResources(copy, new String[] { "folder1/newFile", "folder2/folder3/add.txt" }, false);
 		deleteResources(copy, new String[] {"folder1/b.txt"}, false);
-		getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		commitResources(new IResource[] {copy}, IResource.DEPTH_INFINITE);
 
 		// Run the compare operation of the project folder
 		ICVSRemoteResource remoteResource = CVSWorkspaceRoot.getRemoteResourceFor(project);