Skip to content

Commit 6908b9e

Browse files
committed
address Project and add tests
1 parent b0cc945 commit 6908b9e

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Project.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,10 @@ public final void completeWithDefaults() {
574574
if (historyBasedReindex == null) {
575575
setHistoryBasedReindex(env.isHistoryBasedReindex());
576576
}
577+
578+
if (tagsEnabled == null) {
579+
setTagsEnabled(env.isTagsEnabled());
580+
}
577581
}
578582

579583
/**

opengrok-indexer/src/test/java/org/opengrok/indexer/configuration/ProjectTest.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/*
21-
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
21+
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
2222
*/
2323
package org.opengrok.indexer.configuration;
2424

@@ -149,6 +149,7 @@ void testMergeProjects1() {
149149
env.setBugPattern("([1-9][0-9]{6,7})");
150150
env.setReviewPage("http://example.com/reviewPage");
151151
env.setReviewPattern("([A-Z]{2}ARC[ \\\\/]\\\\d{4}/\\\\d{3})");
152+
env.setTagsEnabled(!new Configuration().isTagsEnabled());
152153

153154
Project p1 = new Project();
154155
assertNotNull(p1);
@@ -161,7 +162,8 @@ void testMergeProjects1() {
161162
() -> assertEquals(env.getBugPage(), p1.getBugPage()),
162163
() -> assertEquals(env.getBugPattern(), p1.getBugPattern()),
163164
() -> assertEquals(env.getReviewPage(), p1.getReviewPage()),
164-
() -> assertEquals(env.getReviewPattern(), p1.getReviewPattern())
165+
() -> assertEquals(env.getReviewPattern(), p1.getReviewPattern()),
166+
() -> assertEquals(env.isTagsEnabled(), p1.isTagsEnabled())
165167
);
166168
}
167169

@@ -205,6 +207,7 @@ void testMergeProjects2() {
205207
p1.setTabSize(new Project().getTabSize() + 9737);
206208
p1.setNavigateWindowEnabled(true);
207209
p1.setHandleRenamedFiles(true);
210+
p1.setTagsEnabled(true);
208211
final String customBugPage = "http://example.com/bugPage";
209212
p1.setBugPage(customBugPage);
210213
final String customBugPattern = "([1-9][0-1]{6,7})";
@@ -220,11 +223,12 @@ void testMergeProjects2() {
220223
() -> assertNotNull(p1),
221224
() -> assertTrue(p1.isNavigateWindowEnabled(), "Navigate window should be turned on"),
222225
() -> assertTrue(p1.isHandleRenamedFiles(), "Renamed file handling should be true"),
226+
() -> assertTrue(p1.isTagsEnabled(), "Tags should be turned on"),
223227
() -> assertEquals(new Project().getTabSize() + 9737, p1.getTabSize()),
224-
() -> assertEquals(p1.getBugPage(), customBugPage),
225-
() -> assertEquals(p1.getBugPattern(), customBugPattern),
226-
() -> assertEquals(p1.getReviewPage(), customReviewPage),
227-
() -> assertEquals(p1.getReviewPattern(), customReviewPattern)
228+
() -> assertEquals(customBugPage, p1.getBugPage()),
229+
() -> assertEquals(customBugPattern, p1.getBugPattern()),
230+
() -> assertEquals(customReviewPage, p1.getReviewPage()),
231+
() -> assertEquals(customReviewPattern, p1.getReviewPattern())
228232
);
229233
}
230234

0 commit comments

Comments
 (0)