2 files changed, 26 insertions, 19 deletions

diff --git a/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java
index 231edba99be..40fbaf322e8 100644
--- a/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java
+++ b/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java
@@ -27,19 +27,19 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.wsclient.SonarClient;
-import org.sonar.wsclient.base.HttpException;
-import org.sonar.wsclient.project.NewProject;
-import org.sonar.wsclient.project.Project;
+import org.sonarqube.ws.WsProjects.CreateWsResponse.Project;
+import org.sonarqube.ws.client.HttpException;
 import org.sonarqube.ws.client.permission.AddGroupWsRequest;
 import org.sonarqube.ws.client.permission.AddUserWsRequest;
 import org.sonarqube.ws.client.permission.PermissionsService;
 import org.sonarqube.ws.client.permission.RemoveGroupWsRequest;
 import org.sonarqube.ws.client.permission.RemoveUserWsRequest;
+import org.sonarqube.ws.client.project.CreateRequest;
 import util.user.UserRule;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.newAdminWsClient;
+import static util.ItUtils.newUserWsClient;
 import static util.selenium.Selenese.runSelenese;
 
 public class ProvisioningPermissionTest {
@@ -117,13 +117,13 @@ public class ProvisioningPermissionTest {
     final String newKey = "new-project";
     final String newName = "New Project";
 
-    SonarClient client = orchestrator.getServer().wsClient(USER_WITH_PROVISIONING, PASSWORD);
-
-    Project created = client.projectClient().create(NewProject.create().key(newKey).name(newName));
+    Project created = newUserWsClient(orchestrator, USER_WITH_PROVISIONING, PASSWORD).projects()
+      .create(CreateRequest.builder().setKey(newKey).setName(newName).build())
+      .getProject();
 
     assertThat(created).isNotNull();
-    assertThat(created.key()).isEqualTo(newKey);
-    assertThat(created.name()).isEqualTo(newName);
+    assertThat(created.getKey()).isEqualTo(newKey);
+    assertThat(created.getName()).isEqualTo(newName);
   }
 
   /**
@@ -132,11 +132,12 @@ public class ProvisioningPermissionTest {
    */
   @Test
   public void should_not_be_allowed_on_ws_without_permission() {
-    SonarClient client = orchestrator.getServer().wsClient(USER_WITHOUT_PROVISIONING, PASSWORD);
-
     thrown.expect(HttpException.class);
-    thrown.expectMessage("401");
-    client.projectClient().create(NewProject.create().key("new-project").name("New Project"));
+    thrown.expectMessage("403");
+
+    newUserWsClient(orchestrator, USER_WITHOUT_PROVISIONING, PASSWORD).projects()
+      .create(CreateRequest.builder().setKey("new-project").setName("New Project").build())
+      .getProject();
   }
 
   private static void addUserPermission(String login, String permission) {
diff --git a/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java b/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java
index c660fa89109..c055e6edf6b 100644
--- a/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java
+++ b/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java
@@ -40,7 +40,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.sonar.wsclient.project.NewProject;
 import org.sonar.wsclient.qualitygate.NewCondition;
 import org.sonar.wsclient.qualitygate.QualityGate;
 import org.sonar.wsclient.qualitygate.QualityGateClient;
@@ -49,6 +48,7 @@ import org.sonarqube.ws.WsCe;
 import org.sonarqube.ws.WsMeasures.Measure;
 import org.sonarqube.ws.WsQualityGates.ProjectStatusWsResponse;
 import org.sonarqube.ws.client.GetRequest;
+import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.WsResponse;
 import org.sonarqube.ws.client.qualitygate.ProjectStatusWsRequest;
@@ -71,8 +71,6 @@ public class QualityGateTest {
 
   private static long DEFAULT_QUALITY_GATE;
 
-  private long provisionedProjectId = -1L;
-
   private static final String PROJECT_KEY = "sample";
 
   @ClassRule
@@ -91,9 +89,9 @@ public class QualityGateTest {
   }
 
   @Before
-  public void cleanUp() {
+  public void before() {
     orchestrator.resetData();
-    provisionedProjectId = Long.parseLong(orchestrator.getServer().adminWsClient().projectClient().create(NewProject.create().key(PROJECT_KEY).name("Sample")).id());
+    orchestrator.getServer().provisionProject(PROJECT_KEY, "Sample");
   }
 
   @Test
@@ -190,7 +188,7 @@ public class QualityGateTest {
     qgClient().createCondition(NewCondition.create(error.id()).metricKey("ncloc").operator("GT").errorThreshold("10"));
 
     qgClient().setDefault(alert.id());
-    qgClient().selectProject(error.id(), provisionedProjectId);
+    associateQualityGateToProject(error.id(), PROJECT_KEY);
 
     try {
       SonarScanner build = SonarScanner.create(projectDir("qualitygate/xoo-sample"));
@@ -303,6 +301,14 @@ public class QualityGateTest {
     return orchestrator.getServer().adminWsClient().qualityGateClient();
   }
 
+  private static void associateQualityGateToProject(long qGateId, String projectKey) {
+    newAdminWsClient(orchestrator).wsConnector()
+      .call(new PostRequest("api/qualitygates/select")
+        .setParam("gateId", qGateId)
+        .setParam("projectKey", projectKey))
+      .failIfNotSuccessful();
+  }
+
   private static List<String> extractPosttaskPluginLogs(String taskUuid, Iterable<String> ceLogs) {
     return StreamSupport.stream(ceLogs.spliterator(), false)
       .filter(s -> s.contains("POSTASKPLUGIN: finished()"))