commit 7f4c48f37b9a8970ae2f8c8dc881f603ec9e707f
author David Ostrovsky <david@ostrovsky.org> Wed Jun 01 09:10:07 2016 +0200
committer David Pursehouse <dpursehouse@collab.net> Wed Jun 01 08:12:15 2016 +0000
tree 8fdbe0071b1879696e0ab402ac9d8217f8a0c51d
parent 732217232d39773f112b6a12db394d3c4703dcfa

Bazel: Fix CheckReturnValue error detected by ErrorProne

Change-Id: I479bd380b77ff84dba43739b0e5f2b58b4c25a9c

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
index 9c064c7..3f8c1bc 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
@@ -156,8 +156,8 @@
     String dupGroupNameLowerCase = name("dupGroupA").toLowerCase();
     gApi.groups().create(dupGroupName);
     gApi.groups().create(dupGroupNameLowerCase);
-    assertThat(gApi.groups().list().getAsMap().keySet().contains(dupGroupName));
-    assertThat(gApi.groups().list().getAsMap().keySet().contains(dupGroupNameLowerCase));
+    assertThat(gApi.groups().list().getAsMap().keySet()).contains(dupGroupName);
+    assertThat(gApi.groups().list().getAsMap().keySet()).contains(dupGroupNameLowerCase);
   }
 
   @Test
@@ -530,7 +530,7 @@
   }
 
   private void assertNoMembers(String group) throws Exception {
-    assertThat(gApi.groups().id(group).members().isEmpty());
+    assertThat(gApi.groups().id(group).members()).isEmpty();
   }
 
   private void assertIncludes(String group, String... expectedNames)
@@ -553,7 +553,7 @@
   }
 
   private void assertNoIncludes(String group) throws Exception {
-    assertThat(gApi.groups().id(group).includedGroups().isEmpty());
+    assertThat(gApi.groups().id(group).includedGroups()).isEmpty();
   }
 
   private AccountGroup getFromCache(String name) throws Exception {

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
index f8640bd..13f5063 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
@@ -95,9 +95,9 @@
     setSignedOffByFooter();
     ChangeInfo info = assertCreateSucceeds(newChangeInput(ChangeStatus.NEW));
     String message = info.revisions.get(info.currentRevision).commit.message;
-    assertThat(message.contains(
-        String.format("%s Adminitrstaor %s", SIGNED_OFF_BY_TAG,
-            admin.getIdent().getEmailAddress())));
+    assertThat(message).contains(
+        String.format("%sAdministrator <%s>", SIGNED_OFF_BY_TAG,
+            admin.getIdent().getEmailAddress()));
   }
 
   @Test