opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Document metrics for reviewer suggestion
  DeleteBranchIT: Add tests for deleting branch by REST with full name
  Changes can't be found when project name matches Change-Id pattern

Change-Id: If24b843ab9ec8a0d4df439f88c7270548d06ce95
This commit is contained in:
David Pursehouse
2017-06-30 13:21:07 +09:00
parent a1e074fd06 d3d45184e2
commit 4c27107915
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java
View File

@@ -26,6 +26,7 @@ import com.google.gerrit.extensions.api.projects.BranchApi;
import com.google.gerrit.extensions.api.projects.BranchInput;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.Branch;
import org.junit.Before;
import org.junit.Test;
@@ -92,8 +93,22 @@ public class DeleteBranchIT extends AbstractDaemonTest {
grantDelete();
String ref = branch.getShortName();
assertThat(ref).doesNotMatch(R_HEADS);
RestResponse r = userRestSession.delete("/projects/" + project.get() + "/branches/" + ref);
r.assertNoContent();
assertDeleteByRestSucceeds(ref);
}
@Test
public void deleteBranchByRestWithEncodedFullName() throws Exception {
grantDelete();
assertDeleteByRestSucceeds(Url.encode(branch.get()));
}
@Test
public void deleteBranchByRestFailsWithUnencodedFullName() throws Exception {
grantDelete();
RestResponse r =
userRestSession.delete("/projects/" + project.get() + "/branches/" + branch.get());
r.assertNotFound();
branch().get();
}
private void blockForcePush() throws Exception {
@@ -116,6 +131,13 @@ public class DeleteBranchIT extends AbstractDaemonTest {
return gApi.projects().name(branch.getParentKey().get()).branch(branch.get());
}
private void assertDeleteByRestSucceeds(String ref) throws Exception {
RestResponse r = userRestSession.delete("/projects/" + project.get() + "/branches/" + ref);
r.assertNoContent();
exception.expect(ResourceNotFoundException.class);
branch().get();
}
private void assertDeleteSucceeds() throws Exception {
String branchRev = branch().get().revision;
branch().delete();