Restore comparing search level

Author: mickaelistria

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaSearchGenericTests.java

@@ -74,18 +74,11 @@ protected void assertSearchResults(String message, String expected, JavaSearchRe
 			System.out.print(displayString(actual, this.tabs));
 			System.out.println("");
 		}
-
-		String prop = System.getProperty("AbstractJavaSearchTests.IGNORE_MATCH_TYPE");
-		prop = "true";
-		if( prop != null && prop.toString().equalsIgnoreCase("true")) {
-			assertEqualsIgnoreMatchType(message, trimmed, actual);
-		} else {
-			assertEquals(
-				message,
-				expected,
-				actual
-			);
-		}
+		assertEquals(
+			message,
+			trimmed,
+			actual
+		);
 	}
 
 	/* (non-Javadoc)

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaSearchTests.java

@@ -955,39 +955,13 @@ protected void assertSearchResults(String message, String expected, JavaSearchRe
 				}
 			}
 		}
-
-		String prop = System.getProperty("AbstractJavaSearchTests.IGNORE_MATCH_TYPE");
-		prop = "true";
-		if( prop != null && prop.toString().equalsIgnoreCase("true")) {
-			assertEqualsIgnoreMatchType(message, expected, actual);
-		} else {
-			assertEquals(
-				message,
-				expected,
-				actual
-			);
-		}
+		assertEquals(
+			message,
+			expected,
+			actual
+		);
 	}
 
-	protected void assertEqualsIgnoreMatchType(String message, String expected, String actual) {
-		expected = expected.replaceAll("EXACT_RAW_MATCH", "");
-		expected = expected.replaceAll("ERASURE_RAW_MATCH", "");
-		expected = expected.replaceAll("EQUIVALENT_RAW_MATCH", "");
-		expected = expected.replaceAll("POTENTIAL_MATCH", "");
-		expected = expected.replaceAll("EXACT_MATCH", "");
-		expected = expected.replaceAll("ERASURE_MATCH", "");
-		expected = expected.replaceAll("EQUIVALENT_MATCH", "");
-
-		actual = actual.replaceAll("EXACT_RAW_MATCH", "");
-		actual = actual.replaceAll("ERASURE_RAW_MATCH", "");
-		actual = actual.replaceAll("EQUIVALENT_RAW_MATCH", "");
-		actual = actual.replaceAll("POTENTIAL_MATCH", "");
-		actual = actual.replaceAll("EXACT_MATCH", "");
-		actual = actual.replaceAll("ERASURE_MATCH", "");
-		actual = actual.replaceAll("EQUIVALENT_MATCH", "");
-
-		assertEquals(message, expected, actual);
-	}
 	/* (non-Javadoc)
 	 * @see org.eclipse.jdt.core.tests.model.AbstractJavaModelTests#copyDirectory(java.io.File, java.io.File)
 	 */