Add category "issue" in integration tests

5 files changed, 10 insertions, 40 deletions

diff --git a/tests/src/test/java/org/sonarqube/tests/Category4Suite.java b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
index 94d9a43693a..bf333205632 100644
--- a/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
@@ -28,6 +28,7 @@ import org.sonarqube.tests.analysis.IssueExclusionsTest;
 import org.sonarqube.tests.ce.CeTempDirTest;
 import org.sonarqube.tests.ce.CeWsTest;
 import org.sonarqube.tests.qualityProfile.QualityProfilesUiTest;
+import org.sonarqube.tests.rule.RulesPageTest;
 import org.sonarqube.tests.serverSystem.HttpHeadersTest;
 import org.sonarqube.tests.serverSystem.LogsTest;
 import org.sonarqube.tests.serverSystem.PingTest;
@@ -82,6 +83,7 @@ import static util.ItUtils.xooPlugin;
   WsTest.class,
   // quality profiles
   QualityProfilesUiTest.class,
+  RulesPageTest.class,
   LogsTest.class,
   // ce
   CeWsTest.class,
diff --git a/tests/src/test/java/org/sonarqube/tests/issue/AbstractIssueTest.java b/tests/src/test/java/org/sonarqube/tests/issue/AbstractIssueTest.java
index fe452745f1a..6a50a05d4a7 100644
--- a/tests/src/test/java/org/sonarqube/tests/issue/AbstractIssueTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/AbstractIssueTest.java
@@ -26,14 +26,13 @@ import org.sonar.wsclient.issue.Issue;
 import org.sonar.wsclient.issue.IssueClient;
 import org.sonar.wsclient.issue.IssueQuery;
 import org.sonar.wsclient.issue.Issues;
-import org.sonarqube.tests.Category2Suite;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class AbstractIssueTest {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Category2Suite.ORCHESTRATOR;
+  public static final Orchestrator ORCHESTRATOR = IssueSuite.ORCHESTRATOR;
 
   static IssueClient adminIssueClient() {
     return ORCHESTRATOR.getServer().adminWsClient().issueClient();
diff --git a/tests/src/test/java/org/sonarqube/tests/Category2Suite.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueSuite.java
index 619aa95106b..e86b2f6635f 100644
--- a/tests/src/test/java/org/sonarqube/tests/Category2Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueSuite.java
@@ -17,44 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarqube.tests;
+package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import org.sonarqube.tests.component.BranchTest;
-import org.sonarqube.tests.issue.AutoAssignTest;
-import org.sonarqube.tests.issue.CommonRulesTest;
-import org.sonarqube.tests.issue.CustomRulesTest;
-import org.sonarqube.tests.issue.IssueActionTest;
-import org.sonarqube.tests.issue.IssueBulkChangeTest;
-import org.sonarqube.tests.issue.IssueChangelogTest;
-import org.sonarqube.tests.issue.IssueCreationDateQPChangedTest;
-import org.sonarqube.tests.issue.IssueCreationTest;
-import org.sonarqube.tests.issue.IssueFilterExtensionTest;
-import org.sonarqube.tests.issue.IssueFilterOnCommonRulesTest;
-import org.sonarqube.tests.issue.IssueFilterTest;
-import org.sonarqube.tests.issue.IssueMeasureTest;
-import org.sonarqube.tests.issue.IssuePurgeTest;
-import org.sonarqube.tests.issue.IssueSearchTest;
-import org.sonarqube.tests.issue.IssueTrackingTest;
-import org.sonarqube.tests.issue.IssueWorkflowTest;
-import org.sonarqube.tests.issue.IssuesPageTest;
-import org.sonarqube.tests.issue.NewIssuesMeasureTest;
-import org.sonarqube.tests.rule.RulesPageTest;
 
 import static util.ItUtils.pluginArtifact;
 import static util.ItUtils.xooPlugin;
 
-/**
- * @deprecated use dedicated suites in each package (see {@link org.sonarqube.tests.measure.MeasureSuite}
- * for instance)
- */
-@Deprecated
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-  // issue
   AutoAssignTest.class,
   CommonRulesTest.class,
   CustomRulesTest.class,
@@ -72,13 +46,9 @@ import static util.ItUtils.xooPlugin;
   IssueWorkflowTest.class,
   NewIssuesMeasureTest.class,
   IssueCreationDateQPChangedTest.class,
-  IssuesPageTest.class,
-  // rule
-  RulesPageTest.class,
-  // branch
-  BranchTest.class
+  IssuesPageTest.class
 })
-public class Category2Suite {
+public class IssueSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssuesPageTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssuesPageTest.java
index e3065647298..699ca87b024 100644
--- a/tests/src/test/java/org/sonarqube/tests/issue/IssuesPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssuesPageTest.java
@@ -20,7 +20,6 @@
 package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.Orchestrator;
-import org.sonarqube.tests.Category2Suite;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -38,7 +37,7 @@ public class IssuesPageTest {
   private static final String PROJECT_KEY = "sample";
 
   @ClassRule
-  public static Orchestrator ORCHESTRATOR = Category2Suite.ORCHESTRATOR;
+  public static Orchestrator ORCHESTRATOR = IssueSuite.ORCHESTRATOR;
 
   @Rule
   public UserRule userRule = UserRule.from(ORCHESTRATOR);
diff --git a/tests/src/test/java/org/sonarqube/tests/rule/RulesPageTest.java b/tests/src/test/java/org/sonarqube/tests/rule/RulesPageTest.java
index 97b2d2b205a..312304ebca8 100644
--- a/tests/src/test/java/org/sonarqube/tests/rule/RulesPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/rule/RulesPageTest.java
@@ -23,13 +23,13 @@ import com.sonar.orchestrator.Orchestrator;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.qa.util.pageobjects.RulesPage;
-import org.sonarqube.tests.Category2Suite;
 import org.sonarqube.qa.util.Tester;
+import org.sonarqube.qa.util.pageobjects.RulesPage;
+import org.sonarqube.tests.Category4Suite;
 
 public class RulesPageTest {
   @ClassRule
-  public static Orchestrator ORCHESTRATOR = Category2Suite.ORCHESTRATOR;
+  public static Orchestrator ORCHESTRATOR = Category4Suite.ORCHESTRATOR;
 
   @Rule
   public Tester tester = new Tester(ORCHESTRATOR).disableOrganizations();