diff options
Diffstat (limited to 'gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java')
-rw-r--r-- | gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java index 5608fb6e53..0cbbe44206 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java @@ -14,6 +14,7 @@ package com.google.gerrit.acceptance.rest.project; +import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static org.eclipse.jgit.lib.Constants.R_TAGS; @@ -22,6 +23,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.common.data.Permission; import com.google.gerrit.extensions.api.projects.TagApi; +import com.google.gerrit.extensions.api.projects.TagInfo; import com.google.gerrit.extensions.api.projects.TagInput; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; @@ -91,19 +93,19 @@ public class DeleteTagIT extends AbstractDaemonTest { } private void blockForcePush() throws Exception { - block(Permission.PUSH, ANONYMOUS_USERS, "refs/tags/*").setForce(true); + block("refs/tags/*", Permission.PUSH, ANONYMOUS_USERS).setForce(true); } private void grantForcePush() throws Exception { - grant(Permission.PUSH, project, "refs/tags/*", true, ANONYMOUS_USERS); + grant(project, "refs/tags/*", Permission.PUSH, true, ANONYMOUS_USERS); } private void grantDelete() throws Exception { - allow(Permission.DELETE, ANONYMOUS_USERS, "refs/tags/*"); + allow("refs/tags/*", Permission.DELETE, ANONYMOUS_USERS); } private void grantOwner() throws Exception { - allow(Permission.OWNER, REGISTERED_USERS, "refs/tags/*"); + allow("refs/tags/*", Permission.OWNER, REGISTERED_USERS); } private TagApi tag() throws Exception { @@ -111,7 +113,9 @@ public class DeleteTagIT extends AbstractDaemonTest { } private void assertDeleteSucceeds() throws Exception { - String tagRev = tag().get().revision; + TagInfo tagInfo = tag().get(); + assertThat(tagInfo.canDelete).isTrue(); + String tagRev = tagInfo.revision; tag().delete(); eventRecorder.assertRefUpdatedEvents(project.get(), TAG, null, tagRev, tagRev, null); exception.expect(ResourceNotFoundException.class); @@ -119,8 +123,9 @@ public class DeleteTagIT extends AbstractDaemonTest { } private void assertDeleteForbidden() throws Exception { + assertThat(tag().get().canDelete).isNull(); exception.expect(AuthException.class); - exception.expectMessage("Cannot delete tag"); + exception.expectMessage("delete not permitted"); tag().delete(); } } |