Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-08-14 11:54:46 -0400
committerMichael Valenta2003-08-14 11:54:46 -0400
commitdc05e0e26ae86034ecb76a0c6992481337201a4b (patch)
tree89fe632e66ec4fdb67c9e959009c9acd81440757
parent532f0aeca18793f427098ae918a21dba3c008b3d (diff)
downloadeclipse.platform.team-dc05e0e26ae86034ecb76a0c6992481337201a4b.tar.gz
eclipse.platform.team-dc05e0e26ae86034ecb76a0c6992481337201a4b.tar.xz
eclipse.platform.team-dc05e0e26ae86034ecb76a0c6992481337201a4b.zip
*** empty log message ***
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java21
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java3
2 files changed, 19 insertions, 5 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 22dcbbc60..baf590835 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
@@ -42,7 +42,9 @@ import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
import org.eclipse.team.internal.ccvs.core.ICVSFile;
import org.eclipse.team.internal.ccvs.core.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile;
+import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource;
+import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Import;
@@ -290,24 +292,37 @@ public class EclipseTest extends EclipseWorkspaceTest {
protected IProject checkoutCopy(IProject project, String postfix) throws TeamException {
// Check the project out under a different name and validate that the results are the same
IProject copy = getWorkspace().getRoot().getProject(project.getName() + postfix);
- CVSWorkspaceRoot.checkout(getRepository(), copy, CVSWorkspaceRoot.getCVSFolderFor(project).getFolderSyncInfo().getRepository(), null, DEFAULT_MONITOR);
+ checkout(getRepository(), copy, CVSWorkspaceRoot.getCVSFolderFor(project).getFolderSyncInfo().getRepository(), null, DEFAULT_MONITOR);
return copy;
}
protected IProject checkoutCopy(IProject project, CVSTag tag) throws TeamException {
// Check the project out under a different name and validate that the results are the same
IProject copy = getWorkspace().getRoot().getProject(project.getName() + tag.getName());
- CVSWorkspaceRoot.checkout(getRepository(), copy,
+ checkout(getRepository(), copy,
CVSWorkspaceRoot.getCVSFolderFor(project).getFolderSyncInfo().getRepository(),
tag, DEFAULT_MONITOR);
return copy;
}
+ public static void checkout(
+ ICVSRepositoryLocation repository,
+ IProject project,
+ String sourceModule,
+ CVSTag tag,
+ IProgressMonitor monitor)
+ throws TeamException {
+
+ if (sourceModule == null)
+ sourceModule = project.getName();
+ CVSWorkspaceRoot.checkout(new ICVSRemoteFolder[] { new RemoteFolder(null, repository, sourceModule, tag)},
+ new IProject[] { project }, monitor);
+ }
protected IProject checkoutProject(IProject project, String moduleName, CVSTag tag) throws TeamException {
if (project == null)
project = getWorkspace().getRoot().getProject(new Path(moduleName).lastSegment());
- CVSWorkspaceRoot.checkout(getRepository(), project, moduleName, tag, DEFAULT_MONITOR);
+ checkout(getRepository(), project, moduleName, tag, DEFAULT_MONITOR);
return project;
}
/*
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java
index e66a65059..99d22d990 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java
@@ -25,7 +25,6 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.team.core.TeamException;
-import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
@@ -119,7 +118,7 @@ public class ImportTest extends EclipseTest {
// Check it out under a different name and validate that the results are the same
IProject copy = getWorkspace().getRoot().getProject(project.getName() + "Copy");
- CVSWorkspaceRoot.checkout(getRepository(), copy, project.getName(), null, DEFAULT_MONITOR);
+ checkout(getRepository(), copy, project.getName(), null, DEFAULT_MONITOR);
assertValidCheckout(copy);
assertEquals(project, copy);
}

Back to the top