Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-03-21 10:53:32 -0500
committerJean Michel-Lemieux2002-03-21 10:53:32 -0500
commit4dfee892a72f3be575242280ade458b90bd8369c (patch)
tree6ca753c867ee3c0d6876a516960ec90e8585ca5f
parent1b3b14e58c9d7e26e1791ed491497c5d6b35c5ac (diff)
downloadeclipse.platform.team-4dfee892a72f3be575242280ade458b90bd8369c.tar.gz
eclipse.platform.team-4dfee892a72f3be575242280ade458b90bd8369c.tar.xz
eclipse.platform.team-4dfee892a72f3be575242280ade458b90bd8369c.zip
Added classes to run team core tests
Commented out eclipse sync tests until after M4
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/.classpath20
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/.project2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/plugin.xml164
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTeamAndCVSTests.java38
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTestsCVSResources.java2
5 files changed, 146 insertions, 80 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/.classpath b/tests/org.eclipse.team.tests.cvs.core/.classpath
index 49469e263..1be24d1fa 100644
--- a/tests/org.eclipse.team.tests.cvs.core/.classpath
+++ b/tests/org.eclipse.team.tests.cvs.core/.classpath
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="/org.apache.xerces"/>
+ <classpathentry kind="src" path="/org.eclipse.core.tests.harness"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.eclipse.team.core"/>
<classpathentry kind="src" path="/org.eclipse.team.cvs.core"/>
- <classpathentry kind="src" path="/org.junit"/>
- <classpathentry kind="src" path="/org.eclipse.core.tests.harness"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="/org.eclipse.core.boot"/>
- <classpathentry kind="src" path="/org.eclipse.team.cvs.ui"/>
<classpathentry kind="src" path="/org.eclipse.team.ui"/>
- <classpathentry kind="src" path="/org.eclipse.ui"/>
- <classpathentry kind="src" path="/org.eclipse.swt"/>
- <classpathentry kind="src" path="/org.apache.xerces"/>
+ <classpathentry kind="src" path="/org.eclipse.team.cvs.ui"/>
<classpathentry kind="src" path="/org.eclipse.compare"/>
+ <classpathentry kind="src" path="/org.eclipse.ui"/>
+ <classpathentry kind="src" path="/org.junit"/>
+ <classpathentry kind="src" path="/org.eclipse.team.tests.core"/>
+ <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+ <classpathentry kind="src" path="/org.eclipse.core.boot"/>
+ <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.team.tests.cvs.core/.project b/tests/org.eclipse.team.tests.cvs.core/.project
index 4df00830c..ba63ccfe4 100644
--- a/tests/org.eclipse.team.tests.cvs.core/.project
+++ b/tests/org.eclipse.team.tests.cvs.core/.project
@@ -9,10 +9,10 @@
<project>org.eclipse.core.resources</project>
<project>org.eclipse.core.runtime</project>
<project>org.eclipse.core.tests.harness</project>
- <project>org.eclipse.swt</project>
<project>org.eclipse.team.core</project>
<project>org.eclipse.team.cvs.core</project>
<project>org.eclipse.team.cvs.ui</project>
+ <project>org.eclipse.team.tests.core</project>
<project>org.eclipse.team.ui</project>
<project>org.eclipse.ui</project>
<project>org.junit</project>
diff --git a/tests/org.eclipse.team.tests.cvs.core/plugin.xml b/tests/org.eclipse.team.tests.cvs.core/plugin.xml
index 3a2ecddb1..8ba42053e 100644
--- a/tests/org.eclipse.team.tests.cvs.core/plugin.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/plugin.xml
@@ -1,76 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin
- name="Eclipse CVS Tests Core"
- id="org.eclipse.team.tests.cvs.core"
- version="1.0"
- provider-name="Object Technology International, Inc.">
+ id="org.eclipse.team.tests.cvs.core"
+ name="Eclipse CVS Tests Core"
+ version="1.0"
+ provider-name="Object Technology International, Inc.">
- <requires>
- <import plugin="org.apache.xerces"/>
- <import plugin="org.eclipse.core.tests.harness"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.team.core"/>
- <import plugin="org.eclipse.team.cvs.core"/>
- <import plugin="org.eclipse.team.ui"/>
- <import plugin="org.eclipse.team.cvs.ui"/>
- <import plugin="org.eclipse.compare"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.junit"/>
- </requires>
+ <runtime>
+ <library name="cvstests.jar">
+ <export name="*"/>
+ </library>
+ </runtime>
+ <requires>
+ <import plugin="org.apache.xerces"/>
+ <import plugin="org.eclipse.core.tests.harness"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.team.core"/>
+ <import plugin="org.eclipse.team.cvs.core"/>
+ <import plugin="org.eclipse.team.ui"/>
+ <import plugin="org.eclipse.team.cvs.ui"/>
+ <import plugin="org.eclipse.compare"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.junit"/>
+ <import plugin="org.eclipse.team.tests.core"/>
+ </requires>
- <runtime>
- <library name="cvstests.jar">
- <export name="*"/>
- </library>
- </runtime>
<!-- **************** TESTS ******************* -->
+ <extension
+ point="org.eclipse.core.tests.harness.tests">
+ <test
+ id="cvs.all">
+ <run
+ class="org.eclipse.team.tests.ccvs.core.AllTests">
+ </run>
+ </test>
+ <test
+ id="cvs.provider">
+ <run
+ class="org.eclipse.team.tests.ccvs.core.provider.AllTestsProvider">
+ </run>
+ </test>
+ <test
+ id="cvs.compatibility">
+ <run
+ class="org.eclipse.team.tests.ccvs.core.compatible.AllTestsCompatibility">
+ </run>
+ </test>
+ <test
+ id="cvs.resources">
+ <run
+ class="org.eclipse.team.tests.ccvs.core.cvsresources.AllTestsCVSResources">
+ </run>
+ </test>
+ <test
+ id="cvs.sync">
+ <run
+ class="org.eclipse.team.tests.ccvs.core.provider.SyncElementTest">
+ </run>
+ </test>
+ <test
+ id="cvs.remote">
+ <run
+ class="org.eclipse.team.tests.ccvs.core.provider.RemoteResourceTest">
+ </run>
+ </test>
+ <test
+ id="cvsui.benchmark.all">
+ <run
+ class="org.eclipse.team.tests.ccvs.ui.benchmark.AllTests">
+ </run>
+ </test>
+ <test
+ id="cvsui.benchmark.sync">
+ <run
+ class="org.eclipse.team.tests.ccvs.ui.benchmark.SyncTests">
+ </run>
+ </test>
+ <test
+ id="cvsui.benchmark.workflow">
+ <run
+ class="org.eclipse.team.tests.ccvs.ui.benchmark.WorkflowTests">
+ </run>
+ </test>
+ </extension>
+ <extension
+ point="org.eclipse.ui.perspectives">
+ <perspective
+ name="Empty Perspective"
+ class="org.eclipse.team.tests.ccvs.ui.EmptyPerspective"
+ id="org.eclipse.team.tests.ccvs.ui.EmptyPerspective">
+ </perspective>
+ </extension>
+ <extension
+ id="harness"
+ point="org.eclipse.core.runtime.applications">
+ <application>
+ <run
+ class="org.eclipse.team.tests.ccvs.ui.EclipseUITestHarnessApplication">
+ </run>
+ </application>
+ </extension>
- <extension point="org.eclipse.core.tests.harness.tests">
-
- <test id="cvs.all">
- <run class="org.eclipse.team.tests.ccvs.core.AllTests"/>
- </test>
-
- <test id="cvs.provider">
- <run class="org.eclipse.team.tests.ccvs.core.provider.AllTestsProvider"/>
- </test>
-
- <test id="cvs.compatibility">
- <run class="org.eclipse.team.tests.ccvs.core.compatible.AllTestsCompatibility"/>
- </test>
-
- <test id="cvs.resources">
- <run class="org.eclipse.team.tests.ccvs.core.cvsresources.AllTestsCVSResources"/>
- </test>
-
- <test id="cvs.sync">
- <run class="org.eclipse.team.tests.ccvs.core.provider.SyncElementTest"/>
- </test>
-
- <test id="cvs.remote">
- <run class="org.eclipse.team.tests.ccvs.core.provider.RemoteResourceTest"/>
- </test>
-
- <test id="cvsui.benchmark.all">
- <run class="org.eclipse.team.tests.ccvs.ui.benchmark.AllTests"/>
- </test>
- <test id="cvsui.benchmark.sync">
- <run class="org.eclipse.team.tests.ccvs.ui.benchmark.SyncTests"/>
- </test>
- <test id="cvsui.benchmark.workflow">
- <run class="org.eclipse.team.tests.ccvs.ui.benchmark.WorkflowTests"/>
- </test>
- </extension>
-
- <extension point="org.eclipse.ui.perspectives">
- <perspective id="org.eclipse.team.tests.ccvs.ui.EmptyPerspective" name="Empty Perspective" class="org.eclipse.team.tests.ccvs.ui.EmptyPerspective" />
- </extension>
-
- <extension id="harness" point="org.eclipse.core.runtime.applications">
- <application>
- <run class="org.eclipse.team.tests.ccvs.ui.EclipseUITestHarnessApplication"/>
- </application>
- </extension>
-
</plugin>
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTeamAndCVSTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTeamAndCVSTests.java
new file mode 100644
index 000000000..34bc77809
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTeamAndCVSTests.java
@@ -0,0 +1,38 @@
+package org.eclipse.team.tests.ccvs.core;
+/*
+ * (c) Copyright IBM Corp. 2000, 2002.
+ * All Rights Reserved.
+ */
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.eclipse.team.tests.core.AllTeamTests;
+
+public class AllTeamAndCVSTests extends EclipseTest {
+
+ /**
+ * Constructor for CVSClientTest.
+ */
+ public AllTeamAndCVSTests() {
+ super();
+ }
+
+ /**
+ * Constructor for CVSClientTest.
+ * @param name
+ */
+ public AllTeamAndCVSTests(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(new TestSetup(AllTeamTests.suite()));
+ suite.addTest(new CVSTestSetup(AllTests.suite()));
+ return suite;
+ }
+}
+
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTestsCVSResources.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTestsCVSResources.java
index 0a2b1e3a5..50ba24c33 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTestsCVSResources.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/AllTestsCVSResources.java
@@ -11,7 +11,7 @@ public class AllTestsCVSResources extends EclipseTest {
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(ResourceSyncInfoTest.suite());
- suite.addTest(EclipseSynchronizerTest.suite());
+ //suite.addTest(EclipseSynchronizerTest.suite());
return suite;
}

Back to the top