From 0f5e9229cbf616e2f03f7e884e91794579371425 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 6 Jul 2015 17:17:41 +0200 Subject: [PATCH] Fix execution of tests on non-H2 databases --- .../server/activity/ActivityServiceTest.java | 4 +- .../index/ActivityResultSetIteratorTest.java | 14 ++--- .../sonar/server/batch/IssuesActionTest.java | 4 +- .../component/ComponentServiceTest.java | 4 +- .../server/component/db/ComponentDaoTest.java | 4 +- .../server/component/ws/SearchActionTest.java | 4 +- .../activity/ActivityManagerTest.java | 5 +- .../ProjectSettingsRepositoryTest.java | 5 +- .../issue/RuleCacheLoaderTest.java | 4 +- .../measure/MeasureRepositoryImplTest.java | 4 +- .../metric/MetricRepositoryImplTest.java | 4 +- .../step/ApplyPermissionsStepTest.java | 4 +- .../step/CustomMeasuresCopyStepTest.java | 4 +- .../step/FeedDebtModelStepTest.java | 5 +- .../computation/step/FeedPeriodsStepTest.java | 4 +- .../step/FillComponentsStepTest.java | 4 +- .../FillMeasuresWithVariationsStepTest.java | 4 +- .../step/IndexSourceLinesStepTest.java | 4 +- .../computation/step/IndexTestsStepTest.java | 4 +- .../step/PersistComponentsStepTest.java | 4 +- .../step/PersistDuplicationsStepTest.java | 4 +- .../step/PersistEventsStepTest.java | 4 +- .../step/PersistFileSourcesStepTest.java | 4 +- .../step/PersistIssuesStepTest.java | 4 +- .../step/PersistMeasuresStepTest.java | 4 +- ...stNumberOfDaysSinceLastCommitStepTest.java | 4 +- .../step/PersistProjectLinksStepTest.java | 4 +- .../step/PersistSnapshotsStepTest.java | 4 +- .../step/PersistTestsStepTest.java | 4 +- .../step/SwitchSnapshotStepTest.java | 4 +- .../step/ValidateProjectStepTest.java | 4 +- .../template/ProjectIssuesDashboardTest.java | 5 +- .../java/org/sonar/server/db/BaseDaoTest.java | 16 +++-- .../db/migrations/BaseDataChangeTest.java | 4 +- .../v36/ViolationMigrationTest.java | 6 +- .../CompleteIssueMessageMigrationTest.java | 6 +- .../v42/PackageKeysMigrationTest.java | 6 +- ...rtIssueDebtToMinutesMigrationStepTest.java | 11 ++-- ...elopmentCostMeasuresMigrationStepTest.java | 6 +- .../v43/IssueChangelogMigrationStepTest.java | 6 +- ...sOnRemovedComponentsMigrationStepTest.java | 6 +- .../RequirementMeasuresMigrationStepTest.java | 6 +- ...echnicalDebtMeasuresMigrationStepTest.java | 6 +- .../v44/ChangeLogMigrationTest.java | 6 +- .../ConvertProfileMeasuresMigrationTest.java | 5 +- .../v44/FeedQProfileDatesMigrationTest.java | 5 +- .../v44/FeedQProfileKeysMigrationTest.java | 5 +- .../v44/IssueActionPlanKeyMigrationTest.java | 5 +- .../v44/MeasureDataMigrationTest.java | 5 +- ...leParameterDefaultValuesMigrationTest.java | 5 +- ...easuresOnDeletedProfilesMigrationTest.java | 5 +- ...singCustomRuleParametersMigrationTest.java | 5 +- .../v451/DeleteUnescapedActivitiesTest.java | 5 +- .../migrations/v50/FeedFileSourcesTest.java | 5 +- .../v50/FeedIssueLongDatesTest.java | 5 +- ...tsAuthorizationUpdatedAtMigrationTest.java | 5 +- ...ulateProjectsUuidColumnsMigrationTest.java | 5 +- ...ortFieldFromIssueFiltersMigrationTest.java | 5 +- ...placeIssueFiltersProjectKeyByUuidTest.java | 5 +- .../migrations/v51/AddIssuesColumnsTest.java | 9 ++- .../v51/AddNewCharacteristicsTest.java | 5 +- ...CopyScmAccountsFromAuthorsToUsersTest.java | 5 +- .../v51/FeedAnalysisReportsLongDatesTest.java | 5 +- .../v51/FeedEventsLongDatesTest.java | 5 +- .../v51/FeedFileSourcesBinaryDataTest.java | 4 +- .../v51/FeedIssueChangesLongDatesTest.java | 5 +- .../v51/FeedIssueComponentUuidsTest.java | 5 +- .../db/migrations/v51/FeedIssueTagsTest.java | 5 +- .../v51/FeedIssuesLongDatesTest.java | 5 +- .../v51/FeedManualMeasuresLongDatesTest.java | 5 +- .../v51/FeedSemaphoresLongDatesTest.java | 5 +- .../v51/FeedSnapshotsLongDatesTest.java | 5 +- .../v51/FeedUsersLongDatesTest.java | 5 +- ...movePermissionsOnModulesMigrationTest.java | 5 +- ...atedParamsInIssueFiltersMigrationTest.java | 5 +- .../v51/UpdateProjectsModuleUuidPathTest.java | 5 +- ...ManualMeasuresComponentUuidColumnTest.java | 5 +- .../v52/FeedEventsComponentUuidTest.java | 5 +- .../v52/FeedFileSourcesDataTypeTest.java | 5 +- .../FeedManualMeasuresComponentUuidTest.java | 5 +- .../v52/FeedMetricsBooleansTest.java | 5 +- .../FeedProjectLinksComponentUuidTest.java | 5 +- .../MoveProjectProfileAssociationTest.java | 5 +- .../v52/RemoveComponentLibrariesTest.java | 5 +- .../v52/RemoveSnapshotLibrariesTest.java | 5 +- .../filter/RegisterIssueFiltersTest.java | 5 +- .../index/IssueAuthorizationDaoTest.java | 6 +- .../index/IssueAuthorizationIndexerTest.java | 5 +- .../server/issue/index/IssueIndexerTest.java | 5 +- .../index/IssueResultSetIteratorTest.java | 15 ++--- .../measure/MeasureFilterExecutorTest.java | 5 +- .../persistence/CustomMeasureDaoTest.java | 5 +- .../measure/custom/ws/CreateActionTest.java | 4 +- .../measure/custom/ws/DeleteActionTest.java | 4 +- .../measure/custom/ws/MetricsActionTest.java | 4 +- .../measure/custom/ws/SearchActionTest.java | 4 +- .../measure/custom/ws/UpdateActionTest.java | 4 +- .../metric/DefaultMetricFinderTest.java | 5 +- .../metric/persistence/MetricDaoTest.java | 5 +- .../server/metric/ws/CreateActionTest.java | 4 +- .../server/metric/ws/DeleteActionTest.java | 4 +- .../server/metric/ws/DomainsActionTest.java | 5 +- .../server/metric/ws/SearchActionTest.java | 5 +- .../server/metric/ws/UpdateActionTest.java | 4 +- .../platform/BackendCleanupMediumTest.java | 5 +- .../project/ws/BulkDeleteActionTest.java | 4 +- .../server/project/ws/DeleteActionTest.java | 4 +- .../server/project/ws/GhostsActionTest.java | 4 +- .../project/ws/ProvisionedActionTest.java | 4 +- .../qualityprofile/ws/BackupActionTest.java | 5 +- .../ws/ChangelogActionTest.java | 5 +- .../qualityprofile/ws/CreateActionTest.java | 4 +- .../qualityprofile/ws/DeleteActionTest.java | 4 +- .../qualityprofile/ws/ExportActionTest.java | 4 +- .../qualityprofile/ws/ProjectsActionTest.java | 4 +- .../qualityprofile/ws/RenameActionTest.java | 4 +- .../qualityprofile/ws/SearchActionTest.java | 5 +- .../ws/SetDefaultActionTest.java | 4 +- .../source/index/FileSourceTesting.java | 1 - .../source/index/SourceLineIndexerTest.java | 6 +- .../SourceLineResultSetIteratorTest.java | 6 +- .../server/source/ws/HashActionTest.java | 4 +- .../server/source/ws/LinesActionTest.java | 4 +- .../sonar/server/source/ws/ScmActionTest.java | 4 +- ...rementsFromCharacteristicsToRulesTest.java | 5 +- .../server/startup/RegisterMetricsTest.java | 5 +- .../server/test/index/TestIndexerTest.java | 5 +- .../test/index/TestResultSetIteratorTest.java | 6 +- .../sonar/server/test/ws/ListActionTest.java | 4 +- .../ui/ws/ComponentNavigationActionTest.java | 4 +- .../ui/ws/GlobalNavigationActionTest.java | 4 +- .../sonar/server/user/UserUpdaterTest.java | 5 +- .../sonar/server/user/db/GroupDaoTest.java | 5 +- .../org/sonar/server/user/db/UserDaoTest.java | 5 +- .../server/user/index/UserIndexerTest.java | 5 +- .../user/index/UserResultSetIteratorTest.java | 6 +- .../user/ws/ChangePasswordActionTest.java | 4 +- .../server/user/ws/CreateActionTest.java | 4 +- .../server/user/ws/DeactivateActionTest.java | 4 +- .../server/user/ws/GroupsActionTest.java | 4 +- .../server/user/ws/SearchActionTest.java | 4 +- .../server/user/ws/UpdateActionTest.java | 4 +- .../usergroups/ws/AddUserActionTest.java | 4 +- .../usergroups/ws/CreateActionTest.java | 4 +- .../usergroups/ws/DeleteActionTest.java | 4 +- .../usergroups/ws/RemoveUserActionTest.java | 4 +- .../usergroups/ws/SearchActionTest.java | 5 +- .../usergroups/ws/UpdateActionTest.java | 4 +- .../server/usergroups/ws/UsersActionTest.java | 4 +- .../server/view/index/ViewIndexerTest.java | 4 +- .../core/user/DeprecatedUserFinderTest.java | 12 ++-- .../src/test/java/org/sonar/db/DbTester.java | 5 +- .../java/org/sonar/db/IsAliveMapperTest.java | 7 ++- .../org/sonar/db/ResultSetIteratorTest.java | 6 +- .../src/test/java/org/sonar/db/TestDb.java | 23 ++++--- .../db/component/ComponentLinkDaoTest.java | 6 +- .../sonar/db/component/SnapshotDaoTest.java | 6 +- .../db/compute/AnalysisReportDaoTest.java | 60 +++++++------------ .../db/dashboard/ActiveDashboardDaoTest.java | 6 +- .../sonar/db/dashboard/DashboardDaoTest.java | 6 +- .../sonar/db/debt/CharacteristicDaoTest.java | 6 +- .../java/org/sonar/db/event/EventDaoTest.java | 6 +- .../org/sonar/db/measure/MeasureDaoTest.java | 6 +- .../sonar/db/user/GroupMembershipDaoTest.java | 6 +- .../java/org/sonar/db/user/RoleDaoTest.java | 6 +- .../org/sonar/db/user/UserGroupDaoTest.java | 6 +- 166 files changed, 474 insertions(+), 433 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java index 76722086d5f..a9fa3ac1fc7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java @@ -44,8 +44,8 @@ import static org.mockito.Mockito.when; public class ActivityServiceTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new ActivityIndexDefinition(new Settings())); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java index 184c841177d..d464a499447 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java @@ -19,31 +19,25 @@ */ package org.sonar.server.activity.index; -import org.apache.commons.dbutils.DbUtils; +import java.util.Map; import org.assertj.core.data.MapEntry; import org.elasticsearch.action.update.UpdateRequest; -import org.jruby.RubyProcess; -import org.junit.After; 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.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; -import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; -import java.sql.Connection; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class ActivityResultSetIteratorTest { - @ClassRule - public static DbTester dbTester = DbTester.create(System2.INSTANCE); + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); @Before public void setUp() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java index fd29bbc3439..b8180f4cf25 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java @@ -69,8 +69,8 @@ public class IssuesActionTest { private final static String MODULE_KEY = "struts-core"; private final static String FILE_KEY = "Action.java"; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings())); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java index 79a6a91e3d8..a2213451b8b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java @@ -56,8 +56,8 @@ import static org.mockito.Mockito.when; @Category(DbTests.class) public class ComponentServiceTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java index 32ed4afe0fe..be0afa3cd26 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java @@ -49,8 +49,8 @@ public class ComponentDaoTest { ComponentDao sut; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); DbSession session; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java index 9682255f18b..5f839743084 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java @@ -44,8 +44,8 @@ import static org.mockito.Mockito.mock; @Category(DbTests.class) public class SearchActionTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java index 8be4ff33ba4..56b00db9c2c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java @@ -21,6 +21,7 @@ package org.sonar.server.computation.activity; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; @@ -38,8 +39,8 @@ import static org.mockito.Mockito.verify; @Category(DbTests.class) public class ActivityManagerTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); ArgumentCaptor activityArgumentCaptor = ArgumentCaptor.forClass(Activity.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java index e754baded51..81af82c712d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java @@ -23,6 +23,7 @@ package org.sonar.server.computation.component; import org.junit.After; 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.api.config.Settings; @@ -44,8 +45,8 @@ public class ProjectSettingsRepositoryTest { private static final String PROJECT_KEY = "PROJECT_KEY"; - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public final DbTester dbTester = new DbTester(); DbClient dbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java index 917e0f3605c..b1c7d048ef4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java @@ -41,8 +41,8 @@ import static org.mockito.Mockito.mock; @Category(DbTests.class) public class RuleCacheLoaderTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @org.junit.Rule + public DbTester dbTester = new DbTester(); @org.junit.Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java index 5d7f8309e1f..40d83c2dc0b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java @@ -68,8 +68,8 @@ import static org.mockito.Mockito.when; @RunWith(DataProviderRunner.class) public class MeasureRepositoryImplTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java index dc95314ae8f..ed522332e03 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java @@ -37,8 +37,8 @@ public class MetricRepositoryImplTest { private static final String SOME_KEY = "some_key"; private static final long SOME_ID = 156; - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public final ExpectedException expectedException = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java index 3789643c89c..c6f6ac2e3d7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java @@ -64,8 +64,8 @@ public class ApplyPermissionsStepTest extends BaseStepTest { @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings())); - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java index fd22ccb71bf..b5013bf7ea4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java @@ -51,8 +51,8 @@ import static org.sonar.server.computation.step.CustomMeasuresCopyStep.dtoToMeas @Category(DbTests.class) public class CustomMeasuresCopyStepTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java index 5ff799f77e4..2d085f44efb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java @@ -23,6 +23,7 @@ import java.util.Collection; import org.junit.After; 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.db.DbSession; @@ -39,8 +40,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class FeedDebtModelStepTest extends BaseStepTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); DbClient dbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java index 943f6a67596..7d494a3b1b6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java @@ -56,8 +56,8 @@ public class FeedPeriodsStepTest extends BaseStepTest { private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); private static final String PROJECT_KEY = "PROJECT_KEY"; - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java index 4240a27ba60..33bcaa1f61e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java @@ -50,8 +50,8 @@ public class FillComponentsStepTest extends BaseStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java index 79fced156a8..0a657472d61 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java @@ -78,8 +78,8 @@ public class FillMeasuresWithVariationsStepTest { static final Component PROJECT = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_DTO.uuid()).build(); - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java index 35f57a1b8bb..d47a51f771f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java @@ -43,8 +43,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class IndexSourceLinesStepTest extends BaseStepTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new SourceLineIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java index 31653fafac3..a60d0e85847 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java @@ -44,8 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class IndexTestsStepTest extends BaseStepTest { - @ClassRule - public static DbTester dbTester = DbTester.create(System2.INSTANCE); + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new TestIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java index 82c34394825..5a1a4d1b18d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java @@ -58,8 +58,8 @@ public class PersistComponentsStepTest extends BaseStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index ff2e82e08d7..49813606305 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -51,8 +51,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java index 00b3962dd90..d61abcafaa8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java @@ -50,8 +50,8 @@ import static org.mockito.Mockito.when; @Category(DbTests.class) public class PersistEventsStepTest extends BaseStepTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java index cb22b25f35e..9dc278e32f6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java @@ -63,8 +63,8 @@ public class PersistFileSourcesStepTest extends BaseStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; private static final String FILE_UUID = "FILE"; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java index eb09904d24c..6f1a975f6f1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java @@ -55,8 +55,8 @@ public class PersistIssuesStepTest extends BaseStepTest { @Rule public TemporaryFolder temp = new TemporaryFolder(); - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java index 0380c1a868c..901d6589927 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java @@ -74,8 +74,8 @@ public class PersistMeasuresStepTest extends BaseStepTest { private static final int PROJECT_REF = 1; private static final int FILE_REF = 2; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java index bd95ab9ec83..c17f1d1a16d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java @@ -49,8 +49,8 @@ import static org.mockito.Mockito.when; public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java index 3c23953d7fa..cfd7558ca06 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java @@ -48,8 +48,8 @@ import static org.mockito.Mockito.when; @Category(DbTests.class) public class PersistProjectLinksStepTest extends BaseStepTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java index 24a4526ef5c..53d1feb60e6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java @@ -60,8 +60,8 @@ public class PersistSnapshotsStepTest extends BaseStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java index 29a9cd66134..efe0e24f0d3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java @@ -66,8 +66,8 @@ public class PersistTestsStepTest extends BaseStepTest { private static final String TEST_FILE_PATH_1 = "TEST-PATH-1"; private static final String TEST_FILE_PATH_2 = "TEST-PATH-2"; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java index eae3c53a99e..b0f02bfb087 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java @@ -42,8 +42,8 @@ import static org.mockito.Mockito.when; @Category(DbTests.class) public class SwitchSnapshotStepTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java index baa9bbd924e..c43c8493716 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java @@ -53,8 +53,8 @@ public class ValidateProjectStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; private static final String MODULE_KEY = "MODULE_KEY"; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public ExpectedException thrown = ExpectedException.none(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java index b8cca4a557e..fd19191291f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java @@ -22,6 +22,7 @@ package org.sonar.server.dashboard.template; 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.api.web.Dashboard; @@ -35,8 +36,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class ProjectIssuesDashboardTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); ProjectIssuesDashboard template; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java index afd5995cef8..45d672bc79d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java @@ -19,39 +19,37 @@ */ package org.sonar.server.db; +import java.util.Date; 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.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; import org.sonar.db.DbSession; -import org.sonar.db.MyBatis; import org.sonar.db.DbTester; +import org.sonar.db.MyBatis; import org.sonar.server.db.fake.FakeDao; import org.sonar.server.db.fake.FakeDto; import org.sonar.server.db.fake.FakeMapper; import org.sonar.test.DbTests; -import java.util.Date; - import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class BaseDaoTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, BaseDaoTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, BaseDaoTest.class, "schema.sql"); private static final String DTO_ALIAS = "fake"; private FakeDao dao; private DbSession session; - @BeforeClass - public static void setupBatis() { + @Before + public void setupBatis() { MyBatis batis = db.myBatis(); batis.getSessionFactory().getConfiguration().getTypeAliasRegistry().registerAlias(DTO_ALIAS, FakeDto.class); batis.getSessionFactory().getConfiguration().addMapper(FakeMapper.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java index 49e5bf4a3ff..81cab712724 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java @@ -44,8 +44,8 @@ import static org.junit.Assert.fail; @Category(DbTests.class) public class BaseDataChangeTest extends AbstractDaoTestCase { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, BaseDataChangeTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, BaseDataChangeTest.class, "schema.sql"); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java index 0f355a3e7ee..3ba6bc20eb7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java @@ -19,7 +19,7 @@ */ package org.sonar.server.db.migrations.v36; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; @@ -29,8 +29,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class ViolationMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, ViolationMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, ViolationMigrationTest.class, "schema.sql"); @Test public void migrate_violations() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java index c6ee1dfb608..c73347f3f9a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java @@ -19,7 +19,7 @@ */ package org.sonar.server.db.migrations.v42; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -27,8 +27,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class CompleteIssueMessageMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, CompleteIssueMessageMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, CompleteIssueMessageMigrationTest.class, "schema.sql"); MigrationStep migration = new CompleteIssueMessageMigrationStep(db.database()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java index bb1daab2e9b..fdf970ce608 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java @@ -19,7 +19,7 @@ */ package org.sonar.server.db.migrations.v42; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -27,8 +27,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class PackageKeysMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, PackageKeysMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, PackageKeysMigrationTest.class, "schema.sql"); MigrationStep migration = new PackageKeysMigrationStep(db.database()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java index 58b65c0e626..0ea073e4ed8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java @@ -20,8 +20,10 @@ package org.sonar.server.db.migrations.v43; +import java.util.List; +import java.util.Map; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -32,17 +34,14 @@ import org.sonar.db.DbTester; import org.sonar.db.property.PropertiesDao; import org.sonar.db.property.PropertyDto; -import java.util.List; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class ConvertIssueDebtToMinutesMigrationStepTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, ConvertIssueDebtToMinutesMigrationStepTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, ConvertIssueDebtToMinutesMigrationStepTest.class, "schema.sql"); @Mock System2 system2; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java index 0fd6e8ae4aa..cdd65574b63 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v43; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -36,8 +36,8 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class DevelopmentCostMeasuresMigrationStepTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, DevelopmentCostMeasuresMigrationStepTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, DevelopmentCostMeasuresMigrationStepTest.class, "schema.sql"); @Mock PropertiesDao propertiesDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java index 0e6d06c1fe8..d51b36fce56 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v43; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -38,8 +38,8 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class IssueChangelogMigrationStepTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, IssueChangelogMigrationStepTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, IssueChangelogMigrationStepTest.class, "schema.sql"); @Mock System2 system2; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java index 9df9e8c62a6..015d7af03ab 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v43; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -35,8 +35,8 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class NotResolvedIssuesOnRemovedComponentsMigrationStepTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, NotResolvedIssuesOnRemovedComponentsMigrationStepTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, NotResolvedIssuesOnRemovedComponentsMigrationStepTest.class, "schema.sql"); @Mock System2 system2; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java index faf17f4dd38..a47c06c8374 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java @@ -21,15 +21,15 @@ package org.sonar.server.db.migrations.v43; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; public class RequirementMeasuresMigrationStepTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, RequirementMeasuresMigrationStepTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, RequirementMeasuresMigrationStepTest.class, "schema.sql"); RequirementMeasuresMigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java index 63f0d0df7f8..4b2e17032da 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v43; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -36,8 +36,8 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class TechnicalDebtMeasuresMigrationStepTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, TechnicalDebtMeasuresMigrationStepTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, TechnicalDebtMeasuresMigrationStepTest.class, "schema.sql"); @Mock PropertiesDao propertiesDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java index 0f312ca080e..b68ff52a2ac 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v44; import org.junit.After; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -36,8 +36,8 @@ import static org.mockito.Mockito.when; public class ChangeLogMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, ChangeLogMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, ChangeLogMigrationTest.class, "schema.sql"); System2 system2 = mock(System2.class); DbClient dbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java index e54d28ba0b5..35004315b35 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java @@ -25,6 +25,7 @@ import java.sql.ResultSet; import java.sql.Statement; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -34,8 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class ConvertProfileMeasuresMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, ConvertProfileMeasuresMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, ConvertProfileMeasuresMigrationTest.class, "schema.sql"); ConvertProfileMeasuresMigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java index 93a25de9a56..c1d61bf5bf6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v44; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.core.util.UtcDateUtils; @@ -36,8 +37,8 @@ import static org.mockito.Mockito.when; public class FeedQProfileDatesMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedQProfileDatesMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedQProfileDatesMigrationTest.class, "schema.sql"); FeedQProfileDatesMigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java index f54e91d7649..92f79438b8c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v44; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -32,8 +33,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class FeedQProfileKeysMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedQProfileKeysMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedQProfileKeysMigrationTest.class, "schema.sql"); @Test public void feed_keys() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java index cc1b1697192..d85f65a4599 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v44; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -35,8 +36,8 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class IssueActionPlanKeyMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, IssueActionPlanKeyMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, IssueActionPlanKeyMigrationTest.class, "schema.sql"); @Mock System2 system2; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java index 315bc16133c..5893ceb032f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v44; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; @@ -31,8 +32,8 @@ import org.sonar.db.DbTester; @RunWith(MockitoJUnitRunner.class) public class MeasureDataMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, MeasureDataMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, MeasureDataMigrationTest.class, "schema.sql"); MeasureDataMigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java index fd993bff0bd..58f63b36843 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v45; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class AddMissingRuleParameterDefaultValuesMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, AddMissingRuleParameterDefaultValuesMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, AddMissingRuleParameterDefaultValuesMigrationTest.class, "schema.sql"); MigrationStep migration; System2 system = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java index a82f93792fc..1890dff5216 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v45; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -36,8 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class DeleteMeasuresOnDeletedProfilesMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, DeleteMeasuresOnDeletedProfilesMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, DeleteMeasuresOnDeletedProfilesMigrationTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java index ef738d505ea..9e7580d7fb7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v451; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -33,8 +34,8 @@ import static org.mockito.Mockito.when; public class AddMissingCustomRuleParametersMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, AddMissingCustomRuleParametersMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, AddMissingCustomRuleParametersMigrationTest.class, "schema.sql"); MigrationStep migration; System2 system = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java index b9dae4d600b..727fb1b13e7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java @@ -20,6 +20,7 @@ package org.sonar.server.db.migrations.v451; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class DeleteUnescapedActivitiesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, DeleteUnescapedActivitiesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, DeleteUnescapedActivitiesTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java index 9abd9a89484..e1b2a15f858 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java @@ -23,6 +23,7 @@ package org.sonar.server.db.migrations.v50; import org.apache.commons.dbutils.DbUtils; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -40,8 +41,8 @@ import static org.mockito.Mockito.when; public class FeedFileSourcesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedFileSourcesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedFileSourcesTest.class, "schema.sql"); private static final long NOW = 1414770242000L; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java index 889512860f1..52ec87cee5a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v50; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class FeedIssueLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueLongDatesTest.class, "schema.sql"); @Test public void execute() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java index 760fd7e7058..6cf45fa67b1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v50; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class InsertProjectsAuthorizationUpdatedAtMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, InsertProjectsAuthorizationUpdatedAtMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, InsertProjectsAuthorizationUpdatedAtMigrationTest.class, "schema.sql"); MigrationStep migration; System2 system = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java index e5b2cb634b5..41ba14bcdee 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java @@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableSet; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbSession; @@ -37,8 +38,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class PopulateProjectsUuidColumnsMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, PopulateProjectsUuidColumnsMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, PopulateProjectsUuidColumnsMigrationTest.class, "schema.sql"); DbSession session; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java index fee6b50959a..70731ce13a6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v50; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class RemoveSortFieldFromIssueFiltersMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, RemoveSortFieldFromIssueFiltersMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, RemoveSortFieldFromIssueFiltersMigrationTest.class, "schema.sql"); MigrationStep migration; System2 system = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java index 964eac8bba2..8510aa50db0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v50; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class ReplaceIssueFiltersProjectKeyByUuidTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, ReplaceIssueFiltersProjectKeyByUuidTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, ReplaceIssueFiltersProjectKeyByUuidTest.class, "schema.sql"); MigrationStep migration; System2 system = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java index 547350d0dc4..6c3f1153a26 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java @@ -19,19 +19,18 @@ */ package org.sonar.server.db.migrations.v51; +import java.sql.Types; import org.junit.Before; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; -import java.sql.Types; - public class AddIssuesColumnsTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, AddIssuesColumnsTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, AddIssuesColumnsTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java index ab3ff130e90..9d508fced81 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.MessageException; @@ -35,8 +36,8 @@ import static org.mockito.Mockito.when; public class AddNewCharacteristicsTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, AddNewCharacteristicsTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, AddNewCharacteristicsTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java index 794dfd2321c..9581119acb1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -36,8 +37,8 @@ import static org.mockito.Mockito.when; public class CopyScmAccountsFromAuthorsToUsersTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, CopyScmAccountsFromAuthorsToUsersTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, CopyScmAccountsFromAuthorsToUsersTest.class, "schema.sql"); MigrationStep migration; System2 system = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java index 518d9a94818..e9d00172b10 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -31,8 +32,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class FeedAnalysisReportsLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedAnalysisReportsLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedAnalysisReportsLongDatesTest.class, "schema.sql"); @Test public void execute() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java index b1356459047..2fafc9123d1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -33,8 +34,8 @@ import static org.mockito.Mockito.when; import static org.sonar.api.utils.DateUtils.parseDate; public class FeedEventsLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedEventsLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedEventsLongDatesTest.class, "schema.sql"); @Before public void before() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java index fd8f492e278..6043d0fa506 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java @@ -43,8 +43,8 @@ public class FeedFileSourcesBinaryDataTest { @Rule public ExpectedException thrown = ExpectedException.none(); - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedFileSourcesBinaryDataTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedFileSourcesBinaryDataTest.class, "schema.sql"); @Test public void convert_csv_to_protobuf() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java index 3d1d9b2ecea..bd691ef51cd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -31,8 +32,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class FeedIssueChangesLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueChangesLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueChangesLongDatesTest.class, "schema.sql"); @Test public void execute() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java index a74873863d6..1df9b010fc2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java @@ -22,13 +22,14 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; public class FeedIssueComponentUuidsTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueComponentUuidsTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueComponentUuidsTest.class, "schema.sql"); FeedIssueComponentUuids sut; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java index 613591cd576..340b8127def 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v51; import java.util.Date; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class FeedIssueTagsTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueTagsTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssueTagsTest.class, "schema.sql"); FeedIssueTags migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java index b323eab7401..8b56b243846 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; import static org.sonar.api.utils.DateUtils.parseDate; public class FeedIssuesLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssuesLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedIssuesLongDatesTest.class, "schema.sql"); @Test public void execute() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java index 66d2dd201f2..44bd75530f8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -33,8 +34,8 @@ import static org.mockito.Mockito.when; import static org.sonar.api.utils.DateUtils.parseDate; public class FeedManualMeasuresLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedManualMeasuresLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedManualMeasuresLongDatesTest.class, "schema.sql"); @Before public void before() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java index 1b16d9ebc93..f4b14dbadca 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -33,8 +34,8 @@ import static org.mockito.Mockito.when; import static org.sonar.api.utils.DateUtils.parseDate; public class FeedSemaphoresLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedSemaphoresLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedSemaphoresLongDatesTest.class, "schema.sql"); @Before public void before() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java index 0638f9a0f9b..843054aaebc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; import static org.sonar.api.utils.DateUtils.parseDate; public class FeedSnapshotsLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedSnapshotsLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedSnapshotsLongDatesTest.class, "schema.sql"); @Test public void execute() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java index 4ddebaec50d..51bbd805c46 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class FeedUsersLongDatesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedUsersLongDatesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedUsersLongDatesTest.class, "schema.sql"); @Test public void execute() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java index 9d019b9be00..c7d2542de9b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -28,8 +29,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class RemovePermissionsOnModulesMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, RemovePermissionsOnModulesMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, RemovePermissionsOnModulesMigrationTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java index 38993ee081e..9124b7cee45 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java @@ -21,6 +21,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; @@ -32,8 +33,8 @@ import static org.mockito.Mockito.when; public class RenameComponentRelatedParamsInIssueFiltersMigrationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, RenameComponentRelatedParamsInIssueFiltersMigrationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, RenameComponentRelatedParamsInIssueFiltersMigrationTest.class, "schema.sql"); MigrationStep migration; System2 system = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java index d780cf31b98..6f984cbe6e6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class UpdateProjectsModuleUuidPathTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, UpdateProjectsModuleUuidPathTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, UpdateProjectsModuleUuidPathTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java index 3711965faf4..6cc0b903cef 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java @@ -23,14 +23,15 @@ package org.sonar.server.db.migrations.v52; import java.sql.Types; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; public class AddManualMeasuresComponentUuidColumnTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, AddManualMeasuresComponentUuidColumnTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, AddManualMeasuresComponentUuidColumnTest.class, "schema.sql"); AddManualMeasuresComponentUuidColumn sut; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java index b556338893b..17fda5c95af 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class FeedEventsComponentUuidTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedEventsComponentUuidTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedEventsComponentUuidTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java index 1f368e5ca3a..989c2e89e81 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class FeedFileSourcesDataTypeTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedFileSourcesDataTypeTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedFileSourcesDataTypeTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java index bb392df7ac8..1b9b29c63a7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java @@ -22,14 +22,15 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; public class FeedManualMeasuresComponentUuidTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedManualMeasuresComponentUuidTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedManualMeasuresComponentUuidTest.class, "schema.sql"); FeedManualMeasuresComponentUuid sut; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java index 63c680b6dd8..ba5cda5d905 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java @@ -22,14 +22,15 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class FeedMetricsBooleansTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedMetricsBooleansTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedMetricsBooleansTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java index b2fcb227d5e..60b6089762b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class FeedProjectLinksComponentUuidTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedProjectLinksComponentUuidTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedProjectLinksComponentUuidTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java index 0fb93eb8a5c..6bb65bebed1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class MoveProjectProfileAssociationTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, MoveProjectProfileAssociationTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, MoveProjectProfileAssociationTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java index 21b9eab4107..46e9ed1f966 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class RemoveComponentLibrariesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, RemoveComponentLibrariesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, RemoveComponentLibrariesTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java index 51cd6cad239..306c0d33375 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java @@ -22,6 +22,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; @@ -29,8 +30,8 @@ import org.sonar.server.db.migrations.MigrationStep; public class RemoveSnapshotLibrariesTest { - @ClassRule - public static DbTester db = DbTester.createForSchema(System2.INSTANCE, RemoveSnapshotLibrariesTest.class, "schema.sql"); + @Rule + public DbTester db = DbTester.createForSchema(System2.INSTANCE, RemoveSnapshotLibrariesTest.class, "schema.sql"); MigrationStep migration; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java index 0c9c8d83209..bf798d8fb8f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java @@ -21,6 +21,7 @@ package org.sonar.server.issue.filter; 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.api.utils.DateUtils; @@ -38,8 +39,8 @@ import static org.mockito.Mockito.when; @Category(DbTests.class) public class RegisterIssueFiltersTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); RegisterIssueFilters taskUnderTest; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java index c0e8293cea5..bd2e691e29d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java @@ -23,7 +23,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import java.util.Collection; 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.api.utils.System2; @@ -35,8 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class IssueAuthorizationDaoTest { - @ClassRule - public static DbTester dbTester = DbTester.create(System2.INSTANCE); + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); IssueAuthorizationDao dao = new IssueAuthorizationDao(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java index 92154d0c415..625961026f1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java @@ -22,6 +22,7 @@ package org.sonar.server.issue.index; import org.elasticsearch.search.SearchHit; 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.api.config.Settings; @@ -39,8 +40,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class IssueAuthorizationIndexerTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java index 4d4f3de3941..b799660bab0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java @@ -22,6 +22,7 @@ package org.sonar.server.issue.index; import com.google.common.collect.Iterators; 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.api.config.Settings; @@ -38,8 +39,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class IssueIndexerTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java index ffd4017770d..a8947c3ba7a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java @@ -21,30 +21,23 @@ package org.sonar.server.issue.index; import com.google.common.base.Function; import com.google.common.collect.Maps; -import org.apache.commons.dbutils.DbUtils; -import org.jruby.RubyProcess; -import org.junit.After; +import java.util.Map; 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.api.rule.RuleKey; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; -import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; -import java.sql.Connection; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class IssueResultSetIteratorTest { - @ClassRule - public static DbTester dbTester = DbTester.create(System2.INSTANCE); - + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); @Before public void setUp() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java index ed0fef582b8..d9f921b5c95 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java @@ -21,6 +21,7 @@ package org.sonar.server.measure; 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.api.measures.CoreMetrics; @@ -56,8 +57,8 @@ public class MeasureFilterExecutorTest { private static final Metric METRIC_PROFILE = new Metric.Builder("profile", "Profile", Metric.ValueType.STRING).create().setId(2); private static final Metric METRIC_COVERAGE = new Metric.Builder("coverage", "Coverage", Metric.ValueType.FLOAT).create().setId(3); private static final Metric METRIC_UNKNOWN = new Metric.Builder("unknown", "Unknown", Metric.ValueType.FLOAT).create().setId(4); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); private MeasureFilterExecutor executor; @Before diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java index 81b2a6bf2a5..cf7a057b141 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java @@ -25,6 +25,7 @@ import java.util.List; import org.junit.After; 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.db.measure.CustomMeasureDto; @@ -39,8 +40,8 @@ import static org.sonar.server.measure.custom.persistence.CustomMeasureTesting.n @Category(DbTests.class) public class CustomMeasureDaoTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); CustomMeasureDao sut; DbSession session; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java index 8ce5c9894fc..a273fe111f5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java @@ -72,8 +72,8 @@ public class CreateActionTest { public UserSessionRule userSession = UserSessionRule.standalone(); @Rule public ExpectedException expectedException = ExpectedException.none(); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new UserIndexDefinition(new Settings())); DbClient dbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java index b04887848e6..4e6894a54d6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java @@ -52,8 +52,8 @@ public class DeleteActionTest { public static final String ACTION = "delete"; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java index b99c59ff32c..1c7f8e63e14 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java @@ -67,8 +67,8 @@ public class MetricsActionTest { public UserSessionRule userSession = UserSessionRule.standalone(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new UserIndexDefinition(new Settings())); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); DbClient dbClient; DbSession dbSession; WsTester ws; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java index c8518c406cd..7a046289909 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java @@ -70,8 +70,8 @@ public class SearchActionTest { public ExpectedException expectedException = ExpectedException.none(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new UserIndexDefinition(new Settings())); WsTester ws; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java index a8efdc7d796..6f8e7517a37 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java @@ -72,8 +72,8 @@ public class UpdateActionTest { public ExpectedException expectedException = ExpectedException.none(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new UserIndexDefinition(new Settings())); DbClient dbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java index 00f01461f78..342cf2ed9a9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java @@ -22,6 +22,7 @@ package org.sonar.server.metric; import java.util.Arrays; 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.db.DbTester; @@ -36,8 +37,8 @@ import static org.junit.Assert.assertThat; @Category(DbTests.class) public class DefaultMetricFinderTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); DefaultMetricFinder finder; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java index f8a98862dd1..d8f9cb57f02 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java @@ -23,6 +23,7 @@ package org.sonar.server.metric.persistence; import org.junit.After; 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.db.metric.MetricDto; @@ -36,8 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class MetricDaoTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); DbSession session; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java index 4b8790f4eed..3324fb00607 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java @@ -61,8 +61,8 @@ public class CreateActionTest { private static final String DEFAULT_DESCRIPTION = "custom-metric-description"; private static final String DEFAULT_TYPE = ValueType.INT.name(); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java index 58cf6bfe60c..01bf74548b1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java @@ -52,8 +52,8 @@ import static org.sonar.server.metric.ws.MetricTesting.newMetricDto; @Category(DbTests.class) public class DeleteActionTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java index 51dce8f6270..fe585770e7d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java @@ -23,6 +23,7 @@ package org.sonar.server.metric.ws; import org.junit.After; 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.db.metric.MetricDto; @@ -39,8 +40,8 @@ import static org.sonar.server.metric.ws.MetricTesting.newMetricDto; @Category(DbTests.class) public class DomainsActionTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); WsTester ws; DbClient dbClient; DbSession dbSession; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java index 6999e6c2aae..adb68923cc8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java @@ -24,6 +24,7 @@ import org.apache.commons.lang.StringUtils; import org.junit.After; 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.api.server.ws.WebService.Param; @@ -42,8 +43,8 @@ import static org.sonar.server.metric.ws.SearchAction.PARAM_IS_CUSTOM; @Category(DbTests.class) public class SearchActionTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); DbClient dbClient; DbSession dbSession; WsTester ws; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java index 59cafc2499b..e36a8e06980 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java @@ -62,8 +62,8 @@ public class UpdateActionTest { private static final String DEFAULT_DESCRIPTION = "custom-metric-description"; private static final String DEFAULT_TYPE = ValueType.INT.name(); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java index 6a25d8d283c..84e9be9afb6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java @@ -23,6 +23,7 @@ package org.sonar.server.platform; import com.google.common.collect.ImmutableMap; 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.db.DbTester; @@ -48,8 +49,8 @@ public class BackendCleanupMediumTest { @ClassRule public static EsTester esTester = new EsTester(); - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); BackendCleanup backendCleanup; diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java index afbb161a5ae..a93ed164698 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java @@ -81,8 +81,8 @@ import static org.sonar.server.project.ws.BulkDeleteAction.PARAM_KEYS; public class BulkDeleteActionTest { private static final String ACTION = "bulk_delete"; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings()), new SourceLineIndexDefinition(new Settings()), new TestIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java index 4e277b951e5..de9ce8c6d32 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java @@ -79,8 +79,8 @@ import static org.sonar.server.project.ws.DeleteAction.PARAM_KEY; public class DeleteActionTest { private static final String ACTION = "delete"; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings()), new SourceLineIndexDefinition(new Settings()), new TestIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java index ec4712b59e8..d634d7756af 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java @@ -51,8 +51,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class GhostsActionTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); WsTester ws; diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java index 8bb35266ebc..939490fed30 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java @@ -52,8 +52,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class ProvisionedActionTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java index 39484429458..b05de83f8a3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java @@ -23,6 +23,7 @@ import java.io.PrintWriter; import java.io.Writer; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -46,8 +47,8 @@ import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.class) public class BackupActionTest { - @ClassRule - public static final DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); // TODO Replace with proper DbTester + EsTester medium test once DaoV2 is removed @Mock diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java index 1378b15e00a..58376beaa72 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java @@ -26,6 +26,7 @@ import org.joda.time.DateTime; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.api.rule.Severity; @@ -61,8 +62,8 @@ import static org.sonar.server.qualityprofile.QProfileTesting.XOO_P1_KEY; public class ChangelogActionTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new ActivityIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java index dd764b10efa..0e06dae3c2f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java @@ -38,8 +38,8 @@ import static org.mockito.Mockito.mock; public class CreateActionTest { - @ClassRule - public static final DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java index 97e1bd8745b..2366a217bce 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java @@ -50,8 +50,8 @@ import static org.mockito.Mockito.mock; public class DeleteActionTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java index 575cc3751a0..a3b5ebf7f6f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java @@ -61,8 +61,8 @@ import static org.mockito.Mockito.when; public class ExportActionTest { - @ClassRule - public static final DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java index 30cbc8f5456..08adad548c9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java @@ -53,8 +53,8 @@ import static org.mockito.Mockito.mock; @Category(DbTests.class) public class ProjectsActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java index 6b6b22ea104..51cf4d4aa99 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java @@ -42,8 +42,8 @@ import static org.mockito.Mockito.mock; public class RenameActionTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java index 1b70675c9c4..d5c982c47ac 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableMap; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.sonar.api.resources.Language; import org.sonar.api.resources.Languages; @@ -45,8 +46,8 @@ import static org.mockito.Mockito.when; public class SearchActionTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); private DbClient dbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java index 636cc5c09a1..c5b5365290d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java @@ -45,8 +45,8 @@ import static org.mockito.Mockito.mock; public class SetDefaultActionTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java index f6f0a0d7de6..6c05f7911c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java @@ -45,7 +45,6 @@ public class FileSourceTesting { stmt.setString(2, fileUuid); stmt.executeUpdate(); stmt.close(); - connection.commit(); } /** diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java index a93cfbe8454..40afadac13d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; 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.api.config.Settings; @@ -71,15 +72,14 @@ public class SourceLineIndexerTest { @ClassRule public static EsTester es = new EsTester().addDefinitions(new SourceLineIndexDefinition(new Settings())); - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); private SourceLineIndexer indexer; @Before public void setUp() { es.truncateIndices(); - db.truncateTables(); indexer = new SourceLineIndexer(new DbClient(db.database(), db.myBatis()), es.client()); indexer.setEnabled(true); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java index 058990e7b03..687ba8391fa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java @@ -23,7 +23,7 @@ import java.sql.Connection; import java.util.Map; import org.assertj.core.data.MapEntry; import org.elasticsearch.action.update.UpdateRequest; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; @@ -37,8 +37,8 @@ import static org.junit.Assert.fail; @Category(DbTests.class) public class SourceLineResultSetIteratorTest { - @ClassRule - public static DbTester db = DbTester.create(System2.INSTANCE); + @Rule + public DbTester db = DbTester.create(System2.INSTANCE); SourceLineResultSetIterator iterator; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java index 8e848028297..246ee7f9471 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java @@ -49,8 +49,8 @@ public class HashActionTest { final static String COMPONENT_KEY = "Action.java"; final static String PROJECT_UUID = "ABCD"; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java index 370574e24c1..a107c6495ea 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java @@ -58,8 +58,8 @@ public class LinesActionTest { @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new SourceLineIndexDefinition(new Settings())); - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java index a8011505543..362d42f575f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java @@ -50,8 +50,8 @@ public class ScmActionTest { private static final String FILE_UUID = "FILE_A"; private static final String PROJECT_UUID = "PROJECT_A"; - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new SourceLineIndexDefinition(new Settings())); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java index 4fcba6f5c49..072bac4eca4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java @@ -21,6 +21,7 @@ package org.sonar.server.startup; 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.runner.RunWith; @@ -42,8 +43,8 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class CopyRequirementsFromCharacteristicsToRulesTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @Mock System2 system2; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java index f2f79dadf9b..5ee1b2c8a4e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java @@ -22,6 +22,7 @@ package org.sonar.server.startup; import java.util.Collections; import java.util.List; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.measures.CoreMetrics; @@ -39,8 +40,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class RegisterMetricsTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); /** * Insert new metrics, including custom metrics diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java index c9fc0f497dc..515e60a7f1a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; 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.api.config.Settings; @@ -66,8 +67,8 @@ public class TestIndexerTest { @ClassRule public static EsTester es = new EsTester().addDefinitions(new TestIndexDefinition(new Settings())); - @ClassRule - public static DbTester db = DbTester.create(System2.INSTANCE); + @Rule + public DbTester db = DbTester.create(System2.INSTANCE); private TestIndexer sut; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java index e18a89a85c1..fdee9c93140 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java @@ -27,7 +27,7 @@ import java.util.Map; import org.assertj.core.data.MapEntry; import org.elasticsearch.action.update.UpdateRequest; import org.junit.After; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; @@ -44,8 +44,8 @@ import static org.assertj.core.api.Assertions.fail; @Category(DbTests.class) public class TestResultSetIteratorTest { - @ClassRule - public static DbTester dbTester = DbTester.create(System2.INSTANCE); + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); TestResultSetIterator sut; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java index d857bf363fc..1246e079d2c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java @@ -54,8 +54,8 @@ public class ListActionTest { WsTester ws; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new TestIndexDefinition(new Settings())); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java index 55332a06cc2..98a201efb9c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java @@ -71,8 +71,8 @@ import static org.mockito.Mockito.when; public class ComponentNavigationActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java index c40a6fb17fb..58c384bfc5a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java @@ -51,8 +51,8 @@ import static org.mockito.Mockito.mock; public class GlobalNavigationActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java index 129b04fbd31..97c54d602b9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java @@ -26,6 +26,7 @@ import org.elasticsearch.search.SearchHit; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; @@ -63,8 +64,8 @@ import static org.mockito.Mockito.when; @Category(DbTests.class) public class UserUpdaterTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); @ClassRule public static EsTester es = new EsTester().addDefinitions(new UserIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java index 19e9d42cd9e..4c58f04491a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java @@ -23,6 +23,7 @@ package org.sonar.server.user.db; import org.junit.After; 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.api.utils.DateUtils; @@ -39,8 +40,8 @@ import static org.mockito.Mockito.when; @Category(DbTests.class) public class GroupDaoTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); GroupDao dao; DbSession session; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java index 6ec82e79a3f..7d71e9ea16e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java @@ -23,6 +23,7 @@ package org.sonar.server.user.db; import org.junit.After; 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.api.utils.System2; @@ -41,8 +42,8 @@ import static org.mockito.Mockito.mock; @Category(DbTests.class) public class UserDaoTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); private UserDao dao; private DbSession session; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java index 46c872fc5f8..b78e38c17d3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java @@ -21,6 +21,7 @@ package org.sonar.server.user.index; 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.api.config.Settings; @@ -36,8 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class UserIndexerTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java index 8d56bf29ca1..d401c0d6b04 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java @@ -23,7 +23,7 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; import java.util.Map; 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.api.utils.System2; @@ -35,8 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class UserResultSetIteratorTest { - @ClassRule - public static DbTester dbTester = DbTester.create(System2.INSTANCE); + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); @Before public void setUp() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java index 799f08c055b..a77e55b949d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java @@ -59,8 +59,8 @@ public class ChangePasswordActionTest { static final Settings settings = new Settings().setProperty("sonar.defaultGroup", "sonar-users"); - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static final EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(settings)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java index ba7b24895e9..90ec43259ed 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java @@ -62,8 +62,8 @@ public class CreateActionTest { static final Settings settings = new Settings().setProperty("sonar.defaultGroup", "sonar-users"); - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static final EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(settings)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java index 071ea3277e0..3b993ea4c4c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java @@ -60,8 +60,8 @@ public class DeactivateActionTest { static final Settings settings = new Settings(); - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static final EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(settings)); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java index a9706d90a29..d027139eec5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java @@ -46,8 +46,8 @@ import org.sonar.server.ws.WsTester; public class GroupsActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java index 9ff7ac2f9b1..3c5a8e6c21b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java @@ -57,8 +57,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class SearchActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static final EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(new Settings())); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java index a69e8f94612..62641c70060 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java @@ -56,8 +56,8 @@ public class UpdateActionTest { static final Settings settings = new Settings().setProperty("sonar.defaultGroup", "sonar-users"); - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static final EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(settings)); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java index bda2bf1b2ad..a7cf5abbf7e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java @@ -52,8 +52,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class AddUserActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public final UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java index 320a00619f8..9e5d9132f15 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java @@ -45,8 +45,8 @@ import org.sonar.test.DbTests; @Category(DbTests.class) public class CreateActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java index 1d081d61fc3..a6924c0d4fb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java @@ -51,8 +51,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class DeleteActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java index e247b1c638a..11d86493f05 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java @@ -51,8 +51,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class RemoveUserActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public final UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java index c4652ddb63c..946c77d8244 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java @@ -24,6 +24,7 @@ import org.apache.commons.lang.StringUtils; import org.junit.After; 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.api.server.ws.WebService.Param; @@ -44,8 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class SearchActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); private WsTester tester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java index b1a19799695..da41fa672c0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java @@ -49,8 +49,8 @@ import org.sonar.test.DbTests; @Category(DbTests.class) public class UpdateActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java index 0976291ae78..dd32d39c638 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java @@ -50,8 +50,8 @@ import org.sonar.test.DbTests; @Category(DbTests.class) public class UsersActionTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java index 848293f400c..07547ed9fb5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java @@ -65,8 +65,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class ViewIndexerTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings()), new ViewIndexDefinition(new Settings())); diff --git a/sonar-db/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java b/sonar-db/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java index 0d978a6124a..895bc460e05 100644 --- a/sonar-db/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java +++ b/sonar-db/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java @@ -19,8 +19,8 @@ */ package org.sonar.core.user; -import org.junit.BeforeClass; -import org.junit.ClassRule; +import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.database.model.User; @@ -37,11 +37,11 @@ import static org.mockito.Mockito.mock; @Category(DbTests.class) public class DeprecatedUserFinderTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); - @BeforeClass - public static void init() { + @Before + public void init() { dbTester.prepareDbUnit(DeprecatedUserFinderTest.class, "fixture.xml"); } diff --git a/sonar-db/src/test/java/org/sonar/db/DbTester.java b/sonar-db/src/test/java/org/sonar/db/DbTester.java index 30bc65fa1e3..ac990c2a55c 100644 --- a/sonar-db/src/test/java/org/sonar/db/DbTester.java +++ b/sonar-db/src/test/java/org/sonar/db/DbTester.java @@ -96,6 +96,7 @@ public class DbTester extends ExternalResource { @Override protected void before() throws Throwable { + db.start(); truncateTables(); } @@ -104,7 +105,7 @@ public class DbTester extends ExternalResource { if (session != null) { MyBatis.closeQuietly(session); } - db.close(); + db.stop(); } public DbSession getSession() { @@ -225,8 +226,6 @@ public class DbTester extends ExternalResource { public void prepareDbUnit(Class testClass, String... testNames) { InputStream[] streams = new InputStream[testNames.length]; try { - db.truncateTables(); - for (int i = 0; i < testNames.length; i++) { String path = "/" + testClass.getName().replace('.', '/') + "/" + testNames[i]; streams[i] = testClass.getResourceAsStream(path); diff --git a/sonar-db/src/test/java/org/sonar/db/IsAliveMapperTest.java b/sonar-db/src/test/java/org/sonar/db/IsAliveMapperTest.java index 02b9c6b4427..f71a58bd8cb 100644 --- a/sonar-db/src/test/java/org/sonar/db/IsAliveMapperTest.java +++ b/sonar-db/src/test/java/org/sonar/db/IsAliveMapperTest.java @@ -21,9 +21,10 @@ package org.sonar.db; import org.junit.After; 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.api.utils.System2; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; @@ -31,8 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class IsAliveMapperTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); DbSession session; IsAliveMapper underTest; diff --git a/sonar-db/src/test/java/org/sonar/db/ResultSetIteratorTest.java b/sonar-db/src/test/java/org/sonar/db/ResultSetIteratorTest.java index 4326aa15b88..c1e330732e3 100644 --- a/sonar-db/src/test/java/org/sonar/db/ResultSetIteratorTest.java +++ b/sonar-db/src/test/java/org/sonar/db/ResultSetIteratorTest.java @@ -24,7 +24,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.NoSuchElementException; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; @@ -36,8 +36,8 @@ import static org.junit.Assert.fail; @Category(DbTests.class) public class ResultSetIteratorTest { - @ClassRule - public static DbTester dbTester = DbTester.createForSchema(System2.INSTANCE, ResultSetIteratorTest.class, "schema.sql"); + @Rule + public DbTester dbTester = DbTester.createForSchema(System2.INSTANCE, ResultSetIteratorTest.class, "schema.sql"); @Test public void create_iterator_from_statement() throws Exception { diff --git a/sonar-db/src/test/java/org/sonar/db/TestDb.java b/sonar-db/src/test/java/org/sonar/db/TestDb.java index 3ab4fc41346..685a81220e0 100644 --- a/sonar-db/src/test/java/org/sonar/db/TestDb.java +++ b/sonar-db/src/test/java/org/sonar/db/TestDb.java @@ -41,6 +41,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.db.deprecated.NullQueue; +import org.sonar.db.dialect.H2; /** * This class should be call using @ClassRule in order to create the schema once (ft @Rule is used @@ -95,7 +96,7 @@ class TestDb { ((H2Database) db).executeScript(schemaPath); } else { db.stop(); - throw new AssumptionViolatedException("Test disabled because it supports only H2"); + } } isDefault = (schemaPath == null); @@ -109,20 +110,26 @@ class TestDb { } } - void truncateTables() { - try { - commands.truncateDatabase(db.getDataSource()); - } catch (SQLException e) { - throw new IllegalStateException("Fail to truncate db tables", e); + public void start() { + if (!isDefault && !H2.ID.equals(db.getDialect().getId())) { + throw new AssumptionViolatedException("Test disabled because it supports only H2"); } } - void close() { + void stop() { if (!isDefault) { db.stop(); } } + void truncateTables() { + try { + commands.truncateDatabase(db.getDataSource()); + } catch (SQLException e) { + throw new IllegalStateException("Fail to truncate db tables", e); + } + } + Database getDatabase() { return db; } @@ -174,4 +181,6 @@ class TestDb { IOUtils.closeQuietly(input); } } + + } diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentLinkDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentLinkDaoTest.java index 931d4f0c508..dc53978fcc9 100644 --- a/sonar-db/src/test/java/org/sonar/db/component/ComponentLinkDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentLinkDaoTest.java @@ -21,7 +21,7 @@ package org.sonar.db.component; import java.util.List; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; @@ -33,8 +33,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class ComponentLinkDaoTest { - @ClassRule - public static DbTester dbTester = DbTester.create(System2.INSTANCE); + @Rule + public DbTester dbTester = DbTester.create(System2.INSTANCE); ComponentLinkDao dao = dbTester.getDbClient().componentLinkDao(); diff --git a/sonar-db/src/test/java/org/sonar/db/component/SnapshotDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/SnapshotDaoTest.java index 21ec3e349a9..d4e65fc2f15 100644 --- a/sonar-db/src/test/java/org/sonar/db/component/SnapshotDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/SnapshotDaoTest.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; import org.junit.After; 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.api.utils.DateUtils; @@ -40,8 +40,8 @@ import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.DESC; @Category(DbTests.class) public class SnapshotDaoTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); DbSession session; diff --git a/sonar-db/src/test/java/org/sonar/db/compute/AnalysisReportDaoTest.java b/sonar-db/src/test/java/org/sonar/db/compute/AnalysisReportDaoTest.java index fe061532489..23b118402d6 100644 --- a/sonar-db/src/test/java/org/sonar/db/compute/AnalysisReportDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/compute/AnalysisReportDaoTest.java @@ -21,17 +21,13 @@ package org.sonar.db.compute; import java.util.List; -import org.junit.After; 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.TemporaryFolder; import org.sonar.api.utils.System2; -import org.sonar.db.DbSession; import org.sonar.db.DbTester; -import org.sonar.db.MyBatis; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; @@ -45,30 +41,20 @@ public class AnalysisReportDaoTest { private static final String DEFAULT_PROJECT_KEY = "123456789-987654321"; - @ClassRule - public static DbTester db = new DbTester(); + System2 system2 = mock(System2.class); @Rule - public TemporaryFolder temp = new TemporaryFolder(); + public DbTester db = DbTester.create(system2); - AnalysisReportDao sut; - DbSession session; - System2 system2; + @Rule + public TemporaryFolder temp = new TemporaryFolder(); + AnalysisReportDao sut = db.getDbClient().analysisReportDao(); @Before public void before() { - this.session = db.myBatis().openSession(false); - this.system2 = mock(System2.class); - this.sut = new AnalysisReportDao(system2); - when(system2.now()).thenReturn(1_500_000_000_000L); } - @After - public void after() { - MyBatis.closeQuietly(session); - } - @Test public void insert_multiple_reports() { db.prepareDbUnit(getClass(), "empty.xml"); @@ -76,9 +62,9 @@ public class AnalysisReportDaoTest { AnalysisReportDto report1 = new AnalysisReportDto().setProjectKey("ProjectKey1").setProjectName("Project 1").setUuid("UUID_1").setStatus(PENDING); AnalysisReportDto report2 = new AnalysisReportDto().setProjectKey("ProjectKey2").setProjectName("Project 2").setUuid("UUID_2").setStatus(PENDING); - sut.insert(session, report1); - sut.insert(session, report2); - session.commit(); + sut.insert(db.getSession(), report1); + sut.insert(db.getSession(), report2); + db.getSession().commit(); db.assertDbUnit(getClass(), "insert-result.xml", "analysis_reports"); } @@ -87,8 +73,8 @@ public class AnalysisReportDaoTest { public void resetAllToPendingStatus() { db.prepareDbUnit(getClass(), "update-all-to-status-pending.xml"); - sut.resetAllToPendingStatus(session); - session.commit(); + sut.resetAllToPendingStatus(db.getSession()); + db.getSession().commit(); db.assertDbUnit(getClass(), "update-all-to-status-pending-result.xml", "analysis_reports"); } @@ -97,8 +83,8 @@ public class AnalysisReportDaoTest { public void truncate() { db.prepareDbUnit(getClass(), "any-analysis-reports.xml"); - sut.truncate(session); - session.commit(); + sut.truncate(db.getSession()); + db.getSession().commit(); db.assertDbUnit(getClass(), "truncate-result.xml", "analysis_reports"); } @@ -108,7 +94,7 @@ public class AnalysisReportDaoTest { db.prepareDbUnit(getClass(), "select.xml"); final String projectKey = "123456789-987654321"; - List reports = sut.selectByProjectKey(session, projectKey); + List reports = sut.selectByProjectKey(db.getSession(), projectKey); AnalysisReportDto report = reports.get(0); assertThat(reports).hasSize(1); @@ -123,7 +109,7 @@ public class AnalysisReportDaoTest { db.prepareDbUnit(getClass(), "select.xml"); final String projectKey = "987654321-123456789"; - List reports = sut.selectByProjectKey(session, projectKey); + List reports = sut.selectByProjectKey(db.getSession(), projectKey); assertThat(reports).hasSize(2); } @@ -132,7 +118,7 @@ public class AnalysisReportDaoTest { public void pop_oldest_pending() { db.prepareDbUnit(getClass(), "pop_oldest_pending.xml"); - AnalysisReportDto nextAvailableReport = sut.pop(session); + AnalysisReportDto nextAvailableReport = sut.pop(db.getSession()); assertThat(nextAvailableReport.getId()).isEqualTo(3); assertThat(nextAvailableReport.getProjectKey()).isEqualTo("P2"); @@ -142,7 +128,7 @@ public class AnalysisReportDaoTest { public void pop_null_if_no_pending_reports() { db.prepareDbUnit(getClass(), "pop_null_if_no_pending_reports.xml"); - AnalysisReportDto nextAvailableReport = sut.pop(session); + AnalysisReportDto nextAvailableReport = sut.pop(db.getSession()); assertThat(nextAvailableReport).isNull(); } @@ -151,7 +137,7 @@ public class AnalysisReportDaoTest { public void getById_maps_all_the_fields_except_the_data() { db.prepareDbUnit(getClass(), "one_analysis_report.xml"); - AnalysisReportDto report = sut.selectById(session, 1L); + AnalysisReportDto report = sut.selectById(db.getSession(), 1L); assertThat(report.getProjectKey()).isEqualTo(DEFAULT_PROJECT_KEY); assertThat(report.getCreatedAt()).isEqualTo(1_500_000_000_001L); @@ -165,7 +151,7 @@ public class AnalysisReportDaoTest { public void getById_returns_null_when_id_not_found() { db.prepareDbUnit(getClass(), "select.xml"); - AnalysisReportDto report = sut.selectById(session, 4L); + AnalysisReportDto report = sut.selectById(db.getSession(), 4L); assertThat(report).isNull(); } @@ -174,8 +160,8 @@ public class AnalysisReportDaoTest { public void delete_one_analysis_report() { db.prepareDbUnit(getClass(), "one_analysis_report.xml"); - sut.delete(session, 1); - session.commit(); + sut.delete(db.getSession(), 1); + db.getSession().commit(); db.assertDbUnit(getClass(), "truncate-result.xml", "analysis_reports"); } @@ -184,7 +170,7 @@ public class AnalysisReportDaoTest { public void findAll_one_analysis_report() { db.prepareDbUnit(getClass(), "one_analysis_report.xml"); - List reports = sut.selectAll(session); + List reports = sut.selectAll(db.getSession()); assertThat(reports).hasSize(1); } @@ -193,7 +179,7 @@ public class AnalysisReportDaoTest { public void findAll_empty_table() { db.prepareDbUnit(getClass(), "empty.xml"); - List reports = sut.selectAll(session); + List reports = sut.selectAll(db.getSession()); assertThat(reports).isEmpty(); } @@ -202,7 +188,7 @@ public class AnalysisReportDaoTest { public void findAll_three_analysis_reports() { db.prepareDbUnit(getClass(), "three_analysis_reports.xml"); - List reports = sut.selectAll(session); + List reports = sut.selectAll(db.getSession()); assertThat(reports).hasSize(3); } diff --git a/sonar-db/src/test/java/org/sonar/db/dashboard/ActiveDashboardDaoTest.java b/sonar-db/src/test/java/org/sonar/db/dashboard/ActiveDashboardDaoTest.java index 8f320764923..2c1bb7f6415 100644 --- a/sonar-db/src/test/java/org/sonar/db/dashboard/ActiveDashboardDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dashboard/ActiveDashboardDaoTest.java @@ -20,7 +20,7 @@ package org.sonar.db.dashboard; 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.db.DbTester; @@ -31,8 +31,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class ActiveDashboardDaoTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); private ActiveDashboardDao dao; diff --git a/sonar-db/src/test/java/org/sonar/db/dashboard/DashboardDaoTest.java b/sonar-db/src/test/java/org/sonar/db/dashboard/DashboardDaoTest.java index bcb505fc176..98612b0a1b3 100644 --- a/sonar-db/src/test/java/org/sonar/db/dashboard/DashboardDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dashboard/DashboardDaoTest.java @@ -21,7 +21,7 @@ package org.sonar.db.dashboard; import java.util.Date; 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.db.DbTester; @@ -35,8 +35,8 @@ import static org.junit.Assert.assertThat; @Category(DbTests.class) public class DashboardDaoTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); private DashboardDao dao; diff --git a/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDaoTest.java b/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDaoTest.java index 504fe7d9246..4105328e632 100644 --- a/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDaoTest.java @@ -23,7 +23,7 @@ package org.sonar.db.debt; import java.util.List; import org.junit.After; 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.api.utils.DateUtils; @@ -39,8 +39,8 @@ public class CharacteristicDaoTest { private static final String[] EXCLUDED_COLUMNS = new String[] {"id", "root_id", "rule_id", "function_key", "factor_unit", "factor_value", "offset_unit", "offset_value"}; - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); CharacteristicDao dao; diff --git a/sonar-db/src/test/java/org/sonar/db/event/EventDaoTest.java b/sonar-db/src/test/java/org/sonar/db/event/EventDaoTest.java index 4915c0e2291..f0910c39f91 100644 --- a/sonar-db/src/test/java/org/sonar/db/event/EventDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/event/EventDaoTest.java @@ -23,7 +23,7 @@ package org.sonar.db.event; import java.util.List; import org.junit.After; 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.db.DbSession; @@ -35,8 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class EventDaoTest { - @ClassRule - public static DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); DbSession session; diff --git a/sonar-db/src/test/java/org/sonar/db/measure/MeasureDaoTest.java b/sonar-db/src/test/java/org/sonar/db/measure/MeasureDaoTest.java index 5867761b3b8..4eab62e294c 100644 --- a/sonar-db/src/test/java/org/sonar/db/measure/MeasureDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/measure/MeasureDaoTest.java @@ -28,7 +28,7 @@ import java.util.Map; import javax.annotation.Nullable; import org.junit.After; 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.db.DbSession; @@ -41,8 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class MeasureDaoTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); DbSession session; MeasureDao sut; diff --git a/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java index f5327223d39..ff4c4ba4875 100644 --- a/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.List; import org.junit.After; 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.db.DbSession; @@ -39,8 +39,8 @@ import static org.assertj.core.data.MapEntry.entry; @Category(DbTests.class) public class GroupMembershipDaoTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); private GroupMembershipDao dao; diff --git a/sonar-db/src/test/java/org/sonar/db/user/RoleDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/RoleDaoTest.java index df2470f74f7..24d2ebefcdd 100644 --- a/sonar-db/src/test/java/org/sonar/db/user/RoleDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/RoleDaoTest.java @@ -22,7 +22,7 @@ package org.sonar.db.user; import org.junit.After; 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.api.security.DefaultGroups; @@ -37,8 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) public class RoleDaoTest { - @ClassRule - public static final DbTester dbTester = new DbTester(); + @Rule + public DbTester dbTester = new DbTester(); DbSession session; diff --git a/sonar-db/src/test/java/org/sonar/db/user/UserGroupDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/UserGroupDaoTest.java index ff1c8cfecef..fc600f98f09 100644 --- a/sonar-db/src/test/java/org/sonar/db/user/UserGroupDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/UserGroupDaoTest.java @@ -22,7 +22,7 @@ package org.sonar.db.user; import org.junit.After; 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.db.DbSession; @@ -32,8 +32,8 @@ import org.sonar.test.DbTests; @Category(DbTests.class) public class UserGroupDaoTest { - @ClassRule - public static DbTester db = new DbTester(); + @Rule + public DbTester db = new DbTester(); private UserGroupDao dao; private DbSession session; -- 2.39.5