Skip to content

Commit 547b9f9

Browse files
ahornaceVladimir Kotal
authored andcommitted
Add Ctags installed condition to suggester tests
1 parent 811d620 commit 547b9f9

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

test/org/opensolaris/opengrok/web/api/v1/controller/SuggesterControllerProjectsDisabledTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@
2626
import org.junit.AfterClass;
2727
import org.junit.Before;
2828
import org.junit.BeforeClass;
29+
import org.junit.ClassRule;
2930
import org.junit.Test;
3031
import org.opengrok.suggest.Suggester;
32+
import org.opensolaris.opengrok.condition.ConditionalRun;
33+
import org.opensolaris.opengrok.condition.ConditionalRunRule;
34+
import org.opensolaris.opengrok.condition.CtagsInstalled;
3135
import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
3236
import org.opensolaris.opengrok.configuration.SuggesterConfig;
3337
import org.opensolaris.opengrok.index.Indexer;
@@ -49,8 +53,12 @@
4953
import static org.hamcrest.Matchers.containsInAnyOrder;
5054
import static org.junit.Assert.assertThat;
5155

56+
@ConditionalRun(CtagsInstalled.class)
5257
public class SuggesterControllerProjectsDisabledTest extends JerseyTest {
5358

59+
@ClassRule
60+
public static ConditionalRunRule rule = new ConditionalRunRule();
61+
5462
private static final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
5563

5664
private static TestRepository repository;

test/org/opensolaris/opengrok/web/api/v1/controller/SuggesterControllerTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@
2727
import org.junit.AfterClass;
2828
import org.junit.Before;
2929
import org.junit.BeforeClass;
30+
import org.junit.ClassRule;
3031
import org.junit.Test;
3132
import org.opengrok.suggest.Suggester;
33+
import org.opensolaris.opengrok.condition.ConditionalRun;
34+
import org.opensolaris.opengrok.condition.ConditionalRunRule;
35+
import org.opensolaris.opengrok.condition.CtagsInstalled;
3236
import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
3337
import org.opensolaris.opengrok.configuration.SuggesterConfig;
3438
import org.opensolaris.opengrok.index.Indexer;
@@ -60,6 +64,7 @@
6064
import static org.junit.Assert.assertEquals;
6165
import static org.junit.Assert.assertThat;
6266

67+
@ConditionalRun(CtagsInstalled.class)
6368
public class SuggesterControllerTest extends JerseyTest {
6469

6570
public static class Result {
@@ -83,6 +88,9 @@ private static class TermIncrementData {
8388
public int increment;
8489
}
8590

91+
@ClassRule
92+
public static ConditionalRunRule rule = new ConditionalRunRule();
93+
8694
private static final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
8795

8896
private static final GenericType<List<Entry<String, Integer>>> popularityDataType =

0 commit comments

Comments
 (0)