From ca91e55f8ed75bc8ea0c02a5d9ebbdc217502e6c Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 18 May 2016 08:47:15 +0900 Subject: [PATCH] AbstractSubmit: Rename mergeResults to changeMergedEvents This makes its purpose more obvious. Change-Id: I73c987d10680cc5212a388d9e9fb42beedf20743 --- .../gerrit/acceptance/rest/change/AbstractSubmit.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 5403e0d2db..7fb91f1ba0 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -95,7 +95,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { return submitWholeTopicEnabledConfig(); } - private Map mergeResults; + private Map changeMergedEvents; @Inject private ApprovalsUtil approvalsUtil; @@ -127,7 +127,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { @Before public void setUp() throws Exception { - mergeResults = new HashMap<>(); + changeMergedEvents = new HashMap<>(); eventListenerRegistration = eventListeners.add(new UserScopedEventListener() { @Override @@ -139,7 +139,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { ChangeAttribute c = e.change.get(); PatchSetAttribute ps = e.patchSet.get(); log.debug("Merged {},{} as {}", ps.number, c.number, e.newRev); - mergeResults.put(e.change.get().number, e.newRev); + changeMergedEvents.put(e.change.get().number, e.newRev); } @Override @@ -305,8 +305,8 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { // newRev of the ChangeMergedEvent. BranchInfo branch = gApi.projects().name(change.project) .branch(change.branch).get(); - assertThat(mergeResults).isNotEmpty(); - String newRev = mergeResults.get(Integer.toString(change._number)); + assertThat(changeMergedEvents).isNotEmpty(); + String newRev = changeMergedEvents.get(Integer.toString(change._number)); assertThat(newRev).isNotNull(); assertThat(branch.revision).isEqualTo(newRev); }