summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-04-13 07:06:07 (EDT)
committer Steffen Pingel2013-04-13 07:59:54 (EDT)
commit45a95cd4531be12035397491cefe60498a3ce624 (patch)
treee031852bb7a6f838871bb03e03afd2b3b4a5ba52
parent58c0a7e0efca162c7ea9d5fa13a963e285d85e00 (diff)
downloadorg.eclipse.mylyn.tasks-45a95cd4531be12035397491cefe60498a3ce624.zip
org.eclipse.mylyn.tasks-45a95cd4531be12035397491cefe60498a3ce624.tar.gz
org.eclipse.mylyn.tasks-45a95cd4531be12035397491cefe60498a3ce624.tar.bz2
fix JUnit version constraintrefs/changes/82/11882/1
-rw-r--r--org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestCleanupUtil.java30
2 files changed, 20 insertions, 12 deletions
diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
index 7ff08a4..cec7806 100644
--- a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Mylyn Trac Connector Tests
Bundle-SymbolicName: org.eclipse.mylyn.trac.tests;singleton:=true
Bundle-Version: 3.9.0.qualifier
-Require-Bundle: org.junit;bundle-version="4.8.2",
+Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.core.runtime,
org.eclipse.jface.text,
org.eclipse.search,
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestCleanupUtil.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestCleanupUtil.java
index 39b9424..f437ed5 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestCleanupUtil.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestCleanupUtil.java
@@ -32,28 +32,36 @@ import org.junit.runners.Parameterized.Parameters;
*
* @author Steffen Pingel
*/
-@RunWith(Parameterized.class)
public class TracTestCleanupUtil extends TestCase {
- private final TracFixture fixture;
+ @RunWith(Parameterized.class)
+ public static class TracTestCleanupUtil4 extends TracTestCleanupUtil {
- @Parameters(name = "{1}")
- public static Iterable<Object[]> data() {
- List<TracFixture> fixtures = TestConfiguration.getDefault().discover(TracFixture.class, "trac");
- List<Object[]> data = new ArrayList<Object[]>(fixtures.size());
- for (TracFixture fixture : fixtures) {
- data.add(new Object[] { fixture, fixture.getInfo() });
+ public TracTestCleanupUtil4(TracFixture fixture, String name) {
+ super(name);
+ setFixture(fixture);
}
- return data;
+
+ @Parameters(name = "{1}")
+ public static Iterable<Object[]> data() {
+ List<TracFixture> fixtures = TestConfiguration.getDefault().discover(TracFixture.class, "trac");
+ List<Object[]> data = new ArrayList<Object[]>(fixtures.size());
+ for (TracFixture fixture : fixtures) {
+ data.add(new Object[] { fixture, fixture.getInfo() });
+ }
+ return data;
+ }
+
}
+ private TracFixture fixture;
+
public TracTestCleanupUtil(String name) {
super(name);
this.fixture = TracFixture.current();
}
- public TracTestCleanupUtil(TracFixture fixture, String name) {
- super(name);
+ protected void setFixture(TracFixture fixture) {
this.fixture = fixture;
}