Uncomment but Ignore SearchEngineTest.testSearch()

Author: idodeclare

opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchEngineTest.java

@@ -24,31 +24,36 @@
 
 package org.opengrok.indexer.search;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.TreeSet;
-import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.history.HistoryGuru;
+import org.opengrok.indexer.history.RepositoryFactory;
 import org.opengrok.indexer.index.Indexer;
 import org.opengrok.indexer.util.TestRepository;
 
-import static org.junit.Assert.*;
-import org.opengrok.indexer.history.RepositoryFactory;
-
 /**
  * Do basic testing of the SearchEngine
  *
  * @author Trond Norbye
  */
 public class SearchEngineTest {
 
-    static TestRepository repository;
-    static File configFile;
+    private static TestRepository repository;
+    private static File configFile;
 
     @BeforeClass
     public static void setUpClass() throws Exception {
@@ -75,19 +80,11 @@ public static void setUpClass() throws Exception {
     }
 
     @AfterClass
-    public static void tearDownClass() throws Exception {
+    public static void tearDownClass() {
         repository.destroy();
         configFile.delete();
     }
 
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     @Test
     public void testIsValidQuery() {
         SearchEngine instance = new SearchEngine();
@@ -142,7 +139,7 @@ public void testSymbol() {
     }
 
     @Test
-    public void testGetQuery() throws Exception {
+    public void testGetQuery() {
         SearchEngine instance = new SearchEngine();
         instance.setHistory("Once upon a time");
         instance.setFile("Makefile");
@@ -154,8 +151,8 @@ public void testGetQuery() throws Exception {
                 instance.getQuery());
     }
 
-    /* see https://github.com/oracle/opengrok/issues/2030
     @Test
+    @Ignore("See https://github.com/oracle/opengrok/issues/2030")
     public void testSearch() {
         List<Hit> hits = new ArrayList<>();
 
@@ -282,5 +279,4 @@ public void testSearch() {
         assertEquals(1, instance.search());
         instance.destroy();
     }
-    */
 }