opendev/gerrit
Code Issues Proposed changes

DeleteBranchesIT: Migrate from try-catch-fail to assertThrows

Browse Source 
Change-Id: I6d33ab6e6930f2d4b1837c9f371a08ceb134a2e4
This commit is contained in:
David Pursehouse
2019-05-22 14:40:19 +09:00
parent 0cd17e7fa8
commit 478120aeac
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java
View File

@@ -76,12 +76,8 @@ public class DeleteBranchesIT extends AbstractDaemonTest {
DeleteBranchesInput input = new DeleteBranchesInput();
input.branches = branchToDelete;
requestScopeOperations.setApiUser(user.id());
try {
project().deleteBranches(input);
fail("Expected AuthException");
} catch (AuthException e) {
assertThat(e).hasMessageThat().isEqualTo("not permitted: delete on refs/heads/test-1");
}
AuthException thrown = assertThrows(AuthException.class, () -> project().deleteBranches(input));
assertThat(thrown).hasMessageThat().isEqualTo("not permitted: delete on refs/heads/test-1");
requestScopeOperations.setApiUser(admin.id());
assertBranches(BRANCHES);
}
@@ -91,12 +87,9 @@ public class DeleteBranchesIT extends AbstractDaemonTest {
DeleteBranchesInput input = new DeleteBranchesInput();
input.branches = BRANCHES;
requestScopeOperations.setApiUser(user.id());
try {
project().deleteBranches(input);
fail("Expected ResourceConflictException");
} catch (ResourceConflictException e) {
assertThat(e).hasMessageThat().isEqualTo(errorMessageForBranches(BRANCHES));
}
ResourceConflictException thrown =
assertThrows(ResourceConflictException.class, () -> project().deleteBranches(input));
assertThat(thrown).hasMessageThat().isEqualTo(errorMessageForBranches(BRANCHES));
requestScopeOperations.setApiUser(admin.id());
assertBranches(BRANCHES);
}
@@ -107,14 +100,11 @@ public class DeleteBranchesIT extends AbstractDaemonTest {
List<String> branches = Lists.newArrayList(BRANCHES);
branches.add("refs/heads/does-not-exist");
input.branches = branches;
try {
project().deleteBranches(input);
fail("Expected ResourceConflictException");
} catch (ResourceConflictException e) {
assertThat(e)
.hasMessageThat()
.isEqualTo(errorMessageForBranches(ImmutableList.of("refs/heads/does-not-exist")));
}
ResourceConflictException thrown =
assertThrows(ResourceConflictException.class, () -> project().deleteBranches(input));
assertThat(thrown)
.hasMessageThat()
.isEqualTo(errorMessageForBranches(ImmutableList.of("refs/heads/does-not-exist")));
assertBranchesDeleted(BRANCHES);
}
@@ -126,14 +116,11 @@ public class DeleteBranchesIT extends AbstractDaemonTest {
List<String> branches = Lists.newArrayList("refs/heads/does-not-exist");
branches.addAll(BRANCHES);
input.branches = branches;
try {
project().deleteBranches(input);
fail("Expected ResourceConflictException");
} catch (ResourceConflictException e) {
assertThat(e)
.hasMessageThat()
.isEqualTo(errorMessageForBranches(ImmutableList.of("refs/heads/does-not-exist")));
}
ResourceConflictException thrown =
assertThrows(ResourceConflictException.class, () -> project().deleteBranches(input));
assertThat(thrown)
.hasMessageThat()
.isEqualTo(errorMessageForBranches(ImmutableList.of("refs/heads/does-not-exist")));
assertBranchesDeleted(BRANCHES);
}