Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTests.java8
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java6
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/test.xml2
3 files changed, 7 insertions, 9 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTests.java
index 19c7acaa3..b2c6419d5 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTests.java
@@ -6,13 +6,11 @@ package org.eclipse.team.tests.ccvs.core.cvsresources;
import junit.awtui.TestRunner;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.eclipse.team.tests.ccvs.core.EclipseTest;
+public class AllTests extends EclipseTest {
-public class AllTests extends TestSuite {
-
-
- public static void main(String[] args) {
-
+ public static void main(String[] args) {
TestRunner.run(AllTests.class);
}
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 519a05e96..c9fa87ba4 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
@@ -604,7 +604,7 @@ public class SyncElementTest extends EclipseTest {
// Delete a file
IFile file = project.getFile("folder1/b.txt");
- file.delete(true, DEFAULT_MONITOR);
+ file.delete(true, DEFAULT_MONITOR); // WARNING: As of 2002/03/05, this is equivalent to a cvs remove
// Get the sync tree for the project
IRemoteSyncElement tree = getProvider(project).getRemoteSyncTree(project, CVSTag.DEFAULT, DEFAULT_MONITOR);
@@ -616,8 +616,8 @@ public class SyncElementTest extends EclipseTest {
IRemoteSyncElement.IN_SYNC,
IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION});
- // Catch up to the deletion by updating
- getProvider(file).update(new IResource[] {file}, new Command.LocalOption[] {Command.DO_NOT_RECURSE}, null, null, DEFAULT_MONITOR);
+ // Commit the deletion
+ getProvider(file).checkin(new IResource[] {file}, IResource.DEPTH_ZERO, 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);
diff --git a/tests/org.eclipse.team.tests.cvs.core/test.xml b/tests/org.eclipse.team.tests.cvs.core/test.xml
index fa33bba3e..b87540e8d 100644
--- a/tests/org.eclipse.team.tests.cvs.core/test.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/test.xml
@@ -6,7 +6,7 @@
<!-- sets the properties eclipse-home, and library-file -->
<property name="eclipse-home" value="${basedir}/../../"/>
- <property name="library-file" value="${eclipse-home}/fragments/org.eclipse.test/library.xml"/>
+ <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
<!-- get the repository.properties which identify the cvs test repository -->
<property name="team-home" value="${eclipse-home}/plugins/org.eclipse.team.tests.cvs.core"/>

Back to the top