diff options
author | Steffen Pingel | 2012-03-01 14:53:33 +0000 |
---|---|---|
committer | Steffen Pingel | 2012-03-01 14:53:33 +0000 |
commit | a567dbe79d21b026b69ba8c5b4bfc1f1105075ff (patch) | |
tree | 55fd83b8fa2ee144ce5ebcbeb422bbecba031552 /org.eclipse.mylyn.trac.tests | |
parent | 6e8d0239b455321e7f322d22bd76d620739ecd19 (diff) | |
download | org.eclipse.mylyn.tasks-a567dbe79d21b026b69ba8c5b4bfc1f1105075ff.tar.gz org.eclipse.mylyn.tasks-a567dbe79d21b026b69ba8c5b4bfc1f1105075ff.tar.xz org.eclipse.mylyn.tasks-a567dbe79d21b026b69ba8c5b4bfc1f1105075ff.zip |
NEW - bug 372971: setup integration tests on slave7
https://bugs.eclipse.org/bugs/show_bug.cgi?id=372971
Change-Id: Iebe46f4d3cff3eff0ab3fb76faf7e7c0e802bf2c
Diffstat (limited to 'org.eclipse.mylyn.trac.tests')
3 files changed, 51 insertions, 39 deletions
diff --git a/org.eclipse.mylyn.trac.tests/pom.xml b/org.eclipse.mylyn.trac.tests/pom.xml index a941824b8..13657065a 100644 --- a/org.eclipse.mylyn.trac.tests/pom.xml +++ b/org.eclipse.mylyn.trac.tests/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>org.eclipse.mylyn.tasks-parent</artifactId> @@ -12,19 +12,20 @@ <version>3.7.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> - <test.suite>${project.artifactId}.AllTracTests</test.suite> + <test.suite>${project.artifactId}.AllTracTests</test.suite> </properties> <build> <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <testSuite>${project.artifactId}</testSuite> - <testClass>${test.suite}</testClass> - </configuration> - </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <skip>${test.component.skip}</skip> + <testSuite>${project.artifactId}</testSuite> + <testClass>${test.suite}</testClass> + </configuration> + </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-source-plugin</artifactId> diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java index 646c2e038..90206e93f 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java @@ -14,8 +14,8 @@ package org.eclipse.mylyn.trac.tests; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil; import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version; -import org.eclipse.mylyn.tests.util.TestUtil; import org.eclipse.mylyn.trac.tests.client.TracClientFactoryTest; import org.eclipse.mylyn.trac.tests.client.TracClientProxyTest; import org.eclipse.mylyn.trac.tests.client.TracClientTest; @@ -32,11 +32,11 @@ import org.eclipse.mylyn.trac.tests.support.TracFixture; public class AllTracHeadlessStandaloneTests { public static Test suite() { - return suite(TestUtil.runHeartbeatTestsOnly()); + return suite(false, CommonTestUtil.runHeartbeatTestsOnly()); } - public static Test suite(boolean defaultOnly) { - TestSuite suite = new TestSuite("Headless Standalone Tests for org.eclipse.mylyn.trac.tests"); + public static Test suite(boolean localOnly, boolean defaultOnly) { + TestSuite suite = new TestSuite(AllTracHeadlessStandaloneTests.class.getName()); // client tests suite.addTestSuite(TracSearchTest.class); suite.addTestSuite(TracTicketTest.class); @@ -44,19 +44,21 @@ public class AllTracHeadlessStandaloneTests { suite.addTestSuite(TracClientProxyTest.class); // core tests suite.addTestSuite(TracClientManagerTest.class); - if (defaultOnly) { - addTests(suite, TracFixture.DEFAULT); - } else { - // network tests - for (TracFixture fixture : TracFixture.ALL) { - addTests(suite, fixture); - } - // validation tests - for (TracFixture fixture : TracFixture.MISC) { - fixture.createSuite(suite); - fixture.add(TracClientFactoryTest.class); - fixture.add(TracClientTest.class); - fixture.done(); + // network tests + if (!localOnly) { + if (defaultOnly) { + addTests(suite, TracFixture.DEFAULT); + } else { + for (TracFixture fixture : TracFixture.ALL) { + addTests(suite, fixture); + } + // validation tests + for (TracFixture fixture : TracFixture.MISC) { + fixture.createSuite(suite); + fixture.add(TracClientFactoryTest.class); + fixture.add(TracClientTest.class); + fixture.done(); + } } } return suite; diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java index dcd063b3e..1cb23227c 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java @@ -14,9 +14,9 @@ package org.eclipse.mylyn.trac.tests; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil; import org.eclipse.mylyn.commons.sdk.util.ManagedTestSuite; import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version; -import org.eclipse.mylyn.tests.util.TestUtil; import org.eclipse.mylyn.trac.tests.core.TracAttachmentHandlerTest; import org.eclipse.mylyn.trac.tests.core.TracRepositoryConnectorTest; import org.eclipse.mylyn.trac.tests.core.TracRepositoryConnectorWebTest; @@ -35,29 +35,38 @@ public class AllTracTests { public static Test suite() { TestSuite suite = new ManagedTestSuite(AllTracTests.class.getName()); - addTests(TestUtil.runHeartbeatTestsOnly(), suite); + addTests(false, CommonTestUtil.runHeartbeatTestsOnly(), suite); return suite; } public static Test suite(boolean defaultOnly) { TestSuite suite = new TestSuite(AllTracTests.class.getName()); - addTests(defaultOnly, suite); + addTests(false, defaultOnly, suite); return suite; } - private static void addTests(boolean defaultOnly, TestSuite suite) { - suite.addTest(AllTracHeadlessStandaloneTests.suite(defaultOnly)); + public static Test localSuite() { + TestSuite suite = new TestSuite(AllTracTests.class.getName()); + addTests(true, CommonTestUtil.runHeartbeatTestsOnly(), suite); + return suite; + } + + private static void addTests(boolean localOnly, boolean defaultOnly, TestSuite suite) { + suite.addTest(AllTracHeadlessStandaloneTests.suite(localOnly, defaultOnly)); suite.addTestSuite(TracUtilTest.class); suite.addTestSuite(TracRepositoryQueryTest.class); // XXX fails when run from continuous build: suite.addTestSuite(TracTaskEditorTest.class); suite.addTestSuite(TracRepositorySettingsPageTest.class); suite.addTestSuite(TracHyperlinkUtilTest.class); - // network tests - if (defaultOnly) { - addTests(suite, TracFixture.DEFAULT); - } else { - for (TracFixture fixture : TracFixture.ALL) { - addTests(suite, fixture); + + if (!localOnly) { + // network tests + if (defaultOnly) { + addTests(suite, TracFixture.DEFAULT); + } else { + for (TracFixture fixture : TracFixture.ALL) { + addTests(suite, fixture); + } } } } |