Skip to content

Commit 694602c

Browse files
committed
use tagsEnabled in RepositoryInfo
also add unit tests
1 parent efe7bb2 commit 694602c

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/history/RepositoryInfo.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public RepositoryInfo(RepositoryInfo orig) {
114114
this.handleRenamedFiles = orig.handleRenamedFiles;
115115
this.mergeCommitsEnabled = orig.mergeCommitsEnabled;
116116
this.historyBasedReindex = orig.historyBasedReindex;
117+
this.tagsEnabled = orig.tagsEnabled;
117118
this.username = orig.username;
118119
this.password = orig.password;
119120
}
@@ -498,6 +499,13 @@ public String toString() {
498499
stringBuilder.append("annotationCache=off");
499500
}
500501

502+
stringBuilder.append(",");
503+
if (isTagsEnabled()) {
504+
stringBuilder.append("tagsEnabled=on");
505+
} else {
506+
stringBuilder.append("tagsEnabled=off");
507+
}
508+
501509
if (getUsername() != null) {
502510
stringBuilder.append(",");
503511
stringBuilder.append("username:set");

opengrok-indexer/src/test/java/org/opengrok/indexer/history/RepositoryInfoTest.java

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,22 @@ void testFillFromProjectUsernamePassword() {
109109

110110
private static Stream<Arguments> provideArgumentsForTestHistoryAndAnnotationFields() {
111111
return Stream.of(
112-
Arguments.of(true, true, true),
113-
Arguments.of(true, true, false),
114-
Arguments.of(true, false, true),
115-
Arguments.of(false, true, true),
116-
Arguments.of(true, false, false),
117-
Arguments.of(false, false, true),
118-
Arguments.of(false, true, false),
119-
Arguments.of(false, false, false)
112+
Arguments.of(true, true, true, true),
113+
Arguments.of(true, true, true, false),
114+
Arguments.of(true, true, false, true),
115+
Arguments.of(true, true, false, false),
116+
Arguments.of(true, false, true, true),
117+
Arguments.of(true, false, true, false),
118+
Arguments.of(false, true, true, true),
119+
Arguments.of(false, true, true, false),
120+
Arguments.of(true, false, false, true),
121+
Arguments.of(true, false, false, false),
122+
Arguments.of(false, false, true, true),
123+
Arguments.of(false, false, true, false),
124+
Arguments.of(false, true, false, true),
125+
Arguments.of(false, true, false, false),
126+
Arguments.of(false, false, false, true),
127+
Arguments.of(false, false, false, false)
120128
);
121129
}
122130

@@ -128,7 +136,8 @@ private static Stream<Arguments> provideArgumentsForTestHistoryAndAnnotationFiel
128136
*/
129137
@ParameterizedTest
130138
@MethodSource("provideArgumentsForTestHistoryAndAnnotationFields")
131-
void testHistoryAndAnnotationFields(boolean isProjectPresent, boolean historyEnabled, boolean useAnnotationCache) {
139+
void testHistoryAndAnnotationFields(boolean isProjectPresent, boolean historyEnabled, boolean useAnnotationCache,
140+
boolean tagsEnabled) {
132141
RuntimeEnvironment env = RuntimeEnvironment.getInstance();
133142
env.setProjectsEnabled(true);
134143

@@ -139,10 +148,12 @@ void testHistoryAndAnnotationFields(boolean isProjectPresent, boolean historyEna
139148
project.setPath(dirName);
140149
project.setAnnotationCacheEnabled(useAnnotationCache);
141150
project.setHistoryEnabled(historyEnabled);
151+
project.setTagsEnabled(tagsEnabled);
142152
env.setProjects(Map.of(projectName, project));
143153
} else {
144154
env.setProjects(Collections.emptyMap());
145155
env.setHistoryEnabled(historyEnabled);
156+
env.setTagsEnabled(tagsEnabled);
146157
env.setAnnotationCacheEnabled(useAnnotationCache);
147158
}
148159

@@ -151,5 +162,6 @@ void testHistoryAndAnnotationFields(boolean isProjectPresent, boolean historyEna
151162
repositoryInfo.fillFromProject();
152163
assertEquals(historyEnabled, repositoryInfo.isHistoryEnabled());
153164
assertEquals(useAnnotationCache, repositoryInfo.isAnnotationCacheEnabled());
165+
assertEquals(tagsEnabled, repositoryInfo.isTagsEnabled());
154166
}
155167
}

0 commit comments

Comments
 (0)