Fixed bug 391433: [JUnit] Remove JUnit 3 from Eclipsev20130207-123039

2 files changed, 3 insertions, 12 deletions

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/BaseImportTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/BaseImportTestCase.java
index b096e97cf8..df046468a3 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/BaseImportTestCase.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/BaseImportTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,8 +43,8 @@ public abstract class BaseImportTestCase extends PDETestCase {
 		doSingleImport("org.eclipse.pde.source", false);
 	}
 	
-	public void testImportJUnit3() {
-		doSingleImport("org.junit", 3, true);
+	public void testImportJUnit4() {
+		doSingleImport("org.junit", 4, true);
 	}
 	
 	public void testImportICU(){
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/PluginRegistryTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/PluginRegistryTests.java
index 4d44c4e9c9..11e07c8754 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/PluginRegistryTests.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/PluginRegistryTests.java
@@ -144,15 +144,6 @@ public class PluginRegistryTests extends TestCase {
 		assertEquals("org.eclipse.pde.core", models[0].getPluginBase().getId());
 	}
 	
-	public void testMutliMatches() {
-		// Expected Junit versions are 3.8.x and 4.8.x
-		IPluginModelBase[] models = PluginRegistry.findModels("org.junit", new VersionRange("[3.8.2,5.0.0)"), null);
-		assertNotNull(models);
-		assertEquals(2, models.length);
-		assertEquals("org.junit", models[0].getPluginBase().getId());
-		assertEquals("org.junit", models[1].getPluginBase().getId());
-	}
-	
 	public void testWorkspaceOverTarget() throws CoreException {
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("org.junit");
 		try {