commit 120f1b35474e62e23c3d34c742736f5177a9074d
author Stephen Li <stephenli@google.com> Tue Aug 15 16:42:19 2017 -0700
committer Stephen Li <stephenli@google.com> Tue Aug 15 16:42:19 2017 -0700
tree 5a12cadcaa88876cc9ee9357077afc9f22599f24
parent 413a92f2357537a65fe0d14e09ae6155f79e225c

Fix error-prone test to correctly get vote values.

Also, make sure only a single statement comes after the expected
exception.

Change-Id: Ia873d19b4d8c97b9e6088f832f43fa11caf1ca27

src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
index d13a2e2..f9dca8a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
@@ -813,17 +813,12 @@
 
     List<ChangeInfo> sortedChanges = sortedChanges(changesInTopic);
 
-    // Try to +2 downstream and see it fail
+    // Check that downstream is at Code-Review 0
     ChangeInfo dsOneChangeInfo = sortedChanges.get(0);
     assertThat(dsOneChangeInfo.branch).isEqualTo("ds_one");
     ChangeApi dsOneChange = gApi.changes().id(dsOneChangeInfo._number);
     assertThat(getVote(dsOneChange, "Code-Review").value).isEqualTo(0);
 
-    exception.expect(AuthException.class);
-    exception.expectMessage("Applying label \"Code-Review\": 2 is restricted");
-    approve(dsOneChangeInfo.id);
-    assertThat(getVote(dsOneChange, "Code-Review").value).isEqualTo(0);
-
     // Try to +2 master and see it succeed to +2 master and ds_one
     ChangeInfo masterChangeInfo = sortedChanges.get(2);
     assertThat(masterChangeInfo.branch).isEqualTo("master");
@@ -832,6 +827,11 @@
     approve(masterChangeInfo.id);
     assertThat(getVote(masterChange, "Code-Review").value).isEqualTo(2);
     assertThat(getVote(dsOneChange, "Code-Review").value).isEqualTo(2);
+
+    // Try to +2 downstream and see it fail
+    exception.expect(AuthException.class);
+    exception.expectMessage("Applying label \"Code-Review\": 2 is restricted");
+    approve(dsOneChangeInfo.id);
   }
 
   private Project.NameKey defaultSetup() throws Exception {
@@ -928,7 +928,8 @@
   }
 
   private ApprovalInfo getVote(ChangeApi change, String label) throws RestApiException {
-    return change.get(EnumSet.of(ListChangesOption.DETAILED_LABELS)).labels.get(label).all.get(0);
+    List<ApprovalInfo> approvals = change.get(EnumSet.of(ListChangesOption.DETAILED_LABELS)).labels.get(label).all;
+    return approvals.get(approvals.size() - 1);
   }
 
   private List<ChangeInfo> sortedChanges(List<ChangeInfo> changes) {