commit 51754ed9a70863aa7e08cfaca2f0a934203b932a
author Dave Borowitz <dborowitz@google.com> Fri Apr 12 07:44:10 2019 -0700
committer Dave Borowitz <dborowitz@google.com> Fri Apr 12 07:44:10 2019 -0700
tree 661e838d3f2a38edde7324fad46d657e279fd9f5
parent 06ab05a8540787a9218c85b314f9a4599d146e6b

Adapt to new TestAccount methods

Change-Id: Ife1cc98574a97e51e925e8b12721e4bdd75c1125

src/test/java/com/googlesource/gerrit/plugins/findowners/ApiIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/findowners/ApiIT.java b/src/test/java/com/googlesource/gerrit/plugins/findowners/ApiIT.java
index 4bcde45..d8c79b8 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/findowners/ApiIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/findowners/ApiIT.java
@@ -87,8 +87,8 @@
   @Test
   public void authorDefaultVoteTest() throws Exception {
     // CL author has default +1 owner vote.
-    addFile("1", "d1/OWNERS", user.email + "\n"); // d1 owned by user
-    addFile("2", "d2/OWNERS", admin.email + "\n"); // d2 owned by admin
+    addFile("1", "d1/OWNERS", user.email() + "\n"); // d1 owned by user
+    addFile("2", "d2/OWNERS", admin.email() + "\n"); // d2 owned by admin
     // admin is the author of CLs created by createChange.
     PushOneCommit.Result r1 = createChange("r1", "d1/t.c", "Hello1");
     PushOneCommit.Result r2 = createChange("r2", "d2/t.c", "Hello2");
@@ -143,7 +143,7 @@
     String[] emails2 = {"abc@goog.com", "abc+xyz2@g.com", "xyz-team@goog.com"};
     // Create accounts with given user name, first and second email addresses.
     for (int i = 0; i < users.length; i++) {
-      accountCreator.create(users[i], emails1[i], "FullName " + users[i]).getId();
+      accountCreator.create(users[i], emails1[i], "FullName " + users[i]).id();
       EmailInput input = new EmailInput();
       input.email = emails2[i];
       input.noConfirmation = true;

src/test/java/com/googlesource/gerrit/plugins/findowners/FindOwners.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/findowners/FindOwners.java b/src/test/java/com/googlesource/gerrit/plugins/findowners/FindOwners.java
index da89ccf..10e327b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/findowners/FindOwners.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/findowners/FindOwners.java
@@ -142,7 +142,7 @@
     PushOneCommit.Result commit =
         pushFactory
             .create(
-                admin.getIdent(), // normal user cannot change refs/meta/config
+                admin.newIdent(), // normal user cannot change refs/meta/config
                 testRepo,
                 "Update project config",
                 "project.config",
@@ -204,7 +204,7 @@
 
   protected PushOneCommit.Result createChangeInBranch(
       String branch, String subject, String fileName, String content) throws Exception {
-    PushOneCommit push = pushFactory.create(admin.getIdent(), testRepo, subject, fileName, content);
+    PushOneCommit push = pushFactory.create(admin.newIdent(), testRepo, subject, fileName, content);
     return push.to("refs/for/" + branch);
   }
 

src/test/java/com/googlesource/gerrit/plugins/findowners/PrologIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/findowners/PrologIT.java b/src/test/java/com/googlesource/gerrit/plugins/findowners/PrologIT.java
index c169321..7118a7a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/findowners/PrologIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/findowners/PrologIT.java
@@ -73,7 +73,7 @@
     testRepo.reset("config");
     PushOneCommit push =
         pushFactory.create(
-            admin.getIdent(),
+            admin.newIdent(),
             testRepo,
             "Configure",
             "rules.pl",
@@ -91,7 +91,7 @@
     testRepo.reset(oldHead);
     oldHead = getRemoteHead();
     PushOneCommit.Result result =
-        pushFactory.create(user.getIdent(), testRepo).to("refs/for/master");
+        pushFactory.create(user.newIdent(), testRepo).to("refs/for/master");
     testRepo.reset(oldHead);
     gApi.changes().id(result.getChangeId()).current().submit();
   }