opendev/gerrit
Code Issues Proposed changes

Remove redundant 'this.' prefix on calls to projectOperations

Browse Source 
Change-Id: I6227598e33a5b948e16ada534a05be57d2ef7552
This commit is contained in:
David Pursehouse
2018-11-30 13:07:01 +09:00
parent 54dcaf8955
commit add35ae2c5
11 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java
View File

@@ -38,7 +38,7 @@ public class SetParentIT extends AbstractDaemonTest {
@Test
public void setParentNotAllowed() throws Exception {
String parent = this.projectOperations.newProject().create().get();
String parent = projectOperations.newProject().create().get();
setApiUser(user);
exception.expect(AuthException.class);
gApi.projects().name(project.get()).parent(parent);
@@ -47,7 +47,7 @@ public class SetParentIT extends AbstractDaemonTest {
@Test
@GerritConfig(name = "receive.allowProjectOwnersToChangeParent", value = "true")
public void setParentNotAllowedForNonOwners() throws Exception {
String parent = this.projectOperations.newProject().create().get();
String parent = projectOperations.newProject().create().get();
setApiUser(user);
exception.expect(AuthException.class);
gApi.projects().name(project.get()).parent(parent);
@@ -56,7 +56,7 @@ public class SetParentIT extends AbstractDaemonTest {
@Test
@GerritConfig(name = "receive.allowProjectOwnersToChangeParent", value = "true")
public void setParentAllowedByAdminWhenAllowProjectOwnersEnabled() throws Exception {
String parent = this.projectOperations.newProject().create().get();
String parent = projectOperations.newProject().create().get();
gApi.projects().name(project.get()).parent(parent);
assertThat(gApi.projects().name(project.get()).parent()).isEqualTo(parent);
@@ -71,7 +71,7 @@ public class SetParentIT extends AbstractDaemonTest {
@Test
@GerritConfig(name = "receive.allowProjectOwnersToChangeParent", value = "true")
public void setParentAllowedForOwners() throws Exception {
String parent = this.projectOperations.newProject().create().get();
String parent = projectOperations.newProject().create().get();
setApiUser(user);
grant(project, "refs/*", Permission.OWNER, false, SystemGroupBackend.REGISTERED_USERS);
gApi.projects().name(project.get()).parent(parent);
@@ -80,7 +80,7 @@ public class SetParentIT extends AbstractDaemonTest {
@Test
public void setParent() throws Exception {
String parent = this.projectOperations.newProject().create().get();
String parent = projectOperations.newProject().create().get();
gApi.projects().name(project.get()).parent(parent);
assertThat(gApi.projects().name(project.get()).parent()).isEqualTo(parent);
@@ -116,8 +116,8 @@ public class SetParentIT extends AbstractDaemonTest {
@Test
public void setParentToGrandchildNotAllowed() throws Exception {
Project.NameKey child = this.projectOperations.newProject().parent(project).create();
String grandchild = this.projectOperations.newProject().parent(child).create().get();
Project.NameKey child = projectOperations.newProject().parent(project).create();
String grandchild = projectOperations.newProject().parent(child).create().get();
exception.expect(ResourceConflictException.class);
exception.expectMessage("cycle exists between");
gApi.projects().name(project.get()).parent(grandchild);
@@ -141,7 +141,7 @@ public class SetParentIT extends AbstractDaemonTest {
public void setParentForAllUsersMustBeAllProjects() throws Exception {
gApi.projects().name(allUsers.get()).parent(allProjects.get());
String parent = this.projectOperations.newProject().create().get();
String parent = projectOperations.newProject().create().get();
exception.expect(BadRequestException.class);
exception.expectMessage("All-Users must inherit from All-Projects");

2
javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java
View File

@@ -109,7 +109,7 @@ public abstract class AbstractSubmoduleSubscription extends AbstractDaemonTest {
}
protected Project.NameKey createProjectForPush(SubmitType submitType) throws Exception {
Project.NameKey project = this.projectOperations.newProject().submitType(submitType).create();
Project.NameKey project = projectOperations.newProject().submitType(submitType).create();
grantPush(project);
return project;
}

3
javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java
View File

@@ -403,8 +403,7 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription {
@Test
public void subscriptionInheritACL() throws Exception {
Project.NameKey configKey =
this.projectOperations.newProject().submitType(getSubmitType()).create();
Project.NameKey configKey = projectOperations.newProject().submitType(getSubmitType()).create();
grantPush(configKey);
Project.NameKey config2Key =
projectOperations.newProject().parent(configKey).submitType(getSubmitType()).create();

8
javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
View File

@@ -364,14 +364,14 @@ public class SubmoduleSubscriptionsWholeTopicMergeIT extends AbstractSubmoduleSu
public void doNotUseFastForward() throws Exception {
// like setup, but without empty commit
superKey =
this.projectOperations
projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)
.create();
grantPush(superKey);
subKey =
this.projectOperations
projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)
@@ -404,14 +404,14 @@ public class SubmoduleSubscriptionsWholeTopicMergeIT extends AbstractSubmoduleSu
public void useFastForwardWhenNoSubmodule() throws Exception {
// like setup, but without empty commit
superKey =
this.projectOperations
projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)
.create();
grantPush(superKey);
subKey =
this.projectOperations
projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)

8
javatests/com/google/gerrit/acceptance/rest/account/WatchedProjectsIT.java
View File

@@ -61,8 +61,8 @@ public class WatchedProjectsIT extends AbstractDaemonTest {
@Test
public void setAndDeleteWatchedProjects() throws Exception {
String projectName1 = this.projectOperations.newProject().create().get();
String projectName2 = this.projectOperations.newProject().create().get();
String projectName1 = projectOperations.newProject().create().get();
String projectName2 = projectOperations.newProject().create().get();
List<ProjectWatchInfo> projectsToWatch = new ArrayList<>();
@@ -95,7 +95,7 @@ public class WatchedProjectsIT extends AbstractDaemonTest {
@Test
public void setConflictingWatches() throws Exception {
String projectName = this.projectOperations.newProject().create().get();
String projectName = projectOperations.newProject().create().get();
List<ProjectWatchInfo> projectsToWatch = new ArrayList<>();
@@ -119,7 +119,7 @@ public class WatchedProjectsIT extends AbstractDaemonTest {
@Test
public void setAndGetEmptyWatch() throws Exception {
String projectName = this.projectOperations.newProject().create().get();
String projectName = projectOperations.newProject().create().get();
List<ProjectWatchInfo> projectsToWatch = new ArrayList<>();

2
javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java
View File

@@ -41,7 +41,7 @@ public class PrivateByDefaultIT extends AbstractDaemonTest {
@Before
public void setUp() throws Exception {
project1 = projectOperations.newProject().create();
project2 = this.projectOperations.newProject().parent(project1).create();
project2 = projectOperations.newProject().parent(project1).create();
setPrivateByDefault(project1, InheritableBoolean.FALSE);
}

20
javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
View File

@@ -135,9 +135,9 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
@Test
public void submitChangesAcrossRepos() throws Exception {
Project.NameKey p1 = this.projectOperations.newProject().create();
Project.NameKey p2 = this.projectOperations.newProject().create();
Project.NameKey p3 = this.projectOperations.newProject().create();
Project.NameKey p1 = projectOperations.newProject().create();
Project.NameKey p2 = projectOperations.newProject().create();
Project.NameKey p3 = projectOperations.newProject().create();
RevCommit initialHead2 = getRemoteHead(p2, "master");
RevCommit initialHead3 = getRemoteHead(p3, "master");
@@ -212,9 +212,9 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
@Test
public void submitChangesAcrossReposBlocked() throws Exception {
Project.NameKey p1 = this.projectOperations.newProject().create();
Project.NameKey p2 = this.projectOperations.newProject().create();
Project.NameKey p3 = this.projectOperations.newProject().create();
Project.NameKey p1 = projectOperations.newProject().create();
Project.NameKey p2 = projectOperations.newProject().create();
Project.NameKey p3 = projectOperations.newProject().create();
TestRepository<?> repo1 = cloneProject(p1);
TestRepository<?> repo2 = cloneProject(p2);
@@ -391,7 +391,7 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
"3",
"a-topic-here");
Project.NameKey p3 = this.projectOperations.newProject().create();
Project.NameKey p3 = projectOperations.newProject().create();
TestRepository<?> repo3 = cloneProject(p3);
RevCommit repo3Head = getRemoteHead(p3, "master");
PushOneCommit.Result change3b =
@@ -713,8 +713,8 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
// (c2a) <= private
assume().that(isSubmitWholeTopicEnabled()).isTrue();
Project.NameKey p1 = this.projectOperations.newProject().create();
Project.NameKey p2 = this.projectOperations.newProject().create();
Project.NameKey p1 = projectOperations.newProject().create();
Project.NameKey p2 = projectOperations.newProject().create();
grantLabel("Code-Review", -2, 2, p1, "refs/heads/*", false, REGISTERED_USERS, false);
grant(p1, "refs/*", Permission.SUBMIT, false, REGISTERED_USERS);
@@ -767,7 +767,7 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
@Test
public void testPreviewSubmitTgz() throws Exception {
Project.NameKey p1 = this.projectOperations.newProject().create();
Project.NameKey p1 = projectOperations.newProject().create();
TestRepository<?> repo1 = cloneProject(p1);
PushOneCommit.Result change1 = createChange(repo1, "master", "test", "a.txt", "1", "topic");

4
javatests/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java
View File

@@ -53,7 +53,7 @@ public class GetChildProjectIT extends AbstractDaemonTest {
@Test
public void getGrandChildProject_NotFound() throws Exception {
Project.NameKey child = projectOperations.newProject().create();
Project.NameKey grandChild = this.projectOperations.newProject().parent(child).create();
Project.NameKey grandChild = projectOperations.newProject().parent(child).create();
assertChildNotFound(allProjects, grandChild.get());
}
@@ -61,7 +61,7 @@ public class GetChildProjectIT extends AbstractDaemonTest {
@Test
public void getGrandChildProjectWithRecursiveFlag() throws Exception {
Project.NameKey child = projectOperations.newProject().create();
Project.NameKey grandChild = this.projectOperations.newProject().parent(child).create();
Project.NameKey grandChild = projectOperations.newProject().parent(child).create();
ProjectInfo grandChildInfo =
gApi.projects().name(allProjects.get()).child(grandChild.get()).get(true);

4
javatests/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java
View File

@@ -44,8 +44,8 @@ public class ListChildProjectsIT extends AbstractDaemonTest {
@Test
public void listChildren() throws Exception {
Project.NameKey child1 = projectOperations.newProject().create();
Project.NameKey child1_1 = this.projectOperations.newProject().parent(child1).create();
Project.NameKey child1_2 = this.projectOperations.newProject().parent(child1).create();
Project.NameKey child1_1 = projectOperations.newProject().parent(child1).create();
Project.NameKey child1_2 = projectOperations.newProject().parent(child1).create();
assertThatNameList(gApi.projects().name(child1.get()).children()).isOrdered();
assertThatNameList(gApi.projects().name(child1.get()).children())

6
javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
View File

@@ -46,7 +46,7 @@ public class ListProjectsIT extends AbstractDaemonTest {
@Test
public void listProjects() throws Exception {
Project.NameKey someProject = this.projectOperations.newProject().create();
Project.NameKey someProject = projectOperations.newProject().create();
assertThatNameList(gApi.projects().list().get())
.containsExactly(allProjects, allUsers, project, someProject);
assertThatNameList(gApi.projects().list().get()).isOrdered();
@@ -196,8 +196,8 @@ public class ListProjectsIT extends AbstractDaemonTest {
@Test
public void listWithHiddenAndReadonlyProjects() throws Exception {
Project.NameKey hidden = this.projectOperations.newProject().create();
Project.NameKey readonly = this.projectOperations.newProject().create();
Project.NameKey hidden = projectOperations.newProject().create();
Project.NameKey readonly = projectOperations.newProject().create();
// Set project read-only
ConfigInput input = new ConfigInput();

3
javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java
View File

@@ -154,8 +154,7 @@ public class PermissionBackendConditionIT extends AbstractDaemonTest {
@Test
public void refPermissions_differentResourceAndSameUserDoesNotEqual2() throws Exception {
Branch.NameKey branch1 = new Branch.NameKey(project, "branch");
Branch.NameKey branch2 =
new Branch.NameKey(this.projectOperations.newProject().create(), "branch");
Branch.NameKey branch2 = new Branch.NameKey(projectOperations.newProject().create(), "branch");
BooleanCondition cond1 = pb.user(user()).ref(branch1).testCond(RefPermission.READ);
BooleanCondition cond2 = pb.user(user()).ref(branch2).testCond(RefPermission.READ);