Move server ITs to there own category

10 files changed, 48 insertions, 10 deletions

diff --git a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java b/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
index 0342d44d4e7..0e8ab1f196a 100644
--- a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
+++ b/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
@@ -23,13 +23,13 @@ import administration.suite.administration.BulkDeletionTest;
 import administration.suite.administration.ProjectAdministrationTest;
 import administration.suite.administration.PropertySetsTest;
 import administration.suite.administration.SubCategoriesTest;
-import administration.suite.administration.WebServiceTest;
-import administration.suite.server.ServerAdministrationTest;
 import administration.suite.ui.I18nTest;
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import server.suite.ServerAdministrationTest;
+import server.suite.WebServiceTest;
 import util.ItUtils;
 
 import static util.ItUtils.pluginArtifact;
diff --git a/it/it-tests/src/test/java/administration/HttpsTest.java b/it/it-tests/src/test/java/server/HttpsTest.java
index 35581f2ff6d..4566ebd14c6 100644
--- a/it/it-tests/src/test/java/administration/HttpsTest.java
+++ b/it/it-tests/src/test/java/server/HttpsTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package administration;
+package server;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.util.NetworkUtils;
diff --git a/it/it-tests/src/test/java/administration/ServerTest.java b/it/it-tests/src/test/java/server/ServerTest.java
index c85e30d0e3c..477ded8658f 100644
--- a/it/it-tests/src/test/java/administration/ServerTest.java
+++ b/it/it-tests/src/test/java/server/ServerTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package administration;
+package server;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
diff --git a/it/it-tests/src/test/java/administration/suite/server/ServerAdministrationTest.java b/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java
index 2fe3b3e40ea..94a0e47adab 100644
--- a/it/it-tests/src/test/java/administration/suite/server/ServerAdministrationTest.java
+++ b/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java
@@ -3,9 +3,8 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package administration.suite.server;
+package server.suite;
 
-import administration.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
 import java.io.IOException;
@@ -30,7 +29,7 @@ import static org.junit.Assert.fail;
 public class ServerAdministrationTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
+  public static final Orchestrator orchestrator = ServerTestSuite.ORCHESTRATOR;
 
   @Test
   public void get_sonar_version() {
diff --git a/it/it-tests/src/test/java/server/suite/ServerTestSuite.java b/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
new file mode 100644
index 00000000000..75dafab3ef3
--- /dev/null
+++ b/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
@@ -0,0 +1,40 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package server.suite;
+
+import com.sonar.orchestrator.Orchestrator;
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import util.ItUtils;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  ServerAdministrationTest.class,
+  WebServiceTest.class
+})
+public class ServerTestSuite {
+
+  @ClassRule
+  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .addPlugin(ItUtils.xooPlugin())
+    .build();
+}
diff --git a/it/it-tests/src/test/java/administration/suite/administration/WebServiceTest.java b/it/it-tests/src/test/java/server/suite/WebServiceTest.java
index c10b0a04708..968c04a781b 100644
--- a/it/it-tests/src/test/java/administration/suite/administration/WebServiceTest.java
+++ b/it/it-tests/src/test/java/server/suite/WebServiceTest.java
@@ -3,9 +3,8 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package administration.suite.administration;
+package server.suite;
 
-import administration.suite.AdministrationTestSuite;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.sonar.orchestrator.Orchestrator;
@@ -34,7 +33,7 @@ import static util.ItUtils.projectDir;
 public class WebServiceTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
+  public static final Orchestrator orchestrator = ServerTestSuite.ORCHESTRATOR;
 
   @Before
   public void inspectProject() {
diff --git a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server-administration/system_info.html b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html
index 8239c6e124a..8239c6e124a 100644
--- a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server-administration/system_info.html
+++ b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server_id/missing_ip.html b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/missing_ip.html
index f946aaebbba..f946aaebbba 100644
--- a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server_id/missing_ip.html
+++ b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/missing_ip.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server_id/organisation_must_not_accept_special_chars.html b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/organisation_must_not_accept_special_chars.html
index 7aaee957676..7aaee957676 100644
--- a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server_id/organisation_must_not_accept_special_chars.html
+++ b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/organisation_must_not_accept_special_chars.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server_id/valid_id.html b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html
index 3c987a451de..3c987a451de 100644
--- a/it/it-tests/src/test/resources/administration/suite/ServerAdministrationTest/server_id/valid_id.html
+++ b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html