Skip to content

Commit 6d79cf9

Browse files
ahornaceVladimir Kotal
authored andcommitted
Remove unnecessary @ConditionalRunRepeatable annotation (#2102)
1 parent 3ea9da5 commit 6d79cf9

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

test/org/opensolaris/opengrok/configuration/messages/RepositoryMessageTest.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@
3232
import org.junit.Rule;
3333
import org.junit.Test;
3434
import org.opensolaris.opengrok.condition.ConditionalRun;
35-
import org.opensolaris.opengrok.condition.ConditionalRunRepeatable;
3635
import org.opensolaris.opengrok.condition.ConditionalRunRule;
3736
import org.opensolaris.opengrok.condition.CtagsInstalled;
3837
import org.opensolaris.opengrok.condition.RepositoryInstalled;
3938
import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
4039
import org.opensolaris.opengrok.history.HistoryGuru;
4140
import org.opensolaris.opengrok.history.MercurialRepositoryTest;
4241
import org.opensolaris.opengrok.history.RepositoryFactory;
43-
import org.opensolaris.opengrok.history.RepositoryInfo;
4442
import org.opensolaris.opengrok.index.Indexer;
4543
import org.opensolaris.opengrok.util.TestRepository;
4644

@@ -49,16 +47,14 @@
4947
*
5048
* @author Vladimir Kotal
5149
*/
52-
@ConditionalRunRepeatable({
53-
@ConditionalRun(RepositoryInstalled.MercurialInstalled.class),
54-
@ConditionalRun(RepositoryInstalled.GitInstalled.class),
55-
@ConditionalRun(CtagsInstalled.class)
56-
})
50+
@ConditionalRun(RepositoryInstalled.MercurialInstalled.class)
51+
@ConditionalRun(RepositoryInstalled.GitInstalled.class)
52+
@ConditionalRun(CtagsInstalled.class)
5753
public class RepositoryMessageTest {
5854

59-
RuntimeEnvironment env;
55+
private RuntimeEnvironment env;
6056

61-
private static TestRepository repository = new TestRepository();
57+
private TestRepository repository;
6258

6359
@Rule
6460
public ConditionalRunRule rule = new ConditionalRunRule();
@@ -84,7 +80,7 @@ public void tearDown() {
8480

8581
// This should match Configuration constructor.
8682
env.setProjects(new ConcurrentHashMap<>());
87-
env.setRepositories(new ArrayList<RepositoryInfo>());
83+
env.setRepositories(new ArrayList<>());
8884
env.getProjectRepositoriesMap().clear();
8985
}
9086

0 commit comments

Comments
 (0)