AbstractDaemonTest: Make args of allow method consistent with block/deny
The order of arguments should be the same for all methods that allow,
block or deny access rights.
Change-Id: I9070d23b291b5481aab60b2fd3b63af15d209795
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index ff83f06..2a9c995 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -761,7 +761,7 @@
return gApi.changes().id(r.getChangeId()).current();
}
- protected void allow(String permission, AccountGroup.UUID id, String ref) throws Exception {
+ protected void allow(String ref, String permission, AccountGroup.UUID id) throws Exception {
ProjectConfig cfg = projectCache.checkedGet(project).getConfig();
Util.allow(cfg, permission, id, ref);
saveProjectConfig(project, cfg);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
index c384f1e..e3c6545 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -287,7 +287,7 @@
PushOneCommit.Result result = createChange();
gApi.changes().id(result.getChangeId()).setPrivate(true, null);
- allow(Permission.VIEW_PRIVATE_CHANGES, REGISTERED_USERS, "refs/*");
+ allow("refs/*", Permission.VIEW_PRIVATE_CHANGES, REGISTERED_USERS);
setApiUser(user);
assertThat(gApi.changes().id(result.getChangeId()).get().isPrivate).isTrue();
}
@@ -795,7 +795,7 @@
@Test
@TestProjectInput(cloneAs = "user")
public void deleteChangeAsUserWithDeleteOwnChangesPermission() throws Exception {
- allow(Permission.DELETE_OWN_CHANGES, REGISTERED_USERS, "refs/*");
+ allow("refs/*", Permission.DELETE_OWN_CHANGES, REGISTERED_USERS);
try {
PushOneCommit.Result changeResult =
@@ -832,7 +832,7 @@
@Test
public void deleteNewChangeOfAnotherUserWithDeleteOwnChangesPermission() throws Exception {
- allow(Permission.DELETE_OWN_CHANGES, REGISTERED_USERS, "refs/*");
+ allow("refs/*", Permission.DELETE_OWN_CHANGES, REGISTERED_USERS);
try {
PushOneCommit.Result changeResult = createChange();
@@ -902,7 +902,7 @@
@Test
@TestProjectInput(cloneAs = "user")
public void deleteMergedChangeWithDeleteOwnChangesPermission() throws Exception {
- allow(Permission.DELETE_OWN_CHANGES, REGISTERED_USERS, "refs/*");
+ allow("refs/*", Permission.DELETE_OWN_CHANGES, REGISTERED_USERS);
try {
PushOneCommit.Result changeResult =
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
index 8688409..94dcf31 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
@@ -104,7 +104,7 @@
@Test
public void createBranch() throws Exception {
- allow(Permission.READ, ANONYMOUS_USERS, "refs/*");
+ allow("refs/*", Permission.READ, ANONYMOUS_USERS);
gApi.projects().name(project.get()).branch("foo").create(new BranchInput());
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
index 02a19c6..a9fe617 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
@@ -103,7 +103,7 @@
// First 2 changes are merged, which means the tags pointing to them are
// visible.
- allow(Permission.SUBMIT, admins, "refs/for/refs/heads/*");
+ allow("refs/for/refs/heads/*", Permission.SUBMIT, admins);
PushOneCommit.Result mr =
pushFactory.create(db, admin.getIdent(), testRepo).to("refs/for/master%submit");
mr.assertOkStatus();
@@ -167,8 +167,8 @@
@Test
public void uploadPackAllRefsVisibleWithRefsMetaConfig() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/*");
- allow(Permission.READ, REGISTERED_USERS, RefNames.REFS_CONFIG);
+ allow("refs/*", Permission.READ, REGISTERED_USERS);
+ allow(RefNames.REFS_CONFIG, Permission.READ, REGISTERED_USERS);
assertUploadPackRefs(
"HEAD",
@@ -189,7 +189,7 @@
@Test
public void uploadPackSubsetOfBranchesVisibleIncludingHead() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/master");
+ allow("refs/heads/master", Permission.READ, REGISTERED_USERS);
deny("refs/heads/branch", Permission.READ, REGISTERED_USERS);
setApiUser(user);
@@ -206,7 +206,7 @@
@Test
public void uploadPackSubsetOfBranchesVisibleNotIncludingHead() throws Exception {
deny("refs/heads/master", Permission.READ, REGISTERED_USERS);
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/branch");
+ allow("refs/heads/branch", Permission.READ, REGISTERED_USERS);
setApiUser(user);
assertUploadPackRefs(
@@ -223,7 +223,7 @@
@Test
public void uploadPackSubsetOfBranchesVisibleWithEdit() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/master");
+ allow("refs/heads/master", Permission.READ, REGISTERED_USERS);
Change c = notesFactory.createChecked(db, project, c1.getId()).getChange();
String changeId = c.getKey().get();
@@ -249,8 +249,8 @@
@Test
public void uploadPackSubsetOfBranchesAndEditsVisibleWithViewPrivateChanges() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/master");
- allow(Permission.VIEW_PRIVATE_CHANGES, REGISTERED_USERS, "refs/*");
+ allow("refs/heads/master", Permission.READ, REGISTERED_USERS);
+ allow("refs/*", Permission.VIEW_PRIVATE_CHANGES, REGISTERED_USERS);
Change change1 = notesFactory.createChecked(db, project, c1.getId()).getChange();
String changeId1 = change1.getKey().get();
@@ -285,7 +285,7 @@
allowGlobalCapabilities(REGISTERED_USERS, GlobalCapability.ACCESS_DATABASE);
try {
deny("refs/heads/master", Permission.READ, REGISTERED_USERS);
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/branch");
+ allow("refs/heads/branch", Permission.READ, REGISTERED_USERS);
String changeId = c1.change().getKey().get();
setApiUser(admin);
@@ -316,7 +316,7 @@
@Test
public void uploadPackDraftRefs() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/*");
+ allow("refs/heads/*", Permission.READ, REGISTERED_USERS);
PushOneCommit.Result br =
pushFactory.create(db, admin.getIdent(), testRepo).to("refs/drafts/master");
@@ -364,7 +364,7 @@
@Test
public void uploadPackNoSearchingChangeCacheImpl() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/*");
+ allow("refs/heads/*", Permission.READ, REGISTERED_USERS);
setApiUser(user);
try (Repository repo = repoManager.openRepository(project)) {
@@ -423,7 +423,7 @@
@Test
public void receivePackRespectsVisibilityOfOpenChanges() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/master");
+ allow("refs/heads/master", Permission.READ, REGISTERED_USERS);
deny("refs/heads/branch", Permission.READ, REGISTERED_USERS);
setApiUser(user);
@@ -491,7 +491,7 @@
@Test
public void advertisedReferencesOmitPrivateChangesOfOtherUsers() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/heads/master");
+ allow("refs/heads/master", Permission.READ, REGISTERED_USERS);
TestRepository<?> userTestRepository = cloneProject(project, user);
try (Git git = userTestRepository.git()) {
@@ -511,7 +511,7 @@
@Test
public void advertisedReferencesIncludePrivateChangesWhenAllRefsMayBeRead() throws Exception {
- allow(Permission.READ, REGISTERED_USERS, "refs/*");
+ allow("refs/*", Permission.READ, REGISTERED_USERS);
TestRepository<?> userTestRepository = cloneProject(project, user);
try (Git git = userTestRepository.git()) {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
index 897ac48..b1f75a0 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
@@ -145,7 +145,7 @@
setApiUser(user3);
block("refs/*", "read", ANONYMOUS_USERS);
- allow("read", group1.getGroupUUID(), "refs/*");
+ allow("refs/*", "read", group1.getGroupUUID());
reviewers = suggestReviewers(changeId, user2.username, 2);
assertThat(reviewers).isEmpty();
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
index 224e41c..3b7971a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
@@ -84,7 +84,7 @@
}
private void grantOwner() throws Exception {
- allow(Permission.OWNER, REGISTERED_USERS, "refs/*");
+ allow("refs/*", Permission.OWNER, REGISTERED_USERS);
}
private BranchApi branch() throws Exception {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java
index 1ece7fb..d5bb2fd 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java
@@ -120,11 +120,11 @@
}
private void grantDelete() throws Exception {
- allow(Permission.DELETE, ANONYMOUS_USERS, "refs/*");
+ allow("refs/*", Permission.DELETE, ANONYMOUS_USERS);
}
private void grantOwner() throws Exception {
- allow(Permission.OWNER, REGISTERED_USERS, "refs/*");
+ allow("refs/*", Permission.OWNER, REGISTERED_USERS);
}
private BranchApi branch() throws Exception {
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 e37071e..ab1e43a 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
@@ -99,11 +99,11 @@
}
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 {
