Move I18n to administration category and refactor administration category

.travis.yml

@@ -15,7 +15,6 @@ env:
   - JOB=ITS IT_CATEGORY=administration
   - JOB=ITS IT_CATEGORY=plugins
   - JOB=ITS IT_CATEGORY=qualitygate
-  - JOB=ITS IT_CATEGORY=ui
   - JOB=ITS IT_CATEGORY=updatecenter
 
 matrix:

it/it-tests/src/test/java/administation/HttpsTest.java

@@ -67,7 +67,7 @@ public class HttpsTest {
   @Test
   public void fail_to_start_if_bad_keystore_credentials() throws Exception {
     try {
-      URL jksKeystore = getClass().getResource("/administration/HttpsTest/keystore.jks");
+      URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
       orchestrator = Orchestrator.builderEnv()
         .setServerProperty("sonar.web.https.port", String.valueOf(httpsPort))
         .setServerProperty("sonar.web.https.keyAlias", "tests")
@@ -86,7 +86,7 @@ public class HttpsTest {
   @Test
   public void enable_https_port() throws Exception {
     // start server
-    URL jksKeystore = getClass().getResource("/administration/HttpsTest/keystore.jks");
+    URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
     orchestrator = Orchestrator.builderEnv()
       .setServerProperty("sonar.web.https.port", String.valueOf(httpsPort))
       .setServerProperty("sonar.web.https.keyAlias", "tests")

it/it-tests/src/test/java/administation/ServerTest.java

@@ -59,7 +59,7 @@ public class ServerTest {
       orchestrator.start();
 
       Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("derby-warnings",
-        "/administration/ServerTest/derby-warning.html").build();
+        "/server/ServerTest/derby-warning.html").build();
       orchestrator.executeSelenese(selenese);
     }
   }
@@ -73,13 +73,13 @@ public class ServerTest {
     orchestrator.start();
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("jdbc-settings",
-      "/administration/ServerTest/hide-jdbc-settings.html").build();
+      "/server/ServerTest/hide-jdbc-settings.html").build();
     orchestrator.executeSelenese(selenese);
   }
 
   @Test
   public void test_settings() {
-    URL secretKeyUrl = getClass().getResource("/administration/ServerTest/sonar-secret.txt");
+    URL secretKeyUrl = getClass().getResource("/server/ServerTest/sonar-secret.txt");
     orchestrator = Orchestrator.builderEnv()
       .addPlugin(ItUtils.pluginArtifact("settings-plugin"))
       .addPlugin(ItUtils.pluginArtifact("license-plugin"))
@@ -88,26 +88,26 @@ public class ServerTest {
     orchestrator.start();
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("settings",
-      "/administration/ServerTest/settings/general-settings.html",
+      "/server/ServerTest/settings/general-settings.html",
 
       // SONAR-2869 the annotation @Properties can be used on extensions and not only on plugin entry points
-      "/administration/ServerTest/settings/hidden-extension-property.html",
-      "/administration/ServerTest/settings/global-extension-property.html",
+      "/server/ServerTest/settings/hidden-extension-property.html",
+      "/server/ServerTest/settings/global-extension-property.html",
 
       // SONAR-3344 - licenses
-      "/administration/ServerTest/settings/ignore-corrupted-license.html",
-      "/administration/ServerTest/settings/display-license.html",
-      "/administration/ServerTest/settings/display-untyped-license.html",
+      "/server/ServerTest/settings/ignore-corrupted-license.html",
+      "/server/ServerTest/settings/display-license.html",
+      "/server/ServerTest/settings/display-untyped-license.html",
 
       // SONAR-2084 - encryption
-      "/administration/ServerTest/settings/generate-secret-key.html",
-      "/administration/ServerTest/settings/encrypt-text.html",
+      "/server/ServerTest/settings/generate-secret-key.html",
+      "/server/ServerTest/settings/encrypt-text.html",
 
       // SONAR-1378 - property types
-      "/administration/ServerTest/settings/validate-property-type.html",
+      "/server/ServerTest/settings/validate-property-type.html",
 
       // SONAR-3127 - hide passwords
-      "/administration/ServerTest/settings/hide-passwords.html"
+      "/server/ServerTest/settings/hide-passwords.html"
       ).build();
     orchestrator.executeSelenese(selenese);
   }
@@ -129,7 +129,7 @@ public class ServerTest {
     orchestrator.executeBuilds(withDeprecatedKey, withNewKey);
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("property_relocation",
-      "/administration/ServerTest/settings/property_relocation.html"
+      "/server/ServerTest/settings/property_relocation.html"
       ).build();
     orchestrator.executeSelenese(selenese);
   }
@@ -202,7 +202,7 @@ public class ServerTest {
   public void check_minimal_sonar_version_at_startup() throws Exception {
     try {
       orchestrator = Orchestrator.builderEnv()
-        .addPlugin(FileLocation.of(new File(ServerTest.class.getResource("/administration/ServerTest/incompatible-plugin-1.0.jar").toURI())))
+        .addPlugin(FileLocation.of(new File(ServerTest.class.getResource("/server/ServerTest/incompatible-plugin-1.0.jar").toURI())))
         .build();
       orchestrator.start();
       fail();
@@ -224,7 +224,7 @@ public class ServerTest {
       .setProperty("sonar.projectKey", "myproject.jsp"));
     // Access dashboard
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("url_ending_by_jsp",
-      "/administration/ServerTest/url_ending_by_jsp.html").build();
+      "/server/ServerTest/url_ending_by_jsp.html").build();
     orchestrator.executeSelenese(selenese);
   }
 
@@ -248,7 +248,7 @@ public class ServerTest {
     orchestrator.start();
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("settings-default-value",
-      "/administration/ServerTest/settings-default-value.html").build();
+      "/server/ServerTest/settings-default-value.html").build();
     orchestrator.executeSelenese(selenese);
   }
 

it/it-tests/src/test/java/administation/suite/AdministrationTestSuite.java

@@ -19,12 +19,20 @@
  */
 package administation.suite;
 
+import administation.suite.administration.BulkDeletionTest;
+import administation.suite.administration.ProjectAdministrationTest;
+import administation.suite.administration.PropertySetsTest;
+import administation.suite.administration.SubCategoriesTest;
+import administation.suite.administration.WebServiceTest;
+import administation.suite.server.ServerAdministrationTest;
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import util.ItUtils;
 
+import static util.ItUtils.pluginArtifact;
+
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   BulkDeletionTest.class,
@@ -41,6 +49,10 @@ public class AdministrationTestSuite {
     .setServerProperty("sonar.notifications.delay", "1")
     .addPlugin(ItUtils.pluginArtifact("property-sets-plugin"))
     .addPlugin(ItUtils.pluginArtifact("sonar-subcategories-plugin"))
+
+    // Used in I18nTest
+    .addPlugin(pluginArtifact("l10n-fr-pack"))
+
     .addPlugin(ItUtils.xooPlugin())
     .build();
 }

it/it-tests/src/test/java/administation/suite/BulkDeletionTest.java → it/it-tests/src/test/java/administation/suite/administration/BulkDeletionTest.java

@@ -17,8 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administation.suite;
+package administation.suite.administration;
 
+import administation.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;

it/it-tests/src/test/java/administation/suite/ProjectAdministrationTest.java → it/it-tests/src/test/java/administation/suite/administration/ProjectAdministrationTest.java

@@ -17,8 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administation.suite;
+package administation.suite.administration;
 
+import administation.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;

it/it-tests/src/test/java/administation/suite/PropertySetsTest.java → it/it-tests/src/test/java/administation/suite/administration/PropertySetsTest.java

@@ -17,8 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administation.suite;
+package administation.suite.administration;
 
+import administation.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
 import org.junit.ClassRule;

it/it-tests/src/test/java/administation/suite/SubCategoriesTest.java → it/it-tests/src/test/java/administation/suite/administration/SubCategoriesTest.java

@@ -17,8 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administation.suite;
+package administation.suite.administration;
 
+import administation.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;

it/it-tests/src/test/java/administation/suite/WebServiceTest.java → it/it-tests/src/test/java/administation/suite/administration/WebServiceTest.java

@@ -3,8 +3,9 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package administation.suite;
+package administation.suite.administration;
 
+import administation.suite.AdministrationTestSuite;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.sonar.orchestrator.Orchestrator;

it/it-tests/src/test/java/administation/suite/ServerAdministrationTest.java → it/it-tests/src/test/java/administation/suite/server/ServerAdministrationTest.java

@@ -3,8 +3,9 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package administation.suite;
+package administation.suite.server;
 
+import administation.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
 import java.io.IOException;
@@ -47,17 +48,17 @@ public class ServerAdministrationTest {
   @Test
   public void generate_server_id() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("server_id",
-      "/administration/suite/ServerAdministrationTest/server_id/missing_ip.html",
+      "/server/ServerAdministrationTest/server_id/missing_ip.html",
       // SONAR-4102
-      "/administration/suite/ServerAdministrationTest/organisation_must_not_accept_special_chars.html",
-      "/administration/suite/ServerAdministrationTest/valid_id.html").build();
+      "/server/ServerAdministrationTest/organisation_must_not_accept_special_chars.html",
+      "/server/ServerAdministrationTest/valid_id.html").build();
     orchestrator.executeSelenese(selenese);
   }
 
   @Test
   public void display_system_info() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("server-administration",
-      "/administration/suite/ServerAdministrationTest/server-administration/system_info.html"
+      "/server/ServerAdministrationTest/server-administration/system_info.html"
       ).build();
     orchestrator.executeSelenese(selenese);
   }

it/it-tests/src/test/java/ui/I18nTest.java → it/it-tests/src/test/java/administation/suite/ui/I18nTest.java

@@ -18,8 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package ui;
+package administation.suite.ui;
 
+import administation.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
@@ -27,17 +28,12 @@ import org.junit.After;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static util.ItUtils.pluginArtifact;
 import static util.ItUtils.projectDir;
-import static util.ItUtils.xooPlugin;
 
 public class I18nTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .addPlugin(pluginArtifact("l10n-fr-pack"))
-    .addPlugin(xooPlugin())
-    .build();
+  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
 
   @After
   public void cleanDatabase() {