opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  CreateTag: Trim revision that is provided in input
  CreateTag: Allow revision in input to be empty
  RefUtil#parseBaseRevision: Do not log an error if baseRevision is invalid
  InvalidRevisionException: Include invalid revision into message
  CreateBranch: Trim revision that is provided in input
  CreateBranch: Allow revision in input to be empty
  CreateBranchIT: Add tests that set revision in the input
  Upgrade gitiles blame-cache to 0.2-7.1

The change "Upgrade gitiles blame-cache to 0.2-7.1" is omitted from this
merge since stable-3.0 already uses 0.2-11. A separate change to upgrade
to 0.2-12 will be done later.

Change-Id: I3d4e2a91f61a5ed469d4d52878ba464b9664af6e
This commit is contained in:
David Pursehouse
2019-12-06 09:59:44 +09:00
parent 50016d95f7 bb1aaa14a7
commit 4bde8f72bf
5 changed files with 174 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
View File

@@ -28,6 +28,7 @@ import com.google.gerrit.extensions.api.projects.BranchApi;
import com.google.gerrit.extensions.api.projects.BranchInfo;
import com.google.gerrit.extensions.api.projects.BranchInput;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Account;
@@ -35,6 +36,7 @@ import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.inject.Inject;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Before;
import org.junit.Test;
@@ -129,6 +131,112 @@ public class CreateBranchIT extends AbstractDaemonTest {
"Not allowed to create group branch.");
}
@Test
public void createWithRevision() throws Exception {
RevCommit revision = getRemoteHead(project, "master");
// update master so that points to a different revision than the revision on which we create the
// new branch
pushTo("refs/heads/master");
assertThat(getRemoteHead(project, "master")).isNotEqualTo(revision);
BranchInput input = new BranchInput();
input.revision = revision.name();
BranchInfo created = branch(testBranch).create(input).get();
assertThat(created.ref).isEqualTo(testBranch.get());
assertThat(created.revision).isEqualTo(revision.name());
assertThat(getRemoteHead(project, testBranch.getShortName())).isEqualTo(revision);
}
@Test
public void createWithoutSpecifyingRevision() throws Exception {
// If revision is not specified, the branch is created based on HEAD, which points to master.
RevCommit expectedRevision = getRemoteHead(project, "master");
BranchInput input = new BranchInput();
input.revision = null;
BranchInfo created = branch(testBranch).create(input).get();
assertThat(created.ref).isEqualTo(testBranch.get());
assertThat(created.revision).isEqualTo(expectedRevision.name());
assertThat(getRemoteHead(project, testBranch.getShortName())).isEqualTo(expectedRevision);
}
@Test
public void createWithEmptyRevision() throws Exception {
// If revision is not specified, the branch is created based on HEAD, which points to master.
RevCommit expectedRevision = getRemoteHead(project, "master");
BranchInput input = new BranchInput();
input.revision = "";
BranchInfo created = branch(testBranch).create(input).get();
assertThat(created.ref).isEqualTo(testBranch.get());
assertThat(created.revision).isEqualTo(expectedRevision.name());
assertThat(getRemoteHead(project, testBranch.getShortName())).isEqualTo(expectedRevision);
}
@Test
public void createRevisionIsTrimmed() throws Exception {
RevCommit revision = getRemoteHead(project, "master");
BranchInput input = new BranchInput();
input.revision = "\t" + revision.name();
BranchInfo created = branch(testBranch).create(input).get();
assertThat(created.ref).isEqualTo(testBranch.get());
assertThat(created.revision).isEqualTo(revision.name());
assertThat(getRemoteHead(project, testBranch.getShortName())).isEqualTo(revision);
}
@Test
public void createWithBranchNameAsRevision() throws Exception {
RevCommit expectedRevision = getRemoteHead(project, "master");
BranchInput input = new BranchInput();
input.revision = "master";
BranchInfo created = branch(testBranch).create(input).get();
assertThat(created.ref).isEqualTo(testBranch.get());
assertThat(created.revision).isEqualTo(expectedRevision.name());
assertThat(getRemoteHead(project, testBranch.getShortName())).isEqualTo(expectedRevision);
}
@Test
public void createWithFullBranchNameAsRevision() throws Exception {
RevCommit expectedRevision = getRemoteHead(project, "master");
BranchInput input = new BranchInput();
input.revision = "refs/heads/master";
BranchInfo created = branch(testBranch).create(input).get();
assertThat(created.ref).isEqualTo(testBranch.get());
assertThat(created.revision).isEqualTo(expectedRevision.name());
assertThat(getRemoteHead(project, testBranch.getShortName())).isEqualTo(expectedRevision);
}
@Test
public void cannotCreateWithNonExistingBranchNameAsRevision() throws Exception {
assertCreateFails(
testBranch,
"refs/heads/non-existing",
BadRequestException.class,
"invalid revision \"refs/heads/non-existing\"");
}
@Test
public void cannotCreateWithNonExistingRevision() throws Exception {
assertCreateFails(
testBranch,
"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
BadRequestException.class,
"invalid revision \"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"");
}
@Test
public void cannotCreateWithInvalidRevision() throws Exception {
assertCreateFails(
testBranch,
"invalid\trevision",
BadRequestException.class,
"invalid revision \"invalid\trevision\"");
}
private void blockCreateReference() throws Exception {
block("refs/*", Permission.CREATE, ANONYMOUS_USERS);
}

48
javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java
View File

@@ -37,6 +37,7 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.inject.Inject;
import java.sql.Timestamp;
import java.util.List;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Test;
@NoHttpd
@@ -330,6 +331,53 @@ public class TagsIT extends AbstractDaemonTest {
tag(input.ref).create(input);
}
@Test
public void noBaseRevision() throws Exception {
grantTagPermissions();
// If revision is not specified, the tag is created based on HEAD, which points to master.
RevCommit expectedRevision = getRemoteHead(project, "master");
TagInput input = new TagInput();
input.ref = "test";
input.revision = null;
TagInfo result = tag(input.ref).create(input).get();
assertThat(result.ref).isEqualTo(R_TAGS + input.ref);
assertThat(result.revision).isEqualTo(expectedRevision.name());
}
@Test
public void emptyBaseRevision() throws Exception {
grantTagPermissions();
// If revision is not specified, the tag is created based on HEAD, which points to master.
RevCommit expectedRevision = getRemoteHead(project, "master");
TagInput input = new TagInput();
input.ref = "test";
input.revision = "";
TagInfo result = tag(input.ref).create(input).get();
assertThat(result.ref).isEqualTo(R_TAGS + input.ref);
assertThat(result.revision).isEqualTo(expectedRevision.name());
}
@Test
public void baseRevisionIsTrimmed() throws Exception {
grantTagPermissions();
RevCommit revision = getRemoteHead(project, "master");
TagInput input = new TagInput();
input.ref = "test";
input.revision = "\t" + revision.name();
TagInfo result = tag(input.ref).create(input).get();
assertThat(result.ref).isEqualTo(R_TAGS + input.ref);
assertThat(result.revision).isEqualTo(revision.name());
}
private void assertTagList(FluentIterable<String> expected, List<TagInfo> actual)
throws Exception {
assertThat(actual).hasSize(expected.size());