From 45a95cd4531be12035397491cefe60498a3ce624 Mon Sep 17 00:00:00 2001
From: Steffen Pingel
Date: Sat, 13 Apr 2013 13:06:07 +0200
Subject: fix JUnit version constraint

Change-Id: Ief671999e0b51a387744f3f4af01790830db6a92
---
 org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF  |  2 +-
 .../trac/tests/support/TracTestCleanupUtil.java    | 30 ++++++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'org.eclipse.mylyn.trac.tests')

diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
index 7ff08a4ce..cec780655 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 39b9424dd..f437ed599 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;
 	}
 
-- 
cgit v1.2.3