commit 54854ee6089d054c7a77e996e0e10610a68cd2b7
author Dave Borowitz <dborowitz@google.com> Fri Apr 19 09:26:56 2019 -0700
committer Dave Borowitz <dborowitz@google.com> Fri Apr 19 13:07:29 2019 -0700
tree 8ec063d5f7f4ea839f0d573413ae5fd3f535eaeb
parent cea46011c4f488e26193e374cf713e72aa354ac6

Adapt to Change.Id refactoring

Change-Id: I3ca5db245ee04d2bf2752c42c76839036c089548

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

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java
index 9987582..f9ae77e 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java
@@ -99,7 +99,7 @@
     assertThat(sortedChanges.get(0).branch).isEqualTo("ds_one");
     gApi.changes().id(sortedChanges.get(0)._number).abandon();
 
-    int changeNumber = result.getChange().getId().id;
+    int changeNumber = result.getChange().getId().get();
     exception.expect(ResourceConflictException.class);
     exception.expectMessage(
         "Failed to submit 1 change due to the following problems:\nChange "
@@ -162,7 +162,7 @@
         createChange(testRepo, "master", "subject", "filename", "content", "testtopic");
     pushConfig("automerger.config", result.getChange().project().get(), "ds_one");
     result.assertOkStatus();
-    int changeNumber = result.getChange().getId().id;
+    int changeNumber = result.getChange().getId().get();
     // Assert we are missing downstreams
     exception.expect(ResourceConflictException.class);
     exception.expectMessage(
@@ -179,7 +179,7 @@
         createChange(testRepo, "master", "subject", "filename", "content", "testtopic");
     pushConfig("alternate.config", result.getChange().project().get(), "ds_one");
     result.assertOkStatus();
-    int changeNumber = result.getChange().getId().id;
+    int changeNumber = result.getChange().getId().get();
     // Assert we are missing downstreams
     exception.expect(ResourceConflictException.class);
     exception.expectMessage(