opendev/gerrit
Code Issues Proposed changes

AbstractSubmit: Rename mergeResults to changeMergedEvents

Browse Source 
This makes its purpose more obvious.

Change-Id: I73c987d10680cc5212a388d9e9fb42beedf20743
This commit is contained in:
David Pursehouse
2016-05-18 08:47:15 +09:00
parent c65490d3b5
commit ca91e55f8e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -95,7 +95,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
return submitWholeTopicEnabledConfig(); return submitWholeTopicEnabledConfig();
} }
private Map<String, String> mergeResults; private Map<String, String> changeMergedEvents;
@Inject @Inject
private ApprovalsUtil approvalsUtil; private ApprovalsUtil approvalsUtil;
@@ -127,7 +127,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mergeResults = new HashMap<>(); changeMergedEvents = new HashMap<>();
eventListenerRegistration = eventListenerRegistration =
eventListeners.add(new UserScopedEventListener() { eventListeners.add(new UserScopedEventListener() {
@Override @Override
@@ -139,7 +139,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
ChangeAttribute c = e.change.get(); ChangeAttribute c = e.change.get();
PatchSetAttribute ps = e.patchSet.get(); PatchSetAttribute ps = e.patchSet.get();
log.debug("Merged {},{} as {}", ps.number, c.number, e.newRev); 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 @Override
@@ -305,8 +305,8 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
// newRev of the ChangeMergedEvent. // newRev of the ChangeMergedEvent.
BranchInfo branch = gApi.projects().name(change.project) BranchInfo branch = gApi.projects().name(change.project)
.branch(change.branch).get(); .branch(change.branch).get();
assertThat(mergeResults).isNotEmpty(); assertThat(changeMergedEvents).isNotEmpty();
String newRev = mergeResults.get(Integer.toString(change._number)); String newRev = changeMergedEvents.get(Integer.toString(change._number));
assertThat(newRev).isNotNull(); assertThat(newRev).isNotNull();
assertThat(branch.revision).isEqualTo(newRev); assertThat(branch.revision).isEqualTo(newRev);
} }