diff options
| author | Michael Valenta | 2004-05-04 16:43:52 +0000 |
|---|---|---|
| committer | Michael Valenta | 2004-05-04 16:43:52 +0000 |
| commit | 0da3050e6a660690866ffda2978170acb0e02dfd (patch) | |
| tree | cc6fab509737989bd0cefdbdbace7411bee826fc /tests | |
| parent | ba57d9a05f3bce0bbfd778491fb9e4df33d37ec1 (diff) | |
| download | eclipse.platform.team-0da3050e6a660690866ffda2978170acb0e02dfd.tar.gz eclipse.platform.team-0da3050e6a660690866ffda2978170acb0e02dfd.tar.xz eclipse.platform.team-0da3050e6a660690866ffda2978170acb0e02dfd.zip | |
56249: Make all operations proper granularity
Diffstat (limited to 'tests')
3 files changed, 9 insertions, 3 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 e3221affd..aa75eb0dd 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 @@ -287,6 +287,12 @@ public class EclipseTest extends EclipseWorkspaceTest { } } } + public void makeBranch(IResource[] resources, CVSTag version, CVSTag branch, boolean update) throws CVSException { + BranchOperation op = new BranchOperation(null, resources) { + + }; + executeHeadless(op); + } /** * Return a collection of resources defined by hierarchy. The resources * are added to the workspace and to the file system. If the manage flag is true, the 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 9b02b246b..3ac8b4925 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 @@ -189,7 +189,7 @@ public class CVSProviderTest extends EclipseTest { // Make the branch including a pre-version CVSTag version = new CVSTag("v1", CVSTag.BRANCH); CVSTag branch = new CVSTag("branch1", CVSTag.BRANCH); - getProvider(project).makeBranch(new IResource[] {project}, version, branch, true, DEFAULT_MONITOR); + makeBranch(new IResource[] {project}, version, branch, true); // Checkout a copy from the branch and version and compare IProject branchCopy = checkoutCopy(project, branch); @@ -201,7 +201,7 @@ public class CVSProviderTest extends EclipseTest { updateProject(branchCopy, null, false); assertEquals(branchCopy, project, false, true); } - + public void testPruning() throws TeamException, CoreException, IOException { // Create a project with empty folders CVSProviderPlugin.getPlugin().setPruneEmptyDirectories(false); 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 3f848316e..dfd282e78 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 @@ -1049,7 +1049,7 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest { IProject copy = checkoutCopy(project, "-copy"); CVSTag version = new CVSTag("v1", CVSTag.BRANCH); CVSTag branch = new CVSTag("branch1", CVSTag.BRANCH); - getProvider(copy).makeBranch(new IResource[] {copy}, version, branch, true, DEFAULT_MONITOR); + makeBranch(new IResource[] {copy}, version, branch, true); addResources(copy, new String[] {"folder2/folder3/a.txt"}, true); // Fetch the tree corresponding to the branch using the original as the base. |