fix for bug 58311

2 files changed, 23 insertions, 4 deletions

diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java
index f07690f8f6a..3741a6d3752 100644
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java
+++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java
@@ -19,15 +19,11 @@ import org.eclipse.search.internal.core.text.TextSearchScope;
 import org.eclipse.search.internal.ui.text.FileSearchQuery;
 import org.eclipse.search.ui.NewSearchUI;
 import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
 
 public class ResultUpdaterTest extends TestCase {
 	FileSearchQuery fQuery1;
 	FileSearchQuery fQuery2;
 
-	private AnnotationTypeLookup fAnnotationTypeLookup= EditorsUI.getAnnotationTypeLookup();
-
 	public ResultUpdaterTest(String name) {
 		super(name);
 	}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java
index bf32c53eb70..91e32fde6a0 100644
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java
+++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java
@@ -14,6 +14,7 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.search.internal.core.text.TextSearchScope;
 import org.eclipse.search.internal.ui.text.FileSearchPage;
 import org.eclipse.search.internal.ui.text.FileSearchQuery;
@@ -23,6 +24,7 @@ import org.eclipse.search.ui.text.AbstractTextSearchResult;
 import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
 import org.eclipse.search.ui.text.Match;
 import org.eclipse.swt.widgets.Item;
+import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Widget;
 
 public class SearchResultPageTest extends TestCase {
@@ -98,4 +100,25 @@ public class SearchResultPageTest extends TestCase {
 		assertTrue(itemCount > 0);
 		assertTrue(item.getText().indexOf(String.valueOf(itemCount)) >= 0);
 	}
+	
+	public void testTableNavigation() {
+		ISearchResultViewPart view= NewSearchUI.activateSearchResultView();
+		NewSearchUI.runQueryInForeground(null, fQuery1);
+		FileSearchPage page= (FileSearchPage) view.getActivePage();
+		page.setLayout(AbstractTextSearchViewPage.FLAG_LAYOUT_FLAT);
+		Table table= ((TableViewer) page.getViewer()).getTable();
+		
+		// select the first element.
+		table.setSelection(0);
+		
+		// back from first match, goto last
+		page.gotoPreviousMatch();
+		assertEquals(1, table.getSelectionCount());
+		assertEquals(table.getItemCount()-1, table.getSelectionIndex());
+
+		// and forward again, to the first match.
+		page.gotoNextMatch();
+		assertEquals(1, table.getSelectionCount());
+		assertEquals(0, table.getSelectionIndex());
+}
 }
\ No newline at end of file