Loosen testBug164791 as result tested is too specific

Signed-off-by: Rob Stryker <[email protected]>

Author: robstryker

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

@@ -21,6 +21,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
+import junit.framework.AssertionFailedError;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -910,6 +911,21 @@ protected void assertSearchResults(String expected) {
 	protected void assertSearchResults(String expected, JavaSearchResultCollector collector) {
 		assertSearchResults("Unexpected search results", expected, collector);
 	}
+
+	protected void assertSearchResultsWithAlternate(String expected1, String expected2, JavaSearchResultCollector collector) {
+		AssertionFailedError afe = null;
+		try {
+			assertSearchResults(expected1,collector);
+		} catch(AssertionFailedError afe2) {
+			afe = afe2;
+			try {
+				assertSearchResults(expected2,collector);
+			} catch(AssertionFailedError afe3) {
+				throw afe;
+			}
+		}
+	}
+
 	protected void assertSearchResults(String message, String expected, JavaSearchResultCollector collector) {
 		String actual = Arrays.stream(collector.toString().split("\n"))
 			.sorted()

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

@@ -8606,11 +8606,11 @@ public void acceptSearchMatch(SearchMatch searchMatch) throws CoreException {
 	};
 	collector.showAccuracy(true);
 	search(type, REFERENCES, getJavaSearchScope(), collector);
-	assertSearchResults(
-		"lib/b164791.jar test.<anonymous> EXACT_MATCH\n" +
-		"lib/b164791.jar test.<anonymous> EXACT_MATCH",
-		collector
-	);
+	String expected1 = "lib/b164791.jar test.<anonymous> EXACT_MATCH\n" +
+			"lib/b164791.jar test.<anonymous> EXACT_MATCH";
+	String expected2 = "lib/b164791.jar test.<anonymous> EXACT_MATCH\n" +
+			"lib/b164791.jar test.Test EXACT_MATCH";
+	assertSearchResultsWithAlternate(expected1, expected2, collector);
 }
 
 /**