From 15e60eb2838947759fa35622a8a00e35cc2fccd6 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sun, 24 Jul 2016 20:39:12 +0200 Subject: [PATCH] Remove unused imports in ITs --- .../src/test/java/it/analysis/BatchTest.java | 1 - .../it/analysis/ExtensionLifecycleTest.java | 1 - .../src/test/java/it/analysis/LinksTest.java | 1 - .../src/test/java/it/analysis/MavenTest.java | 1 - .../java/it/analysis/ProjectBuilderTest.java | 1 - .../test/java/it/analysis/ReportDumpTest.java | 13 +++++----- .../it/analysis/SettingsEncryptionTest.java | 1 - .../test/java/it/analysis/TempFolderTest.java | 1 - .../DashboardSharingPermissionTest.java | 1 - .../ExecuteAnalysisPermissionTest.java | 1 - .../it/authorisation/IssuePermissionTest.java | 1 - .../authorisation/PermissionSearchTest.java | 1 - .../PermissionTemplatesPageTest.java | 1 - .../ProvisioningPermissionTest.java | 1 - .../QualityProfileAdminPermissionTest.java | 1 - it/it-tests/src/test/java/it/ce/CeWsTest.java | 1 - .../java/it/component/ProjectSearchTest.java | 1 - .../it/componentDashboard/DashboardTest.java | 1 - .../it/componentSearch/AllProjectsTest.java | 1 - .../it/customMeasure/CustomMeasuresTest.java | 1 - .../CrossModuleDuplicationsTest.java | 6 ++--- ...ssProjectDuplicationsOnRemoveFileTest.java | 1 - .../test/java/it/http/HttpHeadersTest.java | 5 ++-- .../src/test/java/it/i18n/I18nTest.java | 1 - .../test/java/it/issue/CommonRulesTest.java | 1 - .../test/java/it/issue/CustomRulesTest.java | 1 - .../test/java/it/issue/IssueActionTest.java | 1 - .../java/it/issue/IssueBulkChangeTest.java | 1 - .../java/it/issue/IssueChangelogTest.java | 1 - .../it/issue/IssueFilterExtensionTest.java | 1 - .../issue/IssueFilterOnCommonRulesTest.java | 1 - .../test/java/it/issue/IssueFilterTest.java | 1 - .../java/it/issue/IssueNotificationsTest.java | 1 - .../test/java/it/issue/IssuePurgeTest.java | 1 - .../it/measure/DecimalScaleMetricTest.java | 1 - .../it/measureFilter/MeasureFiltersTest.java | 1 - .../java/it/measureHistory/HistoryUiTest.java | 1 - .../SincePreviousVersionHistoryTest.java | 1 - .../measureHistory/SinceXDaysHistoryTest.java | 1 - .../it/measureHistory/TimeMachineTest.java | 1 - .../BulkDeletionTest.java | 1 - .../ProjectAdministrationTest.java | 25 ++++++++----------- .../ProjectPermissionsTest.java | 1 - .../ProjectComparisonTest.java | 1 - .../test/java/it/projectEvent/EventTest.java | 1 - .../QualityGateNotificationTest.java | 1 - .../it/qualityGate/QualityGateUiTest.java | 1 - .../qualityModel/DebtConfigurationRule.java | 1 - .../TechnicalDebtInIssueChangelogTest.java | 1 - .../qualityModel/TechnicalDebtWidgetTest.java | 6 ++--- .../java/it/serverSystem/RestartTest.java | 1 - .../it/serverSystem/ServerSystemTest.java | 1 - .../java/it/settings/PropertySetsTest.java | 1 - .../SettingsTestRestartingOrchestrator.java | 1 - .../java/it/settings/SubCategoriesTest.java | 1 - .../test/java/it/sourceCode/EncodingTest.java | 1 - .../java/it/test/CoverageTrackingTest.java | 1 - .../java/it/uiExtension/UiExtensionsTest.java | 1 - .../it/user/BaseIdentityProviderTest.java | 1 - .../java/it/user/LocalAuthenticationTest.java | 1 - .../test/java/it/user/MyAccountPageTest.java | 7 ++++-- .../it/user/OAuth2IdentityProviderTest.java | 5 ++-- .../user/RailsExternalAuthenticationTest.java | 15 ++++++----- .../src/test/java/it/ws/WsLocalCallTest.java | 1 - 64 files changed, 37 insertions(+), 101 deletions(-) diff --git a/it/it-tests/src/test/java/it/analysis/BatchTest.java b/it/it-tests/src/test/java/it/analysis/BatchTest.java index d92f0c9b20e..06ce6e9c155 100644 --- a/it/it-tests/src/test/java/it/analysis/BatchTest.java +++ b/it/it-tests/src/test/java/it/analysis/BatchTest.java @@ -34,7 +34,6 @@ import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.wsclient.Sonar; diff --git a/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java b/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java index 8ca4ded1db1..997bd620852 100644 --- a/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java +++ b/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java @@ -25,7 +25,6 @@ import it.Category3Suite; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.ItUtils; public class ExtensionLifecycleTest { diff --git a/it/it-tests/src/test/java/it/analysis/LinksTest.java b/it/it-tests/src/test/java/it/analysis/LinksTest.java index b5e1b919e24..b72f245210c 100644 --- a/it/it-tests/src/test/java/it/analysis/LinksTest.java +++ b/it/it-tests/src/test/java/it/analysis/LinksTest.java @@ -32,7 +32,6 @@ import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/it/it-tests/src/test/java/it/analysis/MavenTest.java b/it/it-tests/src/test/java/it/analysis/MavenTest.java index 0f13ce919de..ad9d0cc33cd 100644 --- a/it/it-tests/src/test/java/it/analysis/MavenTest.java +++ b/it/it-tests/src/test/java/it/analysis/MavenTest.java @@ -28,7 +28,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.Sonar; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; diff --git a/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java b/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java index 6e1f3970a62..8236c5fed52 100644 --- a/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java +++ b/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java @@ -24,7 +24,6 @@ import com.sonar.orchestrator.build.MavenBuild; import it.Category3Suite; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; import util.ItUtils; diff --git a/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java b/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java index 2232dfba897..9adc6c620ed 100644 --- a/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java +++ b/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java @@ -21,22 +21,21 @@ package it.analysis; import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.build.SonarScanner; +import it.Category3Suite; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.nio.charset.StandardCharsets; +import java.util.Properties; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import it.Category3Suite; import org.apache.commons.io.FileUtils; import org.junit.ClassRule; import org.junit.Test; import util.ItUtils; -import java.io.File; -import java.io.IOException; -import java.io.StringReader; -import java.nio.charset.StandardCharsets; -import java.util.Properties; - import static org.assertj.core.api.Assertions.assertThat; public class ReportDumpTest { diff --git a/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java b/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java index 71b9e388fe5..5ed1db9f9a2 100644 --- a/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java +++ b/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java @@ -28,7 +28,6 @@ import java.io.File; import java.net.URL; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/it/it-tests/src/test/java/it/analysis/TempFolderTest.java b/it/it-tests/src/test/java/it/analysis/TempFolderTest.java index 52289594b05..20a822474d5 100644 --- a/it/it-tests/src/test/java/it/analysis/TempFolderTest.java +++ b/it/it-tests/src/test/java/it/analysis/TempFolderTest.java @@ -26,7 +26,6 @@ import com.sonar.orchestrator.locator.FileLocation; import it.Category3Suite; import java.io.File; import java.io.IOException; - import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; diff --git a/it/it-tests/src/test/java/it/authorisation/DashboardSharingPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/DashboardSharingPermissionTest.java index d58ce40fea0..3236b69ccfc 100644 --- a/it/it-tests/src/test/java/it/authorisation/DashboardSharingPermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/DashboardSharingPermissionTest.java @@ -27,7 +27,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.client.permission.AddUserWsRequest; import org.sonarqube.ws.client.permission.PermissionsService; import util.user.UserRule; diff --git a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java index 978de136edf..c7438fb61dc 100644 --- a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java @@ -26,7 +26,6 @@ import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.SonarClient; import org.sonar.wsclient.user.UserParameters; import org.sonarqube.ws.client.WsClient; diff --git a/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java b/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java index 105f16a5672..0ae2fa15ce0 100644 --- a/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java @@ -26,7 +26,6 @@ import it.Category1Suite; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.SonarClient; import org.sonar.wsclient.base.HttpException; import org.sonar.wsclient.issue.BulkChange; diff --git a/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java b/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java index 86216e5eae6..fbbda55df66 100644 --- a/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java +++ b/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java @@ -27,7 +27,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.WsPermissions; import org.sonarqube.ws.WsPermissions.Permission; import org.sonarqube.ws.WsPermissions.SearchTemplatesWsResponse; diff --git a/it/it-tests/src/test/java/it/authorisation/PermissionTemplatesPageTest.java b/it/it-tests/src/test/java/it/authorisation/PermissionTemplatesPageTest.java index 5402c9a4940..965ea125b61 100644 --- a/it/it-tests/src/test/java/it/authorisation/PermissionTemplatesPageTest.java +++ b/it/it-tests/src/test/java/it/authorisation/PermissionTemplatesPageTest.java @@ -24,7 +24,6 @@ import com.sonar.orchestrator.selenium.Selenese; import it.Category1Suite; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; public class PermissionTemplatesPageTest { 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 706c37b99eb..93181867fa3 100644 --- a/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java @@ -27,7 +27,6 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.wsclient.SonarClient; import org.sonar.wsclient.base.HttpException; diff --git a/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java index e97520da443..befe2c242a2 100644 --- a/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java @@ -26,7 +26,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.client.permission.AddUserWsRequest; import org.sonarqube.ws.client.permission.PermissionsService; import util.user.UserRule; diff --git a/it/it-tests/src/test/java/it/ce/CeWsTest.java b/it/it-tests/src/test/java/it/ce/CeWsTest.java index 994206391a7..5dc35465476 100644 --- a/it/it-tests/src/test/java/it/ce/CeWsTest.java +++ b/it/it-tests/src/test/java/it/ce/CeWsTest.java @@ -26,7 +26,6 @@ import it.Category4Suite; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.WsCe; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.ce.ActivityWsRequest; diff --git a/it/it-tests/src/test/java/it/component/ProjectSearchTest.java b/it/it-tests/src/test/java/it/component/ProjectSearchTest.java index acd80e7a7ba..a7db7494155 100644 --- a/it/it-tests/src/test/java/it/component/ProjectSearchTest.java +++ b/it/it-tests/src/test/java/it/component/ProjectSearchTest.java @@ -32,7 +32,6 @@ import org.apache.http.util.EntityUtils; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java b/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java index 41b4ec08306..b4e57a57af9 100644 --- a/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java +++ b/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java @@ -25,7 +25,6 @@ import it.Category4Suite; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import static util.ItUtils.runProjectAnalysis; diff --git a/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java b/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java index 2baed5658b0..524eb6cf74a 100644 --- a/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java +++ b/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java @@ -26,7 +26,6 @@ import it.Category4Suite; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java b/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java index 4da48da5810..b2ade28a916 100644 --- a/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java +++ b/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java @@ -27,7 +27,6 @@ import java.util.regex.Pattern; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Measure; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; diff --git a/it/it-tests/src/test/java/it/duplication/CrossModuleDuplicationsTest.java b/it/it-tests/src/test/java/it/duplication/CrossModuleDuplicationsTest.java index d5909383fc8..371a4917249 100644 --- a/it/it-tests/src/test/java/it/duplication/CrossModuleDuplicationsTest.java +++ b/it/it-tests/src/test/java/it/duplication/CrossModuleDuplicationsTest.java @@ -24,21 +24,19 @@ import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.build.SonarScanner; import com.sonar.orchestrator.locator.FileLocation; import it.Category4Suite; +import java.io.File; +import java.io.IOException; import org.apache.commons.io.FileUtils; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; import util.ItUtils; -import java.io.File; -import java.io.IOException; - import static org.assertj.core.api.Assertions.assertThat; public class CrossModuleDuplicationsTest { diff --git a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsOnRemoveFileTest.java b/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsOnRemoveFileTest.java index 6ce4fbda7b9..45741d2a18e 100644 --- a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsOnRemoveFileTest.java +++ b/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsOnRemoveFileTest.java @@ -27,7 +27,6 @@ import org.apache.commons.io.IOUtils; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.ResourceQuery; import util.selenium.SeleneseTest; diff --git a/it/it-tests/src/test/java/it/http/HttpHeadersTest.java b/it/it-tests/src/test/java/it/http/HttpHeadersTest.java index 3e32d21b418..3c7864a6815 100644 --- a/it/it-tests/src/test/java/it/http/HttpHeadersTest.java +++ b/it/it-tests/src/test/java/it/http/HttpHeadersTest.java @@ -22,15 +22,14 @@ package it.http; import com.google.common.base.Throwables; import com.sonar.orchestrator.Orchestrator; +import it.Category4Suite; +import java.io.IOException; import okhttp3.CacheControl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import it.Category4Suite; -import java.io.IOException; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.assertj.core.api.Assertions.assertThat; diff --git a/it/it-tests/src/test/java/it/i18n/I18nTest.java b/it/it-tests/src/test/java/it/i18n/I18nTest.java index 5cd16ca59f8..58b2b509f3d 100644 --- a/it/it-tests/src/test/java/it/i18n/I18nTest.java +++ b/it/it-tests/src/test/java/it/i18n/I18nTest.java @@ -27,7 +27,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/issue/CommonRulesTest.java b/it/it-tests/src/test/java/it/issue/CommonRulesTest.java index 531b1658943..5b676c907d8 100644 --- a/it/it-tests/src/test/java/it/issue/CommonRulesTest.java +++ b/it/it-tests/src/test/java/it/issue/CommonRulesTest.java @@ -23,7 +23,6 @@ import com.sonar.orchestrator.locator.FileLocation; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.Issues.Issue; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.issue.SearchWsRequest; diff --git a/it/it-tests/src/test/java/it/issue/CustomRulesTest.java b/it/it-tests/src/test/java/it/issue/CustomRulesTest.java index 5b9ffd53ba4..7d3478b5312 100644 --- a/it/it-tests/src/test/java/it/issue/CustomRulesTest.java +++ b/it/it-tests/src/test/java/it/issue/CustomRulesTest.java @@ -23,7 +23,6 @@ import java.util.List; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.issue.Issue; import util.ProjectAnalysis; import util.ProjectAnalysisRule; diff --git a/it/it-tests/src/test/java/it/issue/IssueActionTest.java b/it/it-tests/src/test/java/it/issue/IssueActionTest.java index 14175ba2e15..e0b55d8ce79 100644 --- a/it/it-tests/src/test/java/it/issue/IssueActionTest.java +++ b/it/it-tests/src/test/java/it/issue/IssueActionTest.java @@ -24,7 +24,6 @@ import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.base.HttpException; import org.sonar.wsclient.issue.Issue; import org.sonar.wsclient.issue.IssueComment; diff --git a/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java b/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java index 192e4f88581..f81f2ec0d23 100644 --- a/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java +++ b/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java @@ -25,7 +25,6 @@ import java.util.List; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.base.HttpException; import org.sonar.wsclient.issue.BulkChange; import org.sonar.wsclient.issue.BulkChangeQuery; diff --git a/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java b/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java index 42b476632fe..f4a1d58b038 100644 --- a/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java +++ b/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java @@ -23,7 +23,6 @@ import java.util.List; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.issue.Issue; import org.sonar.wsclient.issue.IssueChange; import org.sonar.wsclient.issue.IssueChangeDiff; diff --git a/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java b/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java index 58c66945f64..d580259b668 100644 --- a/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java +++ b/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java @@ -22,7 +22,6 @@ package it.issue; import java.util.List; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.issue.Issue; import org.sonar.wsclient.issue.IssueQuery; import org.sonar.wsclient.services.Measure; diff --git a/it/it-tests/src/test/java/it/issue/IssueFilterOnCommonRulesTest.java b/it/it-tests/src/test/java/it/issue/IssueFilterOnCommonRulesTest.java index 09daec019ce..dec24a2ad3e 100644 --- a/it/it-tests/src/test/java/it/issue/IssueFilterOnCommonRulesTest.java +++ b/it/it-tests/src/test/java/it/issue/IssueFilterOnCommonRulesTest.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.commons.lang.ArrayUtils; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.Issues; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.issue.SearchWsRequest; diff --git a/it/it-tests/src/test/java/it/issue/IssueFilterTest.java b/it/it-tests/src/test/java/it/issue/IssueFilterTest.java index 5e9a0f06f0e..6482270f2c4 100644 --- a/it/it-tests/src/test/java/it/issue/IssueFilterTest.java +++ b/it/it-tests/src/test/java/it/issue/IssueFilterTest.java @@ -22,7 +22,6 @@ package it.issue; import com.sonar.orchestrator.locator.FileLocation; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; diff --git a/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java b/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java index 834c837b228..cafa74e2919 100644 --- a/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java +++ b/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java @@ -28,7 +28,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.issue.BulkChangeQuery; import org.sonar.wsclient.issue.Issue; import org.sonar.wsclient.issue.IssueClient; diff --git a/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java b/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java index 71f594c160f..abf19691d2d 100644 --- a/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java +++ b/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java @@ -23,7 +23,6 @@ import java.util.List; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.issue.Issue; import org.sonar.wsclient.issue.IssueQuery; import org.sonar.wsclient.issue.Issues; diff --git a/it/it-tests/src/test/java/it/measure/DecimalScaleMetricTest.java b/it/it-tests/src/test/java/it/measure/DecimalScaleMetricTest.java index 9af34a15179..b874aa16de1 100644 --- a/it/it-tests/src/test/java/it/measure/DecimalScaleMetricTest.java +++ b/it/it-tests/src/test/java/it/measure/DecimalScaleMetricTest.java @@ -23,7 +23,6 @@ import com.sonar.orchestrator.Orchestrator; import it.Category3Suite; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; import util.ItUtils; diff --git a/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java b/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java index 701405abc1f..dd8ea93ae54 100644 --- a/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java +++ b/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java @@ -27,7 +27,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.SonarClient; import org.sonar.wsclient.user.UserParameters; import org.sonarqube.ws.client.WsClient; diff --git a/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java b/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java index d68680f26f1..5c6b44c2f1c 100644 --- a/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java +++ b/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java @@ -27,7 +27,6 @@ import it.Category1Suite; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/measureHistory/SincePreviousVersionHistoryTest.java b/it/it-tests/src/test/java/it/measureHistory/SincePreviousVersionHistoryTest.java index 307a9ba5b0a..fdade6ab969 100644 --- a/it/it-tests/src/test/java/it/measureHistory/SincePreviousVersionHistoryTest.java +++ b/it/it-tests/src/test/java/it/measureHistory/SincePreviousVersionHistoryTest.java @@ -31,7 +31,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Measure; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; diff --git a/it/it-tests/src/test/java/it/measureHistory/SinceXDaysHistoryTest.java b/it/it-tests/src/test/java/it/measureHistory/SinceXDaysHistoryTest.java index ee5f8a2c9da..1e49b43399e 100644 --- a/it/it-tests/src/test/java/it/measureHistory/SinceXDaysHistoryTest.java +++ b/it/it-tests/src/test/java/it/measureHistory/SinceXDaysHistoryTest.java @@ -31,7 +31,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Measure; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; diff --git a/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java b/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java index 1c7938791b7..b6a2cbf8957 100644 --- a/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java +++ b/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java @@ -29,7 +29,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; import org.sonar.wsclient.services.TimeMachine; diff --git a/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java b/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java index ec2fe057350..d407b659bf7 100644 --- a/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java +++ b/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java @@ -26,7 +26,6 @@ import it.Category1Suite; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java b/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java index 2d2f71ea825..001d25538c0 100644 --- a/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java +++ b/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java @@ -31,7 +31,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.wsclient.SonarClient; import org.sonar.wsclient.base.HttpException; @@ -117,7 +116,7 @@ public class ProjectAdministrationTest { new SeleneseTest( Selenese.builder().setHtmlTestsInClasspath("project-deletion", "/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html").build()) - .runOn(orchestrator); + .runOn(orchestrator); } finally { wsClient.userClient().deactivate(projectAdminUser); } @@ -142,16 +141,16 @@ public class ProjectAdministrationTest { Selenese selenese = Selenese.builder() .setHtmlTestsInClasspath("modify_version_of_multimodule_project", - "/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html" - ).build(); + "/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html") + .build(); new SeleneseTest(selenese).runOn(orchestrator); assertThat(count("events where category='Version'")).as("Different number of events").isEqualTo(2); selenese = Selenese.builder() .setHtmlTestsInClasspath("delete_version_of_multimodule_project", - "/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html" - ).build(); + "/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html") + .build(); new SeleneseTest(selenese).runOn(orchestrator); assertThat(count("events where category='Version'")).as("Different number of events").isEqualTo(1); @@ -168,8 +167,7 @@ public class ProjectAdministrationTest { // SONAR-3425 "/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html", - "/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html" - ).build(); + "/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html").build(); new SeleneseTest(selenese).runOn(orchestrator); // GET /api/properties/sonar.exclusions?resource=sample @@ -193,8 +191,8 @@ public class ProjectAdministrationTest { .setHtmlTestsInClasspath("project-bulk-update-keys", "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html", "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html", - "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html" - ).build(); + "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html") + .build(); new SeleneseTest(selenese).runOn(orchestrator); } @@ -209,8 +207,8 @@ public class ProjectAdministrationTest { Selenese selenese = Selenese.builder() .setHtmlTestsInClasspath("project-fine-grained-update-keys", "/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html", - "/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html" - ).build(); + "/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html") + .build(); new SeleneseTest(selenese).runOn(orchestrator); } @@ -223,8 +221,7 @@ public class ProjectAdministrationTest { Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("module-settings", // SONAR-3425 - "/projectAdministration/ProjectAdministrationTest/module-settings/display-module-settings.html" - ).build(); + "/projectAdministration/ProjectAdministrationTest/module-settings/display-module-settings.html").build(); new SeleneseTest(selenese).runOn(orchestrator); } diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java b/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java index d2b2768942f..479f03e5766 100644 --- a/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java +++ b/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java @@ -25,7 +25,6 @@ import com.sonar.orchestrator.selenium.Selenese; import it.Category1Suite; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/projectComparison/ProjectComparisonTest.java b/it/it-tests/src/test/java/it/projectComparison/ProjectComparisonTest.java index 8462db5a090..b848b190618 100644 --- a/it/it-tests/src/test/java/it/projectComparison/ProjectComparisonTest.java +++ b/it/it-tests/src/test/java/it/projectComparison/ProjectComparisonTest.java @@ -27,7 +27,6 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/projectEvent/EventTest.java b/it/it-tests/src/test/java/it/projectEvent/EventTest.java index 54327a01b5a..9a421a9999b 100644 --- a/it/it-tests/src/test/java/it/projectEvent/EventTest.java +++ b/it/it-tests/src/test/java/it/projectEvent/EventTest.java @@ -29,7 +29,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Event; import org.sonar.wsclient.services.EventQuery; import org.sonarqube.ws.client.PostRequest; diff --git a/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java b/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java index 325d70afa26..e7843e77c18 100644 --- a/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java +++ b/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java @@ -30,7 +30,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.Sonar; import org.sonar.wsclient.qualitygate.NewCondition; import org.sonar.wsclient.qualitygate.QualityGate; diff --git a/it/it-tests/src/test/java/it/qualityGate/QualityGateUiTest.java b/it/it-tests/src/test/java/it/qualityGate/QualityGateUiTest.java index 79533e7b29e..facf950e78e 100644 --- a/it/it-tests/src/test/java/it/qualityGate/QualityGateUiTest.java +++ b/it/it-tests/src/test/java/it/qualityGate/QualityGateUiTest.java @@ -29,7 +29,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.qualitygate.NewCondition; import org.sonar.wsclient.qualitygate.QualityGate; import org.sonar.wsclient.qualitygate.QualityGateClient; diff --git a/it/it-tests/src/test/java/it/qualityModel/DebtConfigurationRule.java b/it/it-tests/src/test/java/it/qualityModel/DebtConfigurationRule.java index cce5f8faf68..57c6e844ac6 100644 --- a/it/it-tests/src/test/java/it/qualityModel/DebtConfigurationRule.java +++ b/it/it-tests/src/test/java/it/qualityModel/DebtConfigurationRule.java @@ -23,7 +23,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.sonar.orchestrator.Orchestrator; import java.util.Set; -import org.junit.experimental.categories.Category; import org.junit.rules.ExternalResource; import static com.google.common.base.Preconditions.checkState; diff --git a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtInIssueChangelogTest.java b/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtInIssueChangelogTest.java index 3a1cde710d2..50c0eef7ade 100644 --- a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtInIssueChangelogTest.java +++ b/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtInIssueChangelogTest.java @@ -28,7 +28,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.issue.Issue; import org.sonar.wsclient.issue.IssueChange; import org.sonar.wsclient.issue.IssueChangeDiff; diff --git a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtWidgetTest.java b/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtWidgetTest.java index c866e608110..51dc10bd286 100644 --- a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtWidgetTest.java +++ b/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtWidgetTest.java @@ -24,16 +24,14 @@ import com.sonar.orchestrator.build.SonarScanner; import com.sonar.orchestrator.locator.FileLocation; import com.sonar.orchestrator.selenium.Selenese; import it.Category2Suite; +import java.text.SimpleDateFormat; +import java.util.Date; import org.apache.commons.lang.time.DateUtils; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; -import java.text.SimpleDateFormat; -import java.util.Date; - import static util.ItUtils.projectDir; public class TechnicalDebtWidgetTest { diff --git a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java index f1a2058c582..c87afb3c00c 100644 --- a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java +++ b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java @@ -25,7 +25,6 @@ import org.apache.commons.lang.SystemUtils; import org.junit.After; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.DisableOnDebug; import org.junit.rules.ExpectedException; import org.junit.rules.TestRule; diff --git a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java index 59ed2a5b6fd..4c17d4e9d3b 100644 --- a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java +++ b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java @@ -39,7 +39,6 @@ import org.json.simple.JSONValue; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.Server; import org.sonar.wsclient.services.ServerQuery; import org.sonarqube.ws.client.GetRequest; diff --git a/it/it-tests/src/test/java/it/settings/PropertySetsTest.java b/it/it-tests/src/test/java/it/settings/PropertySetsTest.java index ff7ad1621f1..666a145eeb1 100644 --- a/it/it-tests/src/test/java/it/settings/PropertySetsTest.java +++ b/it/it-tests/src/test/java/it/settings/PropertySetsTest.java @@ -24,7 +24,6 @@ import com.sonar.orchestrator.selenium.Selenese; import it.Category1Suite; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.PropertyQuery; import org.sonar.wsclient.services.PropertyUpdateQuery; import util.selenium.SeleneseTest; diff --git a/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java b/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java index 9eb829d272d..055c7991026 100644 --- a/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java +++ b/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java @@ -26,7 +26,6 @@ import java.net.URL; import org.junit.After; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import util.selenium.SeleneseTest; diff --git a/it/it-tests/src/test/java/it/settings/SubCategoriesTest.java b/it/it-tests/src/test/java/it/settings/SubCategoriesTest.java index 4d24549f144..5bca8b88d5d 100644 --- a/it/it-tests/src/test/java/it/settings/SubCategoriesTest.java +++ b/it/it-tests/src/test/java/it/settings/SubCategoriesTest.java @@ -25,7 +25,6 @@ import com.sonar.orchestrator.selenium.Selenese; import it.Category1Suite; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonar.wsclient.services.PropertyQuery; import util.selenium.SeleneseTest; diff --git a/it/it-tests/src/test/java/it/sourceCode/EncodingTest.java b/it/it-tests/src/test/java/it/sourceCode/EncodingTest.java index 3f1bbec3030..a47d68f8983 100644 --- a/it/it-tests/src/test/java/it/sourceCode/EncodingTest.java +++ b/it/it-tests/src/test/java/it/sourceCode/EncodingTest.java @@ -25,7 +25,6 @@ import it.Category1Suite; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static util.ItUtils.runProjectAnalysis; diff --git a/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java b/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java index a70ba31ca13..21ca9185a21 100644 --- a/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java +++ b/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java @@ -28,7 +28,6 @@ import org.apache.commons.io.IOUtils; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.skyscreamer.jsonassert.JSONAssert; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java b/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java index a98d6370fef..decffdaa5f2 100644 --- a/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java +++ b/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java @@ -30,7 +30,6 @@ import org.apache.http.util.EntityUtils; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java b/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java index 46570b22908..6c55928fd1f 100644 --- a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java +++ b/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java @@ -30,7 +30,6 @@ import org.junit.After; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsResponse; diff --git a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java index 1eba924cc6b..1db146aabc2 100644 --- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java +++ b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java @@ -33,7 +33,6 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.WsUserTokens; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.HttpConnector; diff --git a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java b/it/it-tests/src/test/java/it/user/MyAccountPageTest.java index 9e60c2a9385..8f7b479d8ee 100644 --- a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java +++ b/it/it-tests/src/test/java/it/user/MyAccountPageTest.java @@ -23,8 +23,11 @@ import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.build.SonarScanner; import com.sonar.orchestrator.selenium.Selenese; import it.Category4Suite; -import org.junit.*; -import org.junit.experimental.categories.Category; +import org.junit.After; +import org.junit.Before; +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.selenium.SeleneseTest; diff --git a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java b/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java index d129bcc03fb..ef1a2f0a3f5 100644 --- a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java +++ b/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java @@ -20,17 +20,16 @@ package it.user; import com.sonar.orchestrator.Orchestrator; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; import it.Category4Suite; import java.net.HttpURLConnection; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsResponse; diff --git a/it/it-tests/src/test/java/it/user/RailsExternalAuthenticationTest.java b/it/it-tests/src/test/java/it/user/RailsExternalAuthenticationTest.java index bab9a8fe135..0236652ee99 100644 --- a/it/it-tests/src/test/java/it/user/RailsExternalAuthenticationTest.java +++ b/it/it-tests/src/test/java/it/user/RailsExternalAuthenticationTest.java @@ -19,13 +19,6 @@ */ package it.user; -import static java.net.HttpURLConnection.HTTP_OK; -import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; -import static util.ItUtils.pluginArtifact; -import static util.ItUtils.setServerProperty; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.sonar.orchestrator.Orchestrator; @@ -38,7 +31,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.wsclient.Host; import org.sonar.wsclient.Sonar; @@ -56,6 +48,13 @@ import org.sonarqube.ws.client.WsClientFactories; import org.sonarqube.ws.client.WsResponse; import util.selenium.SeleneseTest; +import static java.net.HttpURLConnection.HTTP_OK; +import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; +import static util.ItUtils.pluginArtifact; +import static util.ItUtils.setServerProperty; + /** * Test deprecated authentication done by Rails. It's kept has every features has not bee migrated to java yet. * diff --git a/it/it-tests/src/test/java/it/ws/WsLocalCallTest.java b/it/it-tests/src/test/java/it/ws/WsLocalCallTest.java index a149cafe093..8b6ee43c43d 100644 --- a/it/it-tests/src/test/java/it/ws/WsLocalCallTest.java +++ b/it/it-tests/src/test/java/it/ws/WsLocalCallTest.java @@ -23,7 +23,6 @@ import com.sonar.orchestrator.Orchestrator; import it.Category4Suite; import org.junit.ClassRule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.HttpConnector; import org.sonarqube.ws.client.WsClient; -- 2.39.5