Move SystemAdminPermissionTest to authorisation

9 files changed, 28 insertions, 44 deletions

diff --git a/it/it-tests/src/test/java/it/Category1Suite.java b/it/it-tests/src/test/java/it/Category1Suite.java
index 8e5b1bdeac5..a81080064be 100644
--- a/it/it-tests/src/test/java/it/Category1Suite.java
+++ b/it/it-tests/src/test/java/it/Category1Suite.java
@@ -47,6 +47,7 @@ import it.authorisation.IssuePermissionTest;
 import it.authorisation.PermissionSearchTest;
 import it.authorisation.ProvisioningPermissionTest;
 import it.authorisation.QualityProfileAdminPermissionTest;
+import it.authorisation.SystemAdminPermissionTest;
 import it.i18n.I18nTest;
 import it.measureHistory.DifferentialPeriodsTest;
 import it.measureHistory.HistoryUiTest;
@@ -100,13 +101,14 @@ import static util.ItUtils.xooPlugin;
   QualityGateTest.class,
   QualityGateUiTest.class,
   QualityGateNotificationTest.class,
-  // permission
+  // authorisation
   DashboardSharingPermissionTest.class,
   ExecuteAnalysisPermissionTest.class,
   IssuePermissionTest.class,
   PermissionSearchTest.class,
   ProvisioningPermissionTest.class,
   QualityProfileAdminPermissionTest.class,
+  SystemAdminPermissionTest.class,
   // measure history
   DifferentialPeriodsTest.class,
   HistoryUiTest.class,
diff --git a/it/it-tests/src/test/java/it/permissions/SystemAdminPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/SystemAdminPermissionTest.java
index 5f04b26d796..cb893b6a49b 100644
--- a/it/it-tests/src/test/java/it/permissions/SystemAdminPermissionTest.java
+++ b/it/it-tests/src/test/java/it/authorisation/SystemAdminPermissionTest.java
@@ -17,42 +17,45 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.permissions;
+package it.authorisation;
 
 import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.selenium.Selenese;
-import it.Category4Suite;
+import it.Category1Suite;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.sonarqube.ws.client.PostRequest;
-import org.sonarqube.ws.client.WsClient;
-import util.ItUtils;
+import org.sonarqube.ws.client.permission.AddUserWsRequest;
+import org.sonarqube.ws.client.permission.PermissionsService;
+import util.user.UserRule;
+
+import static util.ItUtils.newAdminWsClient;
+import static util.ItUtils.runProjectAnalysis;
 
 public class SystemAdminPermissionTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
+
+  @ClassRule
+  public static UserRule userRule = UserRule.from(orchestrator);
 
   @BeforeClass
   public static void setUpUsers() {
     orchestrator.resetData();
 
-    WsClient client = ItUtils.newAdminWsClient(orchestrator);
+    PermissionsService permissionsWsClient = newAdminWsClient(orchestrator).permissions();
 
-    createUser(client, "can_share", "password");
-    addPermission("can_share", "shareDashboard");
+    userRule.createUser("can_share", "password");
+    permissionsWsClient.addUser(new AddUserWsRequest().setLogin("can_share").setPermission("shareDashboard"));
 
-    createUser(client, "cannot_share", "password");
+    userRule.createUser("cannot_share", "password");
   }
 
   @AfterClass
   public static void reset() {
-    WsClient client = ItUtils.newAdminWsClient(orchestrator);
-    deactivateUser(client, "can_share");
-    deactivateUser(client, "cannot_share");
+    userRule.resetUsers();
   }
 
   /**
@@ -64,9 +67,9 @@ public class SystemAdminPermissionTest {
     // 1 - as admin, create measure filter, shared with every one
     // 2 - as admin, edit filter and set owner to can_share
     seleniumSuite("change-measure-filter-ownership",
-      "/permissions/SystemAdminPermissionTest/change-own-measure-filter-owner.html",
-      "/permissions/SystemAdminPermissionTest/change-other-measure-filter-owner.html",
-      "/permissions/SystemAdminPermissionTest/change-system-measure-filter-owner.html");
+      "/authorisation/SystemAdminPermissionTest/change-own-measure-filter-owner.html",
+      "/authorisation/SystemAdminPermissionTest/change-other-measure-filter-owner.html",
+      "/authorisation/SystemAdminPermissionTest/change-system-measure-filter-owner.html");
   }
 
   /**
@@ -75,8 +78,8 @@ public class SystemAdminPermissionTest {
   @Test
   public void should_change_ownership_of_shared_global_dashboard() throws Exception {
     seleniumSuite("change-global-dashboard-ownership",
-      "/permissions/SystemAdminPermissionTest/change-shared-global-dashboard-owner.html",
-      "/permissions/SystemAdminPermissionTest/change-shared-global-dashboard-owner-failure.html");
+      "/authorisation/SystemAdminPermissionTest/change-shared-global-dashboard-owner.html",
+      "/authorisation/SystemAdminPermissionTest/change-shared-global-dashboard-owner-failure.html");
   }
 
   /**
@@ -84,11 +87,11 @@ public class SystemAdminPermissionTest {
    */
   @Test
   public void should_change_ownership_of_shared_project_dashboard() throws Exception {
-    orchestrator.executeBuild(SonarScanner.create(ItUtils.projectDir("shared/xoo-sample")));
+    runProjectAnalysis(orchestrator, "shared/xoo-sample");
 
     seleniumSuite("change-project-dashboard-ownership",
-      "/permissions/SystemAdminPermissionTest/change-shared-project-dashboard-owner.html",
-      "/permissions/SystemAdminPermissionTest/change-shared-project-dashboard-owner-failure.html");
+      "/authorisation/SystemAdminPermissionTest/change-shared-project-dashboard-owner.html",
+      "/authorisation/SystemAdminPermissionTest/change-shared-project-dashboard-owner-failure.html");
   }
 
   private void seleniumSuite(String suiteName, String... tests) {
@@ -96,25 +99,4 @@ public class SystemAdminPermissionTest {
     orchestrator.executeSelenese(selenese);
   }
 
-  private static void addPermission(String login, String permission) {
-    orchestrator.getServer().adminWsClient().post("api/permissions/add_user",
-      "login", login,
-      "permission", permission);
-  }
-
-  private static void createUser(WsClient client, String login, String password) {
-    client.wsConnector().call(
-      new PostRequest("api/users/create")
-        .setParam("login", login)
-        .setParam("name", login)
-        .setParam("password", password)
-      );
-  }
-
-  private static void deactivateUser(WsClient client, String login) {
-    client.wsConnector().call(
-      new PostRequest("/api/users/deactivate")
-        .setParam("login", login)
-      );
-  }
 }
diff --git a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-other-measure-filter-owner.html b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-other-measure-filter-owner.html
index bd7ab433180..bd7ab433180 100644
--- a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-other-measure-filter-owner.html
+++ b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-other-measure-filter-owner.html
diff --git a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-own-measure-filter-owner.html b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-own-measure-filter-owner.html
index fda11c0eb7a..fda11c0eb7a 100644
--- a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-own-measure-filter-owner.html
+++ b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-own-measure-filter-owner.html
diff --git a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-global-dashboard-owner-failure.html b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-global-dashboard-owner-failure.html
index d89c7cb54af..d89c7cb54af 100644
--- a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-global-dashboard-owner-failure.html
+++ b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-global-dashboard-owner-failure.html
diff --git a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-global-dashboard-owner.html b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-global-dashboard-owner.html
index 46819e977fc..46819e977fc 100644
--- a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-global-dashboard-owner.html
+++ b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-global-dashboard-owner.html
diff --git a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-project-dashboard-owner-failure.html b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-project-dashboard-owner-failure.html
index 7a4545dcfd3..7a4545dcfd3 100644
--- a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-project-dashboard-owner-failure.html
+++ b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-project-dashboard-owner-failure.html
diff --git a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-project-dashboard-owner.html b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-project-dashboard-owner.html
index 05bfe502af7..05bfe502af7 100644
--- a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-shared-project-dashboard-owner.html
+++ b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-shared-project-dashboard-owner.html
diff --git a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-system-measure-filter-owner.html b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-system-measure-filter-owner.html
index 0379982322e..0379982322e 100644
--- a/it/it-tests/src/test/resources/permissions/SystemAdminPermissionTest/change-system-measure-filter-owner.html
+++ b/it/it-tests/src/test/resources/authorisation/SystemAdminPermissionTest/change-system-measure-filter-owner.html