Retire CtagsInstalled check. ctags is fundamental to OpenGrok.

Author: idodeclare

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/CtagsTest.java

@@ -29,26 +29,18 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.util.TestRepository;
 
 /**
  *
  * @author Lubos Kosco
  */
-@ConditionalRun(CtagsInstalled.class)
 public class CtagsTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     @BeforeClass
     public static void setUpClass() throws Exception {
         ctags = new Ctags();

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/JFlexXrefTest.java

@@ -39,7 +39,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.opengrok.indexer.analysis.c.CXref;
 import org.opengrok.indexer.analysis.c.CxxXref;
@@ -58,9 +57,7 @@
 import org.opengrok.indexer.analysis.sql.SQLXref;
 import org.opengrok.indexer.analysis.tcl.TclXref;
 import org.opengrok.indexer.analysis.uue.UuencodeXref;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
+
 import static org.opengrok.indexer.util.CustomAssertions.assertLinesEqual;
 import org.opengrok.indexer.util.TestRepository;
 import org.xml.sax.InputSource;
@@ -73,9 +70,6 @@ public class JFlexXrefTest {
     private static Ctags ctags;
     private static TestRepository repository;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     /**
      * This is what we expect to find at the beginning of the first line
      * returned by an xref.
@@ -165,7 +159,6 @@ private void bug15890LineCount(JFlexNonXref xref) throws Exception {
      * used to cause trouble.
      */
     @Test
-    @ConditionalRun(CtagsInstalled.class)
     public void testBug15890Anchor() throws Exception {
         bug15890Anchor(CXref.class, "c/bug15890.c");
         bug15890Anchor(CxxXref.class, "c/bug15890.c");
@@ -383,7 +376,6 @@ public void testEmptyJavaComment() throws IOException {
     }
 
     @Test
-    @ConditionalRun(CtagsInstalled.class)
     public void bug18586() throws IOException, InterruptedException {
         String filename = repository.getSourceRoot() + "/sql/bug18586.sql";
         Reader in = new InputStreamReader(new FileInputStream(filename), "UTF-8");
@@ -398,7 +390,6 @@ public void bug18586() throws IOException, InterruptedException {
      * This originally became a problem after upgrade to JFlex 1.5.0.
      */
     @Test
-    @ConditionalRun(CtagsInstalled.class)
     public void unterminatedHeredoc() throws IOException {
         JFlexXref xref = new JFlexXref(new ShXref(new StringReader(
                 "cat << EOF\nunterminated heredoc")));

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CAnalyzerFactoryTest.java

@@ -40,16 +40,12 @@
 import org.apache.lucene.index.IndexableField;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.opengrok.indexer.analysis.AbstractAnalyzer;
 import org.opengrok.indexer.analysis.Ctags;
 import org.opengrok.indexer.analysis.Scopes;
 import org.opengrok.indexer.analysis.Scopes.Scope;
 import org.opengrok.indexer.analysis.StreamSource;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.search.QueryBuilder;
 import org.opengrok.indexer.util.TestRepository;
@@ -58,16 +54,12 @@
  *
  * @author Tomas Kotal
  */
-@ConditionalRun(CtagsInstalled.class)
 public class CAnalyzerFactoryTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
     private static AbstractAnalyzer analyzer;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     private static StreamSource getStreamSource(final String fname) {
         return new StreamSource() {
             @Override

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CxxAnalyzerFactoryTest.java

@@ -40,16 +40,12 @@
 import org.apache.lucene.index.IndexableField;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.opengrok.indexer.analysis.AbstractAnalyzer;
 import org.opengrok.indexer.analysis.Ctags;
 import org.opengrok.indexer.analysis.Scopes;
 import org.opengrok.indexer.analysis.Scopes.Scope;
 import org.opengrok.indexer.analysis.StreamSource;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.search.QueryBuilder;
 import org.opengrok.indexer.util.TestRepository;
@@ -58,16 +54,12 @@
  *
  * @author Tomas Kotal
  */
-@ConditionalRun(CtagsInstalled.class)
 public class CxxAnalyzerFactoryTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
     private static AbstractAnalyzer analyzer;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     private static StreamSource getStreamSource(final String fname) {
         return new StreamSource() {
             @Override

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/clojure/ClojureAnalyzerFactoryTest.java

@@ -27,15 +27,11 @@
 import org.apache.lucene.document.Field;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.opengrok.indexer.analysis.AbstractAnalyzer;
 import org.opengrok.indexer.analysis.Ctags;
 import org.opengrok.indexer.analysis.Definitions;
 import org.opengrok.indexer.analysis.StreamSource;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.search.QueryBuilder;
 import org.opengrok.indexer.util.TestRepository;
@@ -55,16 +51,12 @@
 /**
  * @author Farid Zakaria
  */
-@ConditionalRun(CtagsInstalled.class)
 public class ClojureAnalyzerFactoryTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
     private static AbstractAnalyzer analyzer;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     private static StreamSource getStreamSource(final String fname) {
         return new StreamSource() {
             @Override

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/csharp/CSharpAnalyzerFactoryTest.java

@@ -33,7 +33,6 @@
 import org.apache.lucene.document.Field;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.opengrok.indexer.analysis.AnalyzerGuru.string_ft_nstored_nanalyzed_norms;
@@ -43,9 +42,6 @@
 import org.opengrok.indexer.analysis.Scopes;
 import org.opengrok.indexer.analysis.Scopes.Scope;
 import org.opengrok.indexer.analysis.StreamSource;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.search.QueryBuilder;
 import org.opengrok.indexer.util.TestRepository;
@@ -54,16 +50,12 @@
  *
  * @author Tomas Kotal
  */
-@ConditionalRun(CtagsInstalled.class)
 public class CSharpAnalyzerFactoryTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
     private static AbstractAnalyzer analyzer;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     private static StreamSource getStreamSource(final String fname) {
         return new StreamSource() {
             @Override

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/executables/JarAnalyzerTest.java

@@ -19,24 +19,19 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2018-2019, Chris Fraire <[email protected]>.
  */
 
 package org.opengrok.indexer.analysis.executables;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.TreeSet;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertTrue;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.Test;
 import org.opengrok.indexer.authorization.AuthorizationFrameworkReloadTest;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.index.Indexer;
 import org.opengrok.indexer.util.TestRepository;
@@ -51,7 +46,6 @@
  * <p>
  * Derived from Trond Norbye's {@code SearchEngineTest}
  */
-@ConditionalRun(CtagsInstalled.class)
 public class JarAnalyzerTest {
 
     private static final String TESTPLUGINS_JAR = "testplugins.jar";
@@ -61,9 +55,6 @@ public class JarAnalyzerTest {
     private static File configFile;
     private static boolean originalProjectsEnabled;
 
-    @ClassRule
-    public static ConditionalRunRule rule = new ConditionalRunRule();
-
     @BeforeClass
     public static void setUpClass() throws Exception {
         env = RuntimeEnvironment.getInstance();

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/java/JavaAnalyzerFactoryTest.java

@@ -40,16 +40,12 @@
 import org.apache.lucene.index.IndexableField;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.opengrok.indexer.analysis.AbstractAnalyzer;
 import org.opengrok.indexer.analysis.Ctags;
 import org.opengrok.indexer.analysis.Scopes;
 import org.opengrok.indexer.analysis.Scopes.Scope;
 import org.opengrok.indexer.analysis.StreamSource;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.search.QueryBuilder;
 import org.opengrok.indexer.util.TestRepository;
@@ -58,16 +54,12 @@
  *
  * @author Tomas Kotal
  */
-@ConditionalRun(CtagsInstalled.class)
 public class JavaAnalyzerFactoryTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
     private static AbstractAnalyzer analyzer;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     private static StreamSource getStreamSource(final String fname) {
         return new StreamSource() {
             @Override

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/pascal/PascalAnalyzerFactoryTest.java

@@ -37,17 +37,13 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import static org.opengrok.indexer.analysis.AnalyzerGuru.string_ft_nstored_nanalyzed_norms;
 
 import org.opengrok.indexer.analysis.AbstractAnalyzer;
 import org.opengrok.indexer.analysis.Ctags;
 import org.opengrok.indexer.analysis.Definitions;
 import org.opengrok.indexer.analysis.StreamSource;
-import org.opengrok.indexer.condition.ConditionalRun;
-import org.opengrok.indexer.condition.ConditionalRunRule;
-import org.opengrok.indexer.condition.CtagsInstalled;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.search.QueryBuilder;
 import org.opengrok.indexer.util.TestRepository;
@@ -56,16 +52,12 @@
  *
  * @author alexanthony
  */
-@ConditionalRun(CtagsInstalled.class)
 public class PascalAnalyzerFactoryTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
     private static AbstractAnalyzer analyzer;
 
-    @Rule
-    public ConditionalRunRule rule = new ConditionalRunRule();
-
     private static StreamSource getStreamSource(final String fname) {
         return new StreamSource() {
             @Override