Merge branch 'stable-2.16'
* stable-2.16:
Format with google-java-format 1.7
Change-Id: I0c52d63a7dde2cee35b1fffba35d56b2f613ed9e
diff --git a/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java b/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java
index 9bc8859..ce3bfb7 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java
@@ -19,7 +19,9 @@
import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.TestPlugin;
+import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.extensions.common.GroupInfo;
+import com.google.inject.Inject;
import java.util.Map;
import org.junit.Test;
@@ -28,10 +30,12 @@
name = "singleusergroup",
sysModule = "com.googlesource.gerrit.plugins.singleusergroup.SingleUserGroup$Module")
public class SingleUserGroupTest extends LightweightPluginDaemonTest {
+ @Inject private RequestScopeOperations requestScopeOperations;
+
@Test
public void testSuggestion() throws Exception {
// No ability to modify account and therefore no ACL to see secondary email
- setApiUser(user);
+ requestScopeOperations.setApiUser(user.getId());
Map<String, GroupInfo> groups = gApi.groups().list().withSuggest("adm").getAsMap();
assertThat(groups).containsKey("user/Administrator (admin)");
}