From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Fri, 21 Apr 2017 08:26:07 +0000 (+0200)
Subject: ITs should fail quickly when creating users is failing
X-Git-Tag: 6.4-RC1~293
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4444bcd48f8cd7319d0b9821baeb5bdc98c7276e;p=sonarqube.git

ITs should fail quickly when creating users is failing
---

diff --git a/it/it-tests/src/test/java/it/organization/OrganizationMembershipTest.java b/it/it-tests/src/test/java/it/organization/OrganizationMembershipTest.java
index e2476ee8df1..7d2361f48dd 100644
--- a/it/it-tests/src/test/java/it/organization/OrganizationMembershipTest.java
+++ b/it/it-tests/src/test/java/it/organization/OrganizationMembershipTest.java
@@ -26,7 +26,6 @@ import java.util.List;
 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.junit.rules.ExpectedException;
@@ -177,7 +176,6 @@ public class OrganizationMembershipTest {
     String user1 = createUser();
     String user2 = createUser();
     createUser();
-
     adminClient.organizations().addMember(orgKey, user1);
     adminClient.organizations().addMember(orgKey, user2);
 
@@ -195,26 +193,25 @@ public class OrganizationMembershipTest {
   @Test
   public void admin_can_add_members() {
     String orgKey = createOrganization();
-    userRule.createUser("foo", "pwd");
+    String user = createUser();
     createUser();
 
     MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
     page
       .shouldHaveTotal(1)
-      .addMember("foo")
+      .addMember(user)
       .shouldHaveTotal(2);
     page.getMembersByIdx(0).shouldBeNamed("admin", "Administrator").shouldHaveGroups(2);
-    page.getMembersByIdx(1).shouldBeNamed("foo", "foo").shouldHaveGroups(1);
+    page.getMembersByIdx(1).shouldBeNamed(user, user).shouldHaveGroups(1);
   }
 
   @Test
   public void admin_can_remove_members() {
     String orgKey = createOrganization();
-    userRule.createUser("foo", "pwd");
-    userRule.createUser("bar", "pwd");
-
-    adminClient.organizations().addMember(orgKey, "foo");
-    adminClient.organizations().addMember(orgKey, "bar");
+    String user1 = createUser();
+    String user2 = createUser();
+    adminClient.organizations().addMember(orgKey, user1);
+    adminClient.organizations().addMember(orgKey, user2);
 
     MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
     page.shouldHaveTotal(3)
@@ -225,9 +222,8 @@ public class OrganizationMembershipTest {
   @Test
   public void admin_can_manage_groups() {
     String orgKey = createOrganization();
-    userRule.createUser("foo", "pwd");
-
-    adminClient.organizations().addMember(orgKey, "foo");
+    String user = createUser();
+    adminClient.organizations().addMember(orgKey, user);
 
     MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
     // foo user
@@ -247,11 +243,10 @@ public class OrganizationMembershipTest {
   @Test
   public void groups_count_should_be_updated_when_a_member_was_just_added() {
     String orgKey = createOrganization();
-    userRule.createUser("foo", "pwd");
-
+    String user = createUser();
     MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
     page
-      .addMember("foo")
+      .addMember(user)
       .getMembersByIdx(1)
       .shouldHaveGroups(1)
       .manageGroupsOpen()
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 b0c6d60e165..feb2c6c4550 100644
--- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
+++ b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
@@ -78,6 +78,7 @@ public class LocalAuthenticationTest {
     adminWsClient = newAdminWsClient(ORCHESTRATOR);
     userTokensWsClient = adminWsClient.userTokens();
 
+    userRule.deactivateUsers(LOGIN, "simple-user");
     userRule.createUser(LOGIN, "123456");
     addUserPermission(LOGIN, "admin");
 
@@ -160,12 +161,12 @@ public class LocalAuthenticationTest {
 
   @Test
   public void basic_authentication_does_not_support_utf8_passwords() {
-    String login = LOGIN;
+    String login = "user_with_utf8_password";
     // see http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
     String password = "κόσμε";
 
     // create user with a UTF-8 password
-    userRule.createUser(login, LOGIN, null, password);
+    userRule.createUser(login, password);
 
     // authenticate
     assertThat(checkAuthenticationWithAuthenticateWebService(login, password)).isFalse();
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 9dcc39defeb..06f6c874d65 100644
--- a/it/it-tests/src/test/java/util/user/UserRule.java
+++ b/it/it-tests/src/test/java/util/user/UserRule.java
@@ -94,7 +94,8 @@ public class UserRule extends ExternalResource implements GroupManagement {
         .setParam("login", login)
         .setParam("name", name)
         .setParam("email", email)
-        .setParam("password", password));
+        .setParam("password", password))
+      .failIfNotSuccessful();
   }
 
   public void createUser(String login, String password) {
@@ -115,8 +116,8 @@ public class UserRule extends ExternalResource implements GroupManagement {
 
   public Users getUsers() {
     WsResponse response = adminWsClient().wsConnector().call(
-      new GetRequest("api/users/search"));
-    assertThat(response.code()).isEqualTo(200);
+      new GetRequest("api/users/search"))
+      .failIfNotSuccessful();
     return Users.parse(response.content());
   }
 
@@ -159,7 +160,7 @@ public class UserRule extends ExternalResource implements GroupManagement {
         .setParam("name", name)
         .setParam("description", description);
       addOrganizationParam(request);
-      adminWsClient().wsConnector().call(request);
+      adminWsClient().wsConnector().call(request).failIfNotSuccessful();
     }
 
     private void addOrganizationParam(PostRequest request) {
@@ -181,7 +182,7 @@ public class UserRule extends ExternalResource implements GroupManagement {
           PostRequest request = new PostRequest("api/user_groups/delete")
             .setParam("name", groupName);
           addOrganizationParam(request);
-          adminWsClient().wsConnector().call(request);
+          adminWsClient().wsConnector().call(request).failIfNotSuccessful();
         }
       }
     }
@@ -200,8 +201,7 @@ public class UserRule extends ExternalResource implements GroupManagement {
     public Groups getGroups() {
       GetRequest request = new GetRequest("api/user_groups/search");
       addOrganizationParam(request);
-      WsResponse response = adminWsClient().wsConnector().call(request);
-      assertThat(response.code()).isEqualTo(200);
+      WsResponse response = adminWsClient().wsConnector().call(request).failIfNotSuccessful();
       return Groups.parse(response.content());
     }