Changes to tests to reflect update API change

6 files changed, 34 insertions, 17 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 7448b2875..b891115e5 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
@@ -39,6 +39,7 @@ import org.eclipse.team.internal.ccvs.core.CVSProvider;
 import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.internal.ccvs.core.client.Import;
 import org.eclipse.team.internal.ccvs.core.client.Session;
+import org.eclipse.team.internal.ccvs.core.client.Update;
 import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
 import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation;
 import org.eclipse.team.internal.ccvs.core.connection.CVSServerException;
@@ -158,12 +159,20 @@ public class EclipseTest extends EclipseWorkspaceTest {
 	 */
 	public IResource[] updateResources(IContainer container, String[] hierarchy, boolean ignoreLocalChanges) throws CoreException, TeamException {
 		IResource[] resources = getResources(container, hierarchy);
-		getProvider(container).update(resources, IResource.DEPTH_INFINITE, null, ignoreLocalChanges, DEFAULT_MONITOR);
+		LocalOption[] options = Command.NO_LOCAL_OPTIONS;
+		if(ignoreLocalChanges) {
+			options = new LocalOption[] {Update.IGNORE_LOCAL_CHANGES};
+		}	
+		getProvider(container).update(resources, options, null, null, DEFAULT_MONITOR);
 		return resources;
 	}
 	
 	public void updateProject(IProject project, CVSTag tag, boolean ignoreLocalChanges) throws TeamException {
-		getProvider(project).update(new IResource[] {project}, IResource.DEPTH_INFINITE, tag, ignoreLocalChanges, DEFAULT_MONITOR);
+		LocalOption[] options = Command.NO_LOCAL_OPTIONS;
+		if(ignoreLocalChanges) {
+			options = new LocalOption[] {Update.IGNORE_LOCAL_CHANGES};
+		}
+		getProvider(project).update(new IResource[] {project}, options, tag, null, DEFAULT_MONITOR);
 	}
 	
 	public void commitProject(IProject project) throws TeamException {
@@ -514,7 +523,7 @@ public class EclipseTest extends EclipseWorkspaceTest {
 		try {
 			status = Command.IMPORT.execute(s,
 				Command.NO_GLOBAL_OPTIONS,
-				new LocalOption[] {Import.makeMessageOption("Initial Import")},
+				new LocalOption[] {Import.makeArgumentOption(Command.MESSAGE_OPTION, "Initial Import")},
 				new String[] { project.getName(), getRepository().getUsername(), "start" },
 				null,
 				DEFAULT_MONITOR);
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/AllTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/AllTests.java
index ddf80a3cc..c8dbe6717 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/AllTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/AllTests.java
@@ -32,10 +32,10 @@ public class AllTests extends EclipseTest {
 	public static Test suite() {
 		TestSuite suite = new TestSuite();
 		//suite.addTestSuite(ModuleTest.class);
-		suite.addTestSuite(ImportTest.class);
-		suite.addTestSuite(CVSProviderTest.class);
-		suite.addTestSuite(RemoteResourceTest.class);
-		suite.addTestSuite(SyncElementTest.class);
+		suite.addTest(ImportTest.suite());
+		suite.addTest(CVSProviderTest.suite());
+		suite.addTest(RemoteResourceTest.suite());
+		suite.addTest(SyncElementTest.suite());
 		return new CVSTestSetup(suite);
 	}
 }
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 5432722ef..a8c672c96 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
@@ -14,6 +14,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.team.ccvs.core.CVSProviderPlugin;
 import org.eclipse.team.ccvs.core.CVSTag;
 import org.eclipse.team.core.TeamException;
+import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
 import org.eclipse.team.tests.ccvs.core.EclipseTest;
 import org.eclipse.team.tests.ccvs.core.JUnitTestCase;
@@ -40,7 +41,7 @@ public class CVSProviderTest extends EclipseTest {
 	public static Test suite() {
 		TestSuite suite = new TestSuite(CVSProviderTest.class);
 		return new CVSTestSetup(suite);
-		//return new CVSTestSetup(new CVSProviderTest("testGet"));
+		//return new CVSTestSetup(new CVSProviderTest("testPruning"));
 	}
 	
 	public void testAddAndDelete() throws TeamException, CoreException {
@@ -82,7 +83,7 @@ public class CVSProviderTest extends EclipseTest {
 		
 		// Commit the copy and update the project
 		getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
-		getProvider(project).update(new IResource[] {project}, IResource.DEPTH_INFINITE, null, false, DEFAULT_MONITOR);
+		getProvider(project).update(new IResource[] {project}, Command.NO_LOCAL_OPTIONS, null, null, DEFAULT_MONITOR);
 		assertEquals(project, copy);
 	}
 	
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 582bca4e8..6b21dacc0 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
@@ -101,7 +101,7 @@ public class ModuleTest extends EclipseTest {
 		s.open(DEFAULT_MONITOR);
 		try {
 			Command.IMPORT.execute(s, Command.NO_GLOBAL_OPTIONS, 
-				new LocalOption[] {Command.makeMessageOption("")},
+				new LocalOption[] {Command.makeArgumentOption(Command.MESSAGE_OPTION, "")},
 				new String[] { projectName, "start", "vendor"},
 				null,
 				DEFAULT_MONITOR);
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 6cfedbe3c..ccbf96c41 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
@@ -47,7 +47,7 @@ public class RemoteResourceTest extends EclipseTest {
 	public static Test suite() {
 		TestSuite suite = new TestSuite(RemoteResourceTest.class);
 		return new CVSTestSetup(suite);
-		//return new CVSTestSetup(new RemoteResourceTest("testNonRootBuild"));
+		//return new CVSTestSetup(new RemoteResourceTest("testVersionTag"));
 	}
 	
 	protected void assertRemoteMatchesLocal(String message, RemoteFolder remote, IContainer container) throws CVSException, IOException, CoreException {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java
index 82044bb58..5fb3cbe59 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java
@@ -21,7 +21,9 @@ import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.sync.ILocalSyncElement;
 import org.eclipse.team.core.sync.IRemoteResource;
 import org.eclipse.team.core.sync.IRemoteSyncElement;
+import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.internal.ccvs.core.client.Session;
+import org.eclipse.team.internal.ccvs.core.client.Update;
 import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement;
 import org.eclipse.team.internal.ccvs.core.resources.ICVSResource;
 import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
@@ -300,7 +302,9 @@ public class SyncElementTest extends EclipseTest {
 				IRemoteSyncElement.CONFLICTING | IRemoteSyncElement.CHANGE });
 		
 		// Catch up to the file1.txt conflict using UPDATE with ignoreLocalChanges
-		getProvider(project).update(new IResource[] {project.getFile("file1.txt")}, IResource.DEPTH_ZERO, null, true,DEFAULT_MONITOR);
+		getProvider(project).update(new IResource[] {project.getFile("file1.txt")}, 
+												 new Command.LocalOption[] {Update.IGNORE_LOCAL_CHANGES, Command.DO_NOT_RECURSE}, 
+												 null, null, DEFAULT_MONITOR);
 		tree = getProvider(project).getRemoteSyncTree(project, CVSTag.DEFAULT, DEFAULT_MONITOR);
 		assertSyncEquals("testFileConflict", tree, 
 			new String[] { "file1.txt", "folder1/", "folder1/a.txt"}, 
@@ -389,7 +393,9 @@ public class SyncElementTest extends EclipseTest {
 		// Catch-up to conflicting cases using UPDATE
 		// XXX SPECIAL CASE: We need to unmanage the resources before getting the remote
 		makeIncoming(tree, new String[] {"add1a.txt"});
-		getProvider(project).update(new IResource[] {project.getFile("add1a.txt"), project.getFile("add2a.txt")}, IResource.DEPTH_ZERO, null, false, DEFAULT_MONITOR);
+		getProvider(project).update(new IResource[] {project.getFile("add1a.txt"), project.getFile("add2a.txt")}, 
+												 new Command.LocalOption[] {Command.DO_NOT_RECURSE}, 
+												 null, null, DEFAULT_MONITOR);
 		tree = getProvider(project).getRemoteSyncTree(project, CVSTag.DEFAULT, DEFAULT_MONITOR);
 		assertSyncEquals("testAdditionConflicts", tree, 
 			new String[] { "add1a.txt", "add2a.txt"}, 
@@ -605,7 +611,7 @@ public class SyncElementTest extends EclipseTest {
 				IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION});
 				
 		// Catch up to the deletion by updating
-		getProvider(file).update(new IResource[] {file}, IResource.DEPTH_ZERO, null, false, DEFAULT_MONITOR);
+		getProvider(file).update(new IResource[] {file}, new Command.LocalOption[] {Command.DO_NOT_RECURSE}, null, null, DEFAULT_MONITOR);
 		
 		// Get the sync tree again for the project and ensure others aren't effected
 		tree = getProvider(project).getRemoteSyncTree(project, CVSTag.DEFAULT, DEFAULT_MONITOR);
@@ -645,7 +651,8 @@ public class SyncElementTest extends EclipseTest {
 		ILocalSyncElement element = getChild(tree, new Path("folder1/add.txt"));
 		
 		// Catch up to the addition by updating
-		getProvider(project).update(new IResource[] {element.getLocal()}, IResource.DEPTH_ZERO, null, false, DEFAULT_MONITOR);
+		getProvider(project).update(new IResource[] {element.getLocal()}, new Command.LocalOption[] {Command.DO_NOT_RECURSE}, 
+												 null, null, DEFAULT_MONITOR);
 		
 		// Get the sync tree again for the project and ensure the added resource is in sync
 		tree = getProvider(project).getRemoteSyncTree(project, CVSTag.DEFAULT, DEFAULT_MONITOR);
@@ -722,7 +729,7 @@ public class SyncElementTest extends EclipseTest {
 		getProvider(project).tag(new IResource[] {project}, IResource.DEPTH_INFINITE, new CVSTag("v1", CVSTag.VERSION), DEFAULT_MONITOR);
 		getProvider(project).tag(new IResource[] {project}, IResource.DEPTH_INFINITE, new CVSTag("branch1", CVSTag.BRANCH), DEFAULT_MONITOR);
 		
-		getProvider(copy).update(new IResource[] {copy}, IResource.DEPTH_INFINITE, new CVSTag("branch1", CVSTag.BRANCH), false, DEFAULT_MONITOR);
+		getProvider(copy).update(new IResource[] {copy}, Command.NO_LOCAL_OPTIONS, new CVSTag("branch1", CVSTag.BRANCH), null, DEFAULT_MONITOR);
 		
 		// make changes on the branch		
 		addResources(copy, new String[] {"addition.txt", "folderAddition/", "folderAddition/new.txt"}, true);
@@ -756,7 +763,7 @@ public class SyncElementTest extends EclipseTest {
 		IProject project = createProject("testSyncOnBranch", new String[] { "file1.txt", "file2.txt", "file3.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
 		CVSTag branch = new CVSTag("branch1", CVSTag.BRANCH);
 		getProvider(project).tag(new IResource[] {project}, IResource.DEPTH_INFINITE, branch, DEFAULT_MONITOR);
-		getProvider(project).update(new IResource[] {project}, IResource.DEPTH_INFINITE, branch, false, DEFAULT_MONITOR);
+		getProvider(project).update(new IResource[] {project}, Command.NO_LOCAL_OPTIONS, branch, null, DEFAULT_MONITOR);
 
 		// Checkout and modify a copy
 		IProject copy = checkoutCopy(project, branch);