SONAR-8715 Allow provisioning of non-local users

2 files changed, 39 insertions, 1 deletions

diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/user/CreateRequestTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/user/CreateRequestTest.java
index 0ba49c20a98..ddcfeef94f7 100644
--- a/sonar-ws/src/test/java/org/sonarqube/ws/client/user/CreateRequestTest.java
+++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/user/CreateRequestTest.java
@@ -49,6 +49,30 @@ public class CreateRequestTest {
     assertThat(result.getName()).isEqualTo("John");
     assertThat(result.getEmail()).isEqualTo("john@doo.com");
     assertThat(result.getScmAccounts()).containsOnly("jo", "hn");
+    assertThat(result.isLocal()).isTrue();
+  }
+
+  @Test
+  public void create_request_for_local_user() {
+    CreateRequest result = underTest
+      .setLogin("john")
+      .setPassword("123456")
+      .setName("John")
+      .setLocal(true)
+      .build();
+
+    assertThat(result.isLocal()).isTrue();
+  }
+
+  @Test
+  public void create_request_for_none_local_user() {
+    CreateRequest result = underTest
+      .setLogin("john")
+      .setName("John")
+      .setLocal(false)
+      .build();
+
+    assertThat(result.isLocal()).isFalse();
   }
 
   @Test
@@ -74,7 +98,7 @@ public class CreateRequestTest {
   }
 
   @Test
-  public void fail_when_empty_password() {
+  public void fail_when_empty_password_on_local_user() {
     expectedException.expect(IllegalArgumentException.class);
     underTest
       .setLogin("john")
@@ -93,4 +117,15 @@ public class CreateRequestTest {
       .build();
   }
 
+  @Test
+  public void fail_when_password_is_set_on_none_local_user() {
+    expectedException.expect(IllegalArgumentException.class);
+    underTest
+      .setLogin("john")
+      .setPassword("12345")
+      .setName("12345")
+      .setLocal(false)
+      .build();
+  }
+
 }
diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/user/UsersServiceTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/user/UsersServiceTest.java
index b652dc30869..b772983d52d 100644
--- a/sonar-ws/src/test/java/org/sonarqube/ws/client/user/UsersServiceTest.java
+++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/user/UsersServiceTest.java
@@ -30,6 +30,7 @@ import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_EMAIL;
+import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_LOCAL;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_LOGIN;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_NAME;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_PASSWORD;
@@ -50,6 +51,7 @@ public class UsersServiceTest {
       .setName("John")
       .setEmail("john@doo.com")
       .setScmAccounts(asList("jo", "hn"))
+      .setLocal(true)
       .build());
 
     assertThat(serviceTester.getPostParser()).isSameAs(CreateWsResponse.parser());
@@ -59,6 +61,7 @@ public class UsersServiceTest {
       .hasParam(PARAM_NAME, "John")
       .hasParam(PARAM_EMAIL, "john@doo.com")
       .hasParam(PARAM_SCM_ACCOUNT, asList("jo", "hn"))
+      .hasParam(PARAM_LOCAL, "true")
       .andNoOtherParam();
   }