Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-02-12 08:51:09 -0500
committerMichael Valenta2002-02-12 08:51:09 -0500
commit1f7f0d8ff57cd9cb30dc67cbdea44a76745de6e0 (patch)
tree778bf1683b8128af5c8474b7b4499f72da9a9950
parentb8a0b259ff5280a6ecc18e9cb6253d6842a28279 (diff)
downloadeclipse.platform.team-1f7f0d8ff57cd9cb30dc67cbdea44a76745de6e0.tar.gz
eclipse.platform.team-1f7f0d8ff57cd9cb30dc67cbdea44a76745de6e0.tar.xz
eclipse.platform.team-1f7f0d8ff57cd9cb30dc67cbdea44a76745de6e0.zip
*** empty log message ***
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java1
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java22
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java3
3 files changed, 23 insertions, 3 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java
index bedfe0a7c..070cb0ddd 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java
@@ -68,6 +68,7 @@ public abstract class JUnitTestCase extends TestCase {
commandPool.put("status", Command.STATUS);
commandPool.put("log", Command.LOG);
commandPool.put("tag", Command.TAG);
+ commandPool.put("rtag", Command.RTAG);
commandPool.put("admin", Command.ADMIN);
commandPool.put("diff", Command.DIFF);
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java
index 231ef9469..7e6a159d2 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java
@@ -33,7 +33,7 @@ public class BasicTest extends JUnitTestCase {
public static Test suite() {
TestSuite suite = new TestSuite(BasicTest.class);
return new CompatibleTestSetup(suite);
- //return new CompatibleTestSetup(new BasicTest("testBranchingWithLocalChanges"));
+ //return new CompatibleTestSetup(new BasicTest("testRTag"));
}
public void setUp() throws Exception {
env1.setUp();
@@ -270,7 +270,25 @@ public class BasicTest extends JUnitTestCase {
env1.execute("update", new String[]{"-r","tag2"}, new String[]{"proj2"});
env1.execute("update", new String[]{"-r","tag3"}, new String[]{"proj2"});
env1.execute("update", new String[]{"-A"}, new String[]{"proj2"});
- }
+ }
+
+ public void testRTag() throws Exception {
+
+ // Checkout and tag the project
+ env1.execute("co",EMPTY_ARGS,new String[]{"proj2"});
+ env1.execute("tag",EMPTY_ARGS,new String[]{"tag1","proj2"});
+ env1.deleteFile("proj2");
+
+ // Use rtag to tag the above tag as both a version and a branch
+ env1.execute("rtag",new String[]{"-r", "tag1"},new String[]{"rtag1","proj2"});
+ env1.execute("rtag",new String[]{"-b", "-r", "tag1"},new String[]{"btag1","proj2"});
+
+ // Checkout the version and branch
+ env1.deleteFile("proj2");
+ env1.execute("co",new String[]{"-r","rtag1"},new String[]{"proj2"});
+ env1.deleteFile("proj2");
+ env1.execute("co",new String[]{"-r","btag1"},new String[]{"proj2"});
+ }
public void testPrune() throws Exception {
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 21dc6569b..11feb1ce3 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
@@ -54,7 +54,7 @@ public class SyncElementTest extends EclipseTest {
public static Test suite() {
TestSuite suite = new TestSuite(SyncElementTest.class);
return new CVSTestSetup(suite);
- //return new CVSTestSetup(new SyncElementTest("testOutgoingChanges"));
+ //return new CVSTestSetup(new SyncElementTest("testDeletionConflicts"));
}
/*
@@ -445,6 +445,7 @@ public class SyncElementTest extends EclipseTest {
JUnitTestCase.waitMsec(1500); // Wait so that timestamp of modified file differs from original
file.setContents(getRandomContents(), false, false, null);
file = copy.getFile("delete2.txt");
+ JUnitTestCase.waitMsec(1500); // Wait so that timestamp of modified file differs from original
file.setContents(getRandomContents(), false, false, null);
deleteResources(copy, new String[] {"delete3.txt", "delete4.txt", "delete5.txt"}, false);
getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);

Back to the top