opendev/gerrit
Code Issues Proposed changes

ProjectIT: Add basic test coverage for commentlinks in project config

Browse Source 
Test that the project config has no commentlinks by default, but gets
the commentlinks from the global configuration when set.

Tests for invalid commentlinks are not included, since this is already
covered by ProjectConfigTest.

We cannot easily test that the project configuration overrides the
global configuration, because the "put config" REST endpoint does
not yet allow to set commentlinks. This will be added in a follow-up
commit.

Change-Id: I7908a6e015abcd2eff018a501b3f22ea95383261
This commit is contained in:
David Pursehouse
2018-10-13 10:21:14 +09:00
parent acf73405d8
commit 950d449263
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
View File

@@ -33,6 +33,7 @@ import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.projects.BranchInput;
import com.google.gerrit.extensions.api.projects.CommentLinkInfo;
import com.google.gerrit.extensions.api.projects.ConfigInfo;
import com.google.gerrit.extensions.api.projects.ConfigInput;
import com.google.gerrit.extensions.api.projects.DescriptionInput;
@@ -51,7 +52,10 @@ import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.index.IndexExecutor;
import com.google.gerrit.server.project.CommentLinkInfoImpl;
import com.google.inject.Inject;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RemoteRefUpdate.Status;
@@ -61,6 +65,13 @@ import org.junit.Test;
@NoHttpd
public class ProjectIT extends AbstractDaemonTest {
private static final String BUGZILLA = "bugzilla";
private static final String BUGZILLA_LINK = "http://bugzilla.example.com/?id=$2";
private static final String BUGZILLA_MATCH = "(bug\\\\s+#?)(\\\\d+)";
private static final String JIRA = "jira";
private static final String JIRA_LINK = "http://jira.example.com/?id=$2";
private static final String JIRA_MATCH = "(jira\\\\s+#?)(\\\\d+)";
@Inject private DynamicSet<ProjectIndexedListener> projectIndexedListeners;
@Inject
@@ -603,6 +614,31 @@ public class ProjectIT extends AbstractDaemonTest {
setMaxObjectSize("100 foo");
}
@Test
public void noCommentlinksByDefault() throws Exception {
assertThat(getConfig().commentlinks).isEmpty();
}
@Test
@GerritConfig(name = "commentlink.bugzilla.match", value = BUGZILLA_MATCH)
@GerritConfig(name = "commentlink.bugzilla.link", value = BUGZILLA_LINK)
@GerritConfig(name = "commentlink.jira.match", value = JIRA_MATCH)
@GerritConfig(name = "commentlink.jira.link", value = JIRA_LINK)
public void projectConfigUsesCommentlinksFromGlobalConfig() throws Exception {
Map<String, CommentLinkInfo> expected = new HashMap<>();
expected.put(BUGZILLA, commentLinkInfo(BUGZILLA, BUGZILLA_MATCH, BUGZILLA_LINK));
expected.put(JIRA, commentLinkInfo(JIRA, JIRA_MATCH, JIRA_LINK));
assertCommentLinks(getConfig(), expected);
}
private CommentLinkInfo commentLinkInfo(String name, String match, String link) {
return new CommentLinkInfoImpl(name, match, link, null /*html*/, null /*enabled*/);
}
private void assertCommentLinks(ConfigInfo actual, Map<String, CommentLinkInfo> expected) {
assertThat(actual.commentlinks).containsExactlyEntriesIn(expected);
}
private ConfigInfo setConfig(Project.NameKey name, ConfigInput input) throws Exception {
return gApi.projects().name(name.get()).config(input);
}