*** empty log message ***

3 files changed, 43 insertions, 31 deletions

diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamTests.java
new file mode 100644
index 000000000..deabf4dd6
--- /dev/null
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamTests.java
@@ -0,0 +1,36 @@
+package org.eclipse.team.tests.core;
+/*
+ * (c) Copyright IBM Corp. 2000, 2002.
+ * All Rights Reserved.
+ */
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.eclipse.core.tests.harness.EclipseWorkspaceTest;
+
+public class AllTeamTests extends EclipseWorkspaceTest {
+
+	/**
+	 * Constructor for CVSClientTest.
+	 */
+	public AllTeamTests() {
+		super();
+	}
+
+	/**
+	 * Constructor for CVSClientTest.
+	 * @param name
+	 */
+	public AllTeamTests(String name) {
+		super(name);
+	}
+
+	/*
+	 * ORDER IS IMPORTANT: Run compatibility and resource tests before any other!!!
+	 */
+	public static Test suite() {
+		TestSuite suite = new TestSuite();
+		suite.addTest(RepositoryProviderTests.suite());
+		return suite;
+	}
+}
+
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java
index a44ae5f5e..1dbaebbc9 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java
@@ -236,6 +236,7 @@ public class RepositoryProviderTests extends TeamTest {
 	public void testMoveDeleteHookBetweenProjects() throws CoreException, TeamException {
 		final IProject projectA = getUniqueTestProject("testMoveDeleteHookBetweenProjects_A");
 		final IProject projectB = getUniqueTestProject("testMoveDeleteHookBetweenProjects_B");
+		final IProject projectC = getUniqueTestProject("testMoveDeleteHookBetweenProjects_C");
 		
 		// adding a valid team provider should be fine
 		RepositoryProvider.addNatureToProject(projectA, RepositoryProviderBic.NATURE_ID, null);
@@ -303,19 +304,7 @@ public class RepositoryProviderTests extends TeamTest {
 		resources[0].move(projectB.getFullPath().append("moveFile_new.txt"), false, null);
 		resources[1].move(projectB.getFullPath().append("movedFolder"), false, null);
 		for (int i = 0; i < calledProjectA.length; i++) {
-			assertTrue(calledProjectA[i] && calledProjectB[i]);
-		}
-		
-		// test that moving files/folders from a project without a provider to a project with a provider calls the 
-		// move hooks for the destination
-		calledProjectA[0] = false; calledProjectA[1] = false;
-		calledProjectB[0] = false; calledProjectB[1] = false;
-		IProject projectC = getUniqueTestProject("testMoveDeleteHookBetweenProjects_B");
-		resources = buildResources(projectC, new String[] {"moveFile.txt", "moveFolder/"});
-		resources[0].move(projectB.getFullPath().append("moveFile_new.txt"), false, null);
-		resources[1].move(projectB.getFullPath().append("movedFolder"), false, null);
-		for (int i = 0; i < calledProjectA.length; i++) {
-			assertTrue(calledProjectA[i]==false && calledProjectB[i]);
+			assertTrue(calledProjectA[i]  && calledProjectB[i]==false);
 		}
 		
 		// test that moving files/folders from a project with a provider to a project without a provider calls the
@@ -330,4 +319,4 @@ public class RepositoryProviderTests extends TeamTest {
 			assertTrue(calledProjectA[i] && calledProjectB[i]==false);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.core/test.xml b/tests/org.eclipse.team.tests.core/test.xml
index e81ca551e..2e0df266c 100644
--- a/tests/org.eclipse.team.tests.core/test.xml
+++ b/tests/org.eclipse.team.tests.core/test.xml
@@ -8,10 +8,6 @@
   <property name="eclipse-home" value="${basedir}/../../"/>
   <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.core"/>
-  <property file="${team-home}/repository.properties"/>
-
   <!-- This target holds all initialization code that needs to be done for -->
   <!-- all tests that are to be run. Initialization for individual tests -->
   <!-- should be done within the body of the suite target. -->
@@ -21,25 +17,16 @@
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-    <property name="location" value="${eclipse-home}/cvs_sniff_folder"/>
+    <property name="location" value="${eclipse-home}/team_test_workspace"/>
     <delete dir="${location}" quiet="true"/>
 
-    <!-- Session Test ** CVS Provider ** -->
+    <!-- Session Test ** Team Core ** -->
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="vmargs" value="-Declipse.cvs.properties=${team-home}/repository.properties"/>
       <property name="data-dir" value="${location}"/>
       <property name="plugin-name" value="org.eclipse.team.tests.cvs.core"/>
-      <property name="classname" value="org.eclipse.team.tests.ccvs.core.provider.AllTestsProvider"/>
+      <property name="classname" value="org.eclipse.team.tests.core.AllTeamTests"/>
     </ant>
     
-    <!-- Session Test ** CVS Resources ** -->
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="vmargs" value="-Declipse.cvs.properties=${team-home}/repository.properties"/>
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.team.tests.cvs.core"/>
-      <property name="classname" value="org.eclipse.team.tests.ccvs.core.cvsresources.AllTestsCVSResource"/>
-    </ant>
-
   </target>
   
   <!-- This target holds code to cleanup the testing environment after the tests -->
@@ -52,7 +39,7 @@
   <target name="run" depends="init,suite,cleanup">
     <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
       <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="cvs-tests-summary.xml"/>
+      <property name="output-file" value="org.eclipse.team.tests.core.xml"/>
     </ant>
   </target>