User UserRule to reset users

5 files changed, 14 insertions, 16 deletions

diff --git a/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java b/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java
index 52a769b52a9..00f6f61a15f 100644
--- a/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java
@@ -33,7 +33,6 @@ import org.sonar.wsclient.issue.Issue;
 import org.sonar.wsclient.issue.IssueClient;
 import org.sonar.wsclient.issue.IssueQuery;
 import org.sonar.wsclient.issue.Issues;
-import org.sonar.wsclient.user.UserParameters;
 import org.subethamail.wiser.Wiser;
 import org.subethamail.wiser.WiserMessage;
 import util.NetworkUtils;
@@ -67,13 +66,7 @@ public class IssueNotificationsTest extends AbstractIssueTest {
     setServerProperty(ORCHESTRATOR, "email.smtp_port.secured", Integer.toString(smtpServer.getServer().getPort()));
 
     // Create test user
-    ORCHESTRATOR.getServer().adminWsClient().userClient()
-      .create(UserParameters.create()
-        .login(USER_LOGIN)
-        .password(USER_LOGIN)
-        .passwordConfirmation(USER_LOGIN)
-        .email("tester@example.org")
-        .name("Tester"));
+    userRule.createUser(USER_LOGIN, "Tester", "tester@example.org", USER_LOGIN);
 
     // 1. Check that SMTP server was turned on and able to send test email
     // 2. Create user, which will receive notifications for new violations
diff --git a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java b/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java
index 8f65bd07164..b87fef962bb 100644
--- a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java
+++ b/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java
@@ -27,7 +27,6 @@ import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.WsClient;
@@ -50,8 +49,8 @@ public class BaseIdentityProviderTest {
   @ClassRule
   public static Orchestrator ORCHESTRATOR = Category4Suite.ORCHESTRATOR;
 
-  @Rule
-  public UserRule userRule = UserRule.from(ORCHESTRATOR);
+  @ClassRule
+  public static UserRule userRule = UserRule.from(ORCHESTRATOR);
 
   static String FAKE_PROVIDER_KEY = "fake-base-id-provider";
 
diff --git a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
index 0420e186ca7..453f7e0dc39 100644
--- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
+++ b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
@@ -87,7 +87,7 @@ public class LocalAuthenticationTest {
 
   @AfterClass
   public static void deleteAndRestoreData() {
-    userRule.deactivateUsers(LOGIN, "signuplogin");
+    userRule.resetUsers();
     addGroupPermission("anyone", "scan");
   }
 
@@ -103,7 +103,7 @@ public class LocalAuthenticationTest {
     String login = format("login-%s", userId);
     String name = format("name-%s", userId);
     String password = "!ascii-only:-)@";
-    userRule.createUser(login, name, password);
+    userRule.createUser(login, name, null, password);
 
     // authenticate
     WsClient wsClient = new HttpWsClient(new HttpConnector.Builder().url(ORCHESTRATOR.getServer().getUrl()).credentials(login, password).build());
@@ -177,7 +177,7 @@ public class LocalAuthenticationTest {
     String password = "κόσμε";
 
     // create user with a UTF-8 password
-    userRule.createUser(login, LOGIN, password);
+    userRule.createUser(login, LOGIN, null, password);
 
     // authenticate
     assertThat(checkAuthenticationThroughWebService(login, password)).isFalse();
diff --git a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java b/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java
index ffa5c21a53f..8c33cc2200e 100644
--- a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java
+++ b/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java
@@ -68,6 +68,11 @@ public class OAuth2IdentityProviderTest {
     adminWsClient = newAdminWsClient(ORCHESTRATOR);
   }
 
+  @After
+  public void resetUsers() throws Exception {
+    userRule.resetUsers();
+  }
+
   @Before
   public void setUp() throws Exception {
     fakeServerAuthProvider = new MockWebServer();
diff --git a/it/it-tests/src/test/java/util/user/UserRule.java b/it/it-tests/src/test/java/util/user/UserRule.java
index 088a46c4d0a..01eafe5b015 100644
--- a/it/it-tests/src/test/java/util/user/UserRule.java
+++ b/it/it-tests/src/test/java/util/user/UserRule.java
@@ -80,16 +80,17 @@ public class UserRule extends ExternalResource {
     assertThat(getUserByLogin(login)).as("Unexpected user with login '%s' has been found", login).isAbsent();
   }
 
-  public void createUser(String login, String name, String password) {
+  public void createUser(String login, String name, @Nullable String email, String password) {
     adminWsClient().wsConnector().call(
       new PostRequest("api/users/create")
         .setParam("login", login)
         .setParam("name", name)
+        .setParam("email", email)
         .setParam("password", password));
   }
 
   public void createUser(String login, String password) {
-    createUser(login, login, password);
+    createUser(login, login, null, password);
   }
 
   public Optional<Users.User> getUserByLogin(String login) {