refactor search tests

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/MockPossibleMatch.java

@@ -19,6 +19,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.util.List;
+
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
@@ -28,13 +30,10 @@
 import org.eclipse.jdt.core.IMethod;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.groovy.tests.MockSearchRequestor;
-import org.eclipse.jdt.core.groovy.tests.SimpleProgressMonitor;
 import org.eclipse.jdt.core.search.IJavaSearchConstants;
 import org.eclipse.jdt.core.search.IJavaSearchScope;
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchParticipant;
 import org.eclipse.jdt.core.search.SearchPattern;
 import org.eclipse.jdt.internal.core.BinaryMember;
 import org.junit.After;
@@ -100,8 +99,6 @@ public void setUp() throws Exception {
         env.addEntry(project.getFullPath(), JavaCore.newLibraryEntry(libDir.append("binGroovySearch.jar"), libDir.append("binGroovySearchSrc.zip"), null));
 
         javaProject = env.getJavaProject(project.getName());
-        waitForIndexer(javaProject);
-
         // overwrite the contents vars with the actual contents
         groovyClassContents = javaProject.findType("pack.AGroovyClass").getTypeRoot().getBuffer().getContents();
         groovyClassContents2 = javaProject.findType("pack.AnotherGroovyClass").getTypeRoot().getBuffer().getContents();
@@ -112,38 +109,32 @@ public void tearDown() throws Exception {
         javaProject = null;
     }
 
-    private MockSearchRequestor performSearch(IJavaElement toSearchFor) throws Exception {
-        assertTrue("Expected binary member, but got: " + toSearchFor == null ? null : toSearchFor.getClass().getName(), toSearchFor instanceof BinaryMember);
-
-        SearchPattern pattern = SearchPattern.createPattern(toSearchFor, IJavaSearchConstants.REFERENCES);
-        SearchParticipant participant = SearchEngine.getDefaultSearchParticipant();
+    private List<SearchMatch> performSearch(final IJavaElement javaElement) throws Exception {
+        assertTrue("Expected binary member, but got: " + javaElement == null ? null : javaElement.getClass().getName(), javaElement instanceof BinaryMember);
+        SearchPattern pattern  = SearchPattern.createPattern(javaElement, IJavaSearchConstants.REFERENCES);
         IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] {javaProject});
-        MockSearchRequestor requestor = new MockSearchRequestor();
-        SimpleProgressMonitor monitor = new SimpleProgressMonitor("Search in project binaries");
-
-        new SearchEngine().search(pattern, new SearchParticipant[] {participant}, scope, requestor, monitor);
-        monitor.waitForCompletion(10);
-        return requestor;
+        return search(pattern, scope);
     }
 
-    private void assertMatches(String toFind, MockSearchRequestor requestor, int allMatches, int firstMatches) {
-        if (requestor.getMatches().size() != allMatches) {
-            fail("Expecting " + allMatches + " matches, but found " + requestor.getMatches().size() + "\n" + requestor.printMatches());
+    private void assertMatches(final String toFind, final List<SearchMatch> matches, final int allMatches, final int firstMatches) {
+        String matchesString = toString(matches);
+        if (matches.size() != allMatches) {
+            fail("Expecting " + allMatches + " matches, but found " + matches.size() + "\n" + matchesString);
         }
         int currIndex = groovyClassContents.indexOf("def doit") + "def doit".length();
         for (int i = 0; i < firstMatches; i += 1) {
-            SearchMatch match = requestor.getMatches().get(i);
+            SearchMatch match = matches.get(i);
             currIndex = groovyClassContents.indexOf(toFind, currIndex);
-            assertEquals("Invalid start position in match " + i + "\n" + requestor.printMatches(), currIndex, match.getOffset());
-            assertEquals("Invalid length in match " + i + "\n" + requestor.printMatches(), toFind.length(), match.getLength());
+            assertEquals("Invalid start position in match " + i + "\n" + matchesString, currIndex, match.getOffset());
+            assertEquals("Invalid length in match " + i + "\n" + matchesString, toFind.length(), match.getLength());
             currIndex += toFind.length();
         }
         currIndex = groovyClassContents2.indexOf("def doit") + "def doit".length();
         for (int i = firstMatches; i < allMatches; i += 1) {
-            SearchMatch match = requestor.getMatches().get(i);
+            SearchMatch match = matches.get(i);
             currIndex = groovyClassContents2.indexOf(toFind, currIndex);
-            assertEquals("Invalid start position in match " + i + "\n" + requestor.printMatches(), currIndex, match.getOffset());
-            assertEquals("Invalid length in match " + i + "\n" + requestor.printMatches(), toFind.length(), match.getLength());
+            assertEquals("Invalid start position in match " + i + "\n" + matchesString, currIndex, match.getOffset());
+            assertEquals("Invalid length in match " + i + "\n" + matchesString, toFind.length(), match.getLength());
             currIndex += toFind.length();
         }
     }
@@ -153,59 +144,52 @@ private void assertMatches(String toFind, MockSearchRequestor requestor, int all
     @Test
     public void testClassDecl1() throws Exception {
         IType type = javaProject.findType("pack.AGroovyClass");
-        MockSearchRequestor requestor = performSearch(type);
-        assertMatches("AGroovyClass", requestor, 12, 2);
+        assertMatches("AGroovyClass", performSearch(type), 12, 2);
     }
 
     @Test
     public void testClassDecl2() throws Exception {
         IType type = javaProject.findType("pack.OtherClass");
-        MockSearchRequestor requestor = performSearch(type);
-        assertMatches("OtherClass", requestor, 4, 2);
+        assertMatches("OtherClass", performSearch(type), 4, 2);
     }
 
     @Test
     public void testFieldDecl1() throws Exception {
         IType type = javaProject.findType("pack.AGroovyClass");
         String toFind = "age_1";
         IField field = type.getField(toFind);
-        MockSearchRequestor requestor = performSearch(field);
-        assertMatches(toFind, requestor, 2, 2); // all was 4, but in binary synthetic accessor is indistinguishable from source method
+        assertMatches(toFind, performSearch(field), 2, 2); // all was 4, but in binary synthetic accessor is indistinguishable from source method
     }
 
     @Test
     public void testFieldDecl2() throws Exception {
         IType type = javaProject.findType("pack.AGroovyClass");
         String toFind = "name_1";
         IField field = type.getField(toFind);
-        MockSearchRequestor requestor = performSearch(field);
-        assertMatches(toFind, requestor, 2, 2); // all was 4, but in binary synthetic accessor is indistinguishable from source method
+        assertMatches(toFind, performSearch(field), 2, 2); // all was 4, but in binary synthetic accessor is indistinguishable from source method
     }
 
     @Test
     public void testMethodDecl() throws Exception {
         IType type = javaProject.findType("pack.AGroovyClass");
         String toFind = "doit";
         IMethod method = type.getMethod(toFind, new String[0]);
-        MockSearchRequestor requestor = performSearch(method);
-        assertMatches(toFind, requestor, 4, 2);
+        assertMatches(toFind, performSearch(method), 4, 2);
     }
 
     @Test
     public void testFieldRefInInitializer() throws Exception {
         IType type = javaProject.findType("pack.AGroovyClass");
         String toFind = "fieldInInitializer";
         IField method = type.getField(toFind);
-        MockSearchRequestor requestor = performSearch(method);
-        assertMatches(toFind, requestor, 1, 1); // all was 2, but in binary synthetic accessor is indistinguishable from source method
+        assertMatches(toFind, performSearch(method), 1, 1); // all was 2, but in binary synthetic accessor is indistinguishable from source method
     }
 
     @Test
     public void testMethodRefInInitializer() throws Exception {
         IType type = javaProject.findType("pack.AGroovyClass");
         String toFind = "referencedInInitializer";
         IMethod method = type.getMethod(toFind, new String[0]);
-        MockSearchRequestor requestor = performSearch(method);
-        assertMatches(toFind, requestor, 2, 1);
+        assertMatches(toFind, performSearch(method), 2, 1);
     }
 }

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/MockSearchRequestor.java

@@ -25,13 +25,9 @@
 import org.codehaus.jdt.groovy.model.GroovyCompilationUnit;
 import org.eclipse.jdt.core.IMethod;
 import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.groovy.tests.MockPossibleMatch;
 import org.eclipse.jdt.core.search.IJavaSearchConstants;
 import org.eclipse.jdt.core.search.SearchMatch;
 import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.groovy.search.ITypeRequestor;
-import org.eclipse.jdt.groovy.search.TypeInferencingVisitorWithRequestor;
-import org.eclipse.jdt.groovy.search.TypeRequestorFactory;
 import org.junit.Test;
 
 /**
@@ -143,41 +139,33 @@ public void testCategorySearch6() throws Exception {
         doCategorySearchTest(NO_CATEGORY, 0);
     }
 
-    void doCategorySearchTest(String contents, int numMatches) throws JavaModelException {
+    //--------------------------------------------------------------------------
+
+    private void doCategorySearchTest(final String contents, final int numMatches) throws JavaModelException {
         checkMatches(findMatches(contents), numMatches, contents);
     }
 
-    List<SearchMatch> findMatches(String contents) throws JavaModelException {
+    private List<SearchMatch> findMatches(final String contents) throws JavaModelException {
         GroovyCompilationUnit catUnit = createUnit("Cat", CATEGORY_DEFN);
         GroovyCompilationUnit unit = createUnit("Other", contents);
         expectingNoProblems();
 
-        MockPossibleMatch match = new MockPossibleMatch(unit);
         IMethod searchFor = (IMethod) catUnit.getElementAt(CATEGORY_DEFN.indexOf("doNothing"));
         assertEquals("Wrong IJavaElement found: " + searchFor, "doNothing", searchFor.getElementName());
-        SearchPattern pattern = SearchPattern.createPattern(searchFor, IJavaSearchConstants.REFERENCES);
-        ITypeRequestor typeRequestor = new TypeRequestorFactory().createRequestor(match, pattern, searchRequestor);
-        TypeInferencingVisitorWithRequestor visitor = factory.createVisitor(match);
-        visitor.visitCompilationUnit(typeRequestor);
-
-        System.out.println("Matches found:\n" + searchRequestor.printMatches());
-
-        return searchRequestor.getMatches();
+        return search(SearchPattern.createPattern(searchFor, IJavaSearchConstants.REFERENCES), unit);
     }
 
-    void checkMatches(List<SearchMatch> matches, int numExpected, String contents) {
-        assertEquals("Wrong number matches found:\n" + searchRequestor.printMatches(), numExpected, matches.size());
-        if (numExpected == 0) {
-            return;
-        }
-
-        Pattern p = Pattern.compile("doNothing");
-        Matcher m = p.matcher(contents);
-        Iterator<SearchMatch> matchIter = matches.iterator();
-        while (m.find()) {
-            SearchMatch match = matchIter.next();
-            assertEquals("Wrong starting location for " + MockPossibleMatch.printMatch(match), m.start(), match.getOffset());
-            assertEquals("Wrong length for " + MockPossibleMatch.printMatch(match), "doNothing".length(), match.getLength());
+    private void checkMatches(final List<SearchMatch> matches, final int nExpected, final String contents) {
+        assertEquals("Wrong number of matches found:\n" + toString(matches), nExpected, matches.size());
+        if (nExpected > 0) {
+            Iterator<SearchMatch> it = matches.iterator();
+            Pattern p = Pattern.compile("doNothing");
+            Matcher m = p.matcher(contents);
+            while (m.find()) {
+                SearchMatch match = it.next();
+                assertEquals("Wrong starting location for " + toString(match), m.start(), match.getOffset());
+                assertEquals("Wrong length for " + toString(match), "doNothing".length(), match.getLength());
+            }
         }
     }
 }

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/BinarySearchTests.java

@@ -27,7 +27,6 @@
 import org.eclipse.jdt.core.search.IJavaSearchConstants;
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchParticipant;
 import org.eclipse.jdt.core.search.SearchPattern;
 import org.junit.Test;
 
@@ -515,12 +514,8 @@ public void testNewifyConstructorReferences4() throws Exception {
 
     //--------------------------------------------------------------------------
 
-    List<SearchMatch> searchForReferences(final IMethod method) throws CoreException {
-        new SearchEngine().search(
-            SearchPattern.createPattern(method, IJavaSearchConstants.REFERENCES),
-            new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-            SearchEngine.createJavaSearchScope(new IJavaElement[] {JavaCore.create(project)}, false),
-            searchRequestor, null);
-        return searchRequestor.getMatches();
+    private List<SearchMatch> searchForReferences(final IMethod method) throws CoreException {
+        return search(SearchPattern.createPattern(method, IJavaSearchConstants.REFERENCES),
+            SearchEngine.createJavaSearchScope(new IJavaElement[] {JavaCore.create(project)}));
     }
 }