Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-13 20:06:29 +0000
committerMichael Valenta2002-03-13 20:06:29 +0000
commit10bc6d02eb17fc1d2abb7eb427ccfde7fe529574 (patch)
tree9a6b69983ff63685f604c434a4dff872369ea7f7
parent969f30c4eef8cf5203fa43e3ee8aed2241663bc3 (diff)
downloadeclipse.platform.team-10bc6d02eb17fc1d2abb7eb427ccfde7fe529574.tar.gz
eclipse.platform.team-10bc6d02eb17fc1d2abb7eb427ccfde7fe529574.tar.xz
eclipse.platform.team-10bc6d02eb17fc1d2abb7eb427ccfde7fe529574.zip
*** empty log message ***root_teamApiChangesBranch
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java44
1 files changed, 22 insertions, 22 deletions
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 46233a63d..c575e9130 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
@@ -150,28 +150,28 @@ public class CVSProviderTest extends EclipseTest {
}
public void testMakeBranch() throws TeamException, CoreException, IOException {
-// // Create a test project
-// IProject project = createProject("testSyncOnBranch", new String[] { "file1.txt", "file2.txt", "file3.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
-//
-// // Make some local modifications including "cvs adds" and "cvs removes"
-// addResources(project, new String[] {"folder1/c.txt"}, false);
-// deleteResources(project, new String[] {"folder1/b.txt"}, false);
-// changeResources(project, new String[] {"file2.txt"}, false);
-//
-// // 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);
-//
-// // Checkout a copy from the branch and version and compare
-// IProject branchCopy = checkoutCopy(project, branch);
-// IProject versionCopy = checkoutCopy(project, branch);
-// assertEquals(branchCopy, versionCopy, true, false);
-//
-// // Commit the project, update the branch and compare
-// commitProject(project);
-// updateProject(branchCopy, null, false);
-// assertEquals(branchCopy, project, false, true);
+ // Create a test project
+ IProject project = createProject("testSyncOnBranch", new String[] { "file1.txt", "file2.txt", "file3.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
+
+ // Make some local modifications including "cvs adds" and "cvs removes"
+ addResources(project, new String[] {"folder1/c.txt"}, false);
+ deleteResources(project, new String[] {"folder1/b.txt"}, false);
+ changeResources(project, new String[] {"file2.txt"}, false);
+
+ // 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, true, DEFAULT_MONITOR);
+
+ // Checkout a copy from the branch and version and compare
+ IProject branchCopy = checkoutCopy(project, branch);
+ IProject versionCopy = checkoutCopy(project, branch);
+ assertEquals(branchCopy, versionCopy, true, false);
+
+ // Commit the project, update the branch and compare
+ commitProject(project);
+ updateProject(branchCopy, null, false);
+ assertEquals(branchCopy, project, false, true);
}
public void testPruning() throws TeamException, CoreException, IOException {

Back to the top