From b5a22322f8104d88626e454b0cf2484e206b351b Mon Sep 17 00:00:00 2001 From: Lukasz Jarocki Date: Mon, 13 Mar 2023 17:06:21 +0100 Subject: [PATCH] SONAR-18679 refactored sonar-db-core and sonar-db-dao to match testing strategy --- build.gradle | 11 +++++++++++ server/sonar-db-core/build.gradle | 11 ----------- .../{DatabaseUtilsTest.java => DatabaseUtilsIT.java} | 8 ++++---- ...tSetIteratorTest.java => ResultSetIteratorIT.java} | 4 ++-- .../db/{DatabaseUtilsTest => DatabaseUtilsIT}/sql.sql | 0 .../schema.sql | 0 server/sonar-db-dao/build.gradle | 10 ---------- .../{DatabaseMBeanTest.java => DatabaseMBeanIT.java} | 2 +- .../{IsAliveMapperTest.java => IsAliveMapperIT.java} | 2 +- .../org/sonar/db/{MyBatisTest.java => MyBatisIT.java} | 2 +- ...QDatabaseForH2Test.java => SQDatabaseForH2IT.java} | 2 +- .../alm/pat/{AlmPatDaoTest.java => AlmPatDaoIT.java} | 2 +- ...rsisterTest.java => AlmPatDaoWithPersisterIT.java} | 2 +- .../{AlmSettingDaoTest.java => AlmSettingDaoIT.java} | 2 +- ...terTest.java => AlmSettingDaoWithPersisterIT.java} | 2 +- ...ettingDaoTest.java => ProjectAlmSettingDaoIT.java} | 2 +- ....java => ProjectAlmSettingDaoWithPersisterIT.java} | 2 +- .../db/audit/{AuditDaoTest.java => AuditDaoIT.java} | 2 +- .../{CeActivityDaoTest.java => CeActivityDaoIT.java} | 2 +- .../db/ce/{CeQueueDaoTest.java => CeQueueDaoIT.java} | 2 +- ...ContextDaoTest.java => CeScannerContextDaoIT.java} | 2 +- ...ticDaoTest.java => CeTaskCharacteristicDaoIT.java} | 2 +- ...{CeTaskInputDaoTest.java => CeTaskInputDaoIT.java} | 2 +- ...askMessageDaoTest.java => CeTaskMessageDaoIT.java} | 2 +- ...rtiesDaoTest.java => AnalysisPropertiesDaoIT.java} | 2 +- ...ectsDaoTest.java => ApplicationProjectsDaoIT.java} | 2 +- .../{BranchDaoTest.java => BranchDaoIT.java} | 2 +- .../{ComponentDaoTest.java => ComponentDaoIT.java} | 2 +- ...aterDaoTest.java => ComponentKeyUpdaterDaoIT.java} | 2 +- ...{ProjectLinkDaoTest.java => ProjectLinkDaoIT.java} | 2 +- ...Test.java => ScrollForFileMoveComponentDaoIT.java} | 2 +- .../{SnapshotDaoTest.java => SnapshotDaoIT.java} | 2 +- ...{DuplicationDaoTest.java => DuplicationDaoIT.java} | 2 +- .../db/es/{EsQueueDaoTest.java => EsQueueDaoIT.java} | 2 +- ...ngeDaoTest.java => EventComponentChangeDaoIT.java} | 2 +- .../db/event/{EventDaoTest.java => EventDaoIT.java} | 2 +- ...{IssueChangeDaoTest.java => IssueChangeDaoIT.java} | 2 +- ...ChangeMapperTest.java => IssueChangeMapperIT.java} | 2 +- .../db/issue/{IssueDaoTest.java => IssueDaoIT.java} | 2 +- .../{IssueMapperTest.java => IssueMapperIT.java} | 2 +- ...MappingsDaoTest.java => ProjectMappingsDaoIT.java} | 2 +- ...{LiveMeasureDaoTest.java => LiveMeasureDaoIT.java} | 2 +- .../{MeasureDaoTest.java => MeasureDaoIT.java} | 2 +- ...est.java => ProjectMeasuresIndexerIteratorIT.java} | 2 +- .../metric/{MetricDaoTest.java => MetricDaoIT.java} | 2 +- ...CodePeriodDaoTest.java => NewCodePeriodDaoIT.java} | 2 +- ...nQueueDaoTest.java => NotificationQueueDaoIT.java} | 2 +- ...horizationDaoTest.java => AuthorizationDaoIT.java} | 2 +- ...rmissionDaoTest.java => GroupPermissionDaoIT.java} | 2 +- ...st.java => GroupPermissionDaoWithPersisterIT.java} | 2 +- ...ermissionDaoTest.java => UserPermissionDaoIT.java} | 2 +- ...est.java => UserPermissionDaoWithPersisterIT.java} | 2 +- ...est.java => GroupWithPermissionTemplateDaoIT.java} | 2 +- ...ava => PermissionTemplateCharacteristicDaoIT.java} | 2 +- ...sionTemplateCharacteristicDaoWithPersisterIT.java} | 2 +- ...plateDaoTest.java => PermissionTemplateDaoIT.java} | 2 +- ...java => PermissionTemplateDaoWithPersisterIT.java} | 2 +- ...Test.java => UserWithPermissionTemplateDaoIT.java} | 2 +- .../plugin/{PluginDaoTest.java => PluginDaoIT.java} | 2 +- ...rsisterTest.java => PluginDaoWithPersisterIT.java} | 2 +- .../{PortfolioDaoTest.java => PortfolioDaoIT.java} | 2 +- ...eTokenDaoTest.java => ProjectBadgeTokenDaoIT.java} | 2 +- .../{ProjectDaoTest.java => ProjectDaoIT.java} | 2 +- ...est.java => InternalComponentPropertiesDaoIT.java} | 2 +- ...rtiesDaoTest.java => InternalPropertiesDaoIT.java} | 2 +- .../{PropertiesDaoTest.java => PropertiesDaoIT.java} | 2 +- ...terTest.java => PropertiesDaoWithPersisterIT.java} | 2 +- .../{PurgeCommandsTest.java => PurgeCommandsIT.java} | 2 +- .../db/purge/{PurgeDaoTest.java => PurgeDaoIT.java} | 2 +- ...DaoWithAuditTest.java => PurgeDaoWithAuditIT.java} | 2 +- .../{PurgeMapperTest.java => PurgeMapperIT.java} | 2 +- .../{PushEventDaoTest.java => PushEventDaoIT.java} | 2 +- ...DaoTest.java => ProjectQgateAssociationDaoIT.java} | 2 +- ...ionDaoTest.java => QualityGateConditionDaoIT.java} | 2 +- ...{QualityGateDaoTest.java => QualityGateDaoIT.java} | 2 +- ...est.java => QualityGateGroupPermissionsDaoIT.java} | 2 +- ...Test.java => QualityGateUserPermissionsDaoIT.java} | 2 +- .../{ActiveRuleDaoTest.java => ActiveRuleDaoIT.java} | 2 +- ...QProfileDaoTest.java => DefaultQProfileDaoIT.java} | 2 +- ...ileChangeDaoTest.java => QProfileChangeDaoIT.java} | 2 +- ...roupsDaoTest.java => QProfileEditGroupsDaoIT.java} | 2 +- ...tUsersDaoTest.java => QProfileEditUsersDaoIT.java} | 2 +- ...tyProfileDaoTest.java => QualityProfileDaoIT.java} | 2 +- ...ortDaoTest.java => QualityProfileExportDaoIT.java} | 2 +- ...yReportDaoTest.java => RegulatoryReportDaoIT.java} | 2 +- .../db/rule/{RuleDaoTest.java => RuleDaoIT.java} | 2 +- ...epositoryDaoTest.java => RuleRepositoryDaoIT.java} | 2 +- ...cheDaoTest.java => ScannerAnalysisCacheDaoIT.java} | 2 +- ...igrationDaoTest.java => SchemaMigrationDaoIT.java} | 2 +- .../scim/{ScimUserDaoTest.java => ScimUserDaoIT.java} | 2 +- .../{FileSourceDaoTest.java => FileSourceDaoIT.java} | 2 +- .../db/user/{GroupDaoTest.java => GroupDaoIT.java} | 2 +- ...ersisterTest.java => GroupDaoWithPersisterIT.java} | 2 +- ...mbershipDaoTest.java => GroupMembershipDaoIT.java} | 2 +- .../db/user/{RoleDaoTest.java => RoleDaoIT.java} | 2 +- ...lMessageIdDaoTest.java => SamlMessageIdDaoIT.java} | 2 +- ...sionTokensDaoTest.java => SessionTokensDaoIT.java} | 2 +- .../db/user/{UserDaoTest.java => UserDaoIT.java} | 2 +- ...PersisterTest.java => UserDaoWithPersisterIT.java} | 2 +- ...esDaoTest.java => UserDismissedMessagesDaoIT.java} | 2 +- .../{UserGroupDaoTest.java => UserGroupDaoIT.java} | 2 +- ...sterTest.java => UserGroupDaoWithPersisterIT.java} | 2 +- .../{UserTokenDaoTest.java => UserTokenDaoIT.java} | 2 +- ...sterTest.java => UserTokenDaoWithPersisterIT.java} | 2 +- .../{WebhookDaoTest.java => WebhookDaoIT.java} | 2 +- ...sisterTest.java => WebhookDaoWithPersisterIT.java} | 2 +- ...DeliveryDaoTest.java => WebhookDeliveryDaoIT.java} | 2 +- .../shared.xml | 0 .../update_authorization_date-result.xml | 0 .../update_authorization_date.xml | 0 .../db/issue/{IssueDaoTest => IssueDaoIT}/shared.xml | 0 .../should_select_issue_and_component_ids.xml | 0 .../should_select_non_closed_issues_by_module.xml | 0 ...non_closed_issues_by_module_on_removed_project.xml | 0 .../should_select_assignees.xml | 0 .../{MeasureDaoTest => MeasureDaoIT}/empty.xml | 0 .../insert-result.xml | 0 .../past_measures.xml | 0 .../select_by_snapshot_and_metric_keys.xml | 0 .../{MeasureDaoTest => MeasureDaoIT}/shared.xml | 0 .../should_return_root_project_keys_for_anonymous.xml | 0 .../should_return_root_project_keys_for_group.xml | 0 .../should_return_root_project_keys_for_user.xml | 0 .../org/sonar/db/measure/MeasureTreeQueryTest.java | 3 +-- 124 files changed, 118 insertions(+), 129 deletions(-) rename server/sonar-db-core/src/it/java/org/sonar/db/{DatabaseUtilsTest.java => DatabaseUtilsIT.java} (99%) rename server/sonar-db-core/src/it/java/org/sonar/db/{ResultSetIteratorTest.java => ResultSetIteratorIT.java} (98%) rename server/sonar-db-core/src/it/resources/org/sonar/db/{DatabaseUtilsTest => DatabaseUtilsIT}/sql.sql (100%) rename server/sonar-db-core/src/it/resources/org/sonar/db/{ResultSetIteratorTest => ResultSetIteratorIT}/schema.sql (100%) rename server/sonar-db-dao/src/it/java/org/sonar/db/{DatabaseMBeanTest.java => DatabaseMBeanIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/{IsAliveMapperTest.java => IsAliveMapperIT.java} (97%) rename server/sonar-db-dao/src/it/java/org/sonar/db/{MyBatisTest.java => MyBatisIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/{SQDatabaseForH2Test.java => SQDatabaseForH2IT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/{AlmPatDaoTest.java => AlmPatDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/{AlmPatDaoWithPersisterTest.java => AlmPatDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/{AlmSettingDaoTest.java => AlmSettingDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/{AlmSettingDaoWithPersisterTest.java => AlmSettingDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/{ProjectAlmSettingDaoTest.java => ProjectAlmSettingDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/{ProjectAlmSettingDaoWithPersisterTest.java => ProjectAlmSettingDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/audit/{AuditDaoTest.java => AuditDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/ce/{CeActivityDaoTest.java => CeActivityDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/ce/{CeQueueDaoTest.java => CeQueueDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/ce/{CeScannerContextDaoTest.java => CeScannerContextDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/ce/{CeTaskCharacteristicDaoTest.java => CeTaskCharacteristicDaoIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/ce/{CeTaskInputDaoTest.java => CeTaskInputDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/ce/{CeTaskMessageDaoTest.java => CeTaskMessageDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{AnalysisPropertiesDaoTest.java => AnalysisPropertiesDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{ApplicationProjectsDaoTest.java => ApplicationProjectsDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{BranchDaoTest.java => BranchDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{ComponentDaoTest.java => ComponentDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{ComponentKeyUpdaterDaoTest.java => ComponentKeyUpdaterDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{ProjectLinkDaoTest.java => ProjectLinkDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{ScrollForFileMoveComponentDaoTest.java => ScrollForFileMoveComponentDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/component/{SnapshotDaoTest.java => SnapshotDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/duplication/{DuplicationDaoTest.java => DuplicationDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/es/{EsQueueDaoTest.java => EsQueueDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/event/{EventComponentChangeDaoTest.java => EventComponentChangeDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/event/{EventDaoTest.java => EventDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/issue/{IssueChangeDaoTest.java => IssueChangeDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/issue/{IssueChangeMapperTest.java => IssueChangeMapperIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/issue/{IssueDaoTest.java => IssueDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/issue/{IssueMapperTest.java => IssueMapperIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/mapping/{ProjectMappingsDaoTest.java => ProjectMappingsDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/measure/{LiveMeasureDaoTest.java => LiveMeasureDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/measure/{MeasureDaoTest.java => MeasureDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/measure/{ProjectMeasuresIndexerIteratorTest.java => ProjectMeasuresIndexerIteratorIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/metric/{MetricDaoTest.java => MetricDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/{NewCodePeriodDaoTest.java => NewCodePeriodDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/notification/{NotificationQueueDaoTest.java => NotificationQueueDaoIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/{AuthorizationDaoTest.java => AuthorizationDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/{GroupPermissionDaoTest.java => GroupPermissionDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/{GroupPermissionDaoWithPersisterTest.java => GroupPermissionDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/{UserPermissionDaoTest.java => UserPermissionDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/{UserPermissionDaoWithPersisterTest.java => UserPermissionDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/{GroupWithPermissionTemplateDaoTest.java => GroupWithPermissionTemplateDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/{PermissionTemplateCharacteristicDaoTest.java => PermissionTemplateCharacteristicDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/{PermissionTemplateCharacteristicDaoWithPersisterTest.java => PermissionTemplateCharacteristicDaoWithPersisterIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/{PermissionTemplateDaoTest.java => PermissionTemplateDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/{PermissionTemplateDaoWithPersisterTest.java => PermissionTemplateDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/{UserWithPermissionTemplateDaoTest.java => UserWithPermissionTemplateDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/plugin/{PluginDaoTest.java => PluginDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/plugin/{PluginDaoWithPersisterTest.java => PluginDaoWithPersisterIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/{PortfolioDaoTest.java => PortfolioDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/project/{ProjectBadgeTokenDaoTest.java => ProjectBadgeTokenDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/project/{ProjectDaoTest.java => ProjectDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/property/{InternalComponentPropertiesDaoTest.java => InternalComponentPropertiesDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/property/{InternalPropertiesDaoTest.java => InternalPropertiesDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/property/{PropertiesDaoTest.java => PropertiesDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/property/{PropertiesDaoWithPersisterTest.java => PropertiesDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/purge/{PurgeCommandsTest.java => PurgeCommandsIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/purge/{PurgeDaoTest.java => PurgeDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/purge/{PurgeDaoWithAuditTest.java => PurgeDaoWithAuditIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/purge/{PurgeMapperTest.java => PurgeMapperIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/{PushEventDaoTest.java => PushEventDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/{ProjectQgateAssociationDaoTest.java => ProjectQgateAssociationDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/{QualityGateConditionDaoTest.java => QualityGateConditionDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/{QualityGateDaoTest.java => QualityGateDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/{QualityGateGroupPermissionsDaoTest.java => QualityGateGroupPermissionsDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/{QualityGateUserPermissionsDaoTest.java => QualityGateUserPermissionsDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/{ActiveRuleDaoTest.java => ActiveRuleDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/{DefaultQProfileDaoTest.java => DefaultQProfileDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/{QProfileChangeDaoTest.java => QProfileChangeDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/{QProfileEditGroupsDaoTest.java => QProfileEditGroupsDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/{QProfileEditUsersDaoTest.java => QProfileEditUsersDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/{QualityProfileDaoTest.java => QualityProfileDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/{QualityProfileExportDaoTest.java => QualityProfileExportDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/report/{RegulatoryReportDaoTest.java => RegulatoryReportDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/rule/{RuleDaoTest.java => RuleDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/rule/{RuleRepositoryDaoTest.java => RuleRepositoryDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/{ScannerAnalysisCacheDaoTest.java => ScannerAnalysisCacheDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/{SchemaMigrationDaoTest.java => SchemaMigrationDaoIT.java} (98%) rename server/sonar-db-dao/src/it/java/org/sonar/db/scim/{ScimUserDaoTest.java => ScimUserDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/source/{FileSourceDaoTest.java => FileSourceDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{GroupDaoTest.java => GroupDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{GroupDaoWithPersisterTest.java => GroupDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{GroupMembershipDaoTest.java => GroupMembershipDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{RoleDaoTest.java => RoleDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{SamlMessageIdDaoTest.java => SamlMessageIdDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{SessionTokensDaoTest.java => SessionTokensDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{UserDaoTest.java => UserDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{UserDaoWithPersisterTest.java => UserDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{UserDismissedMessagesDaoTest.java => UserDismissedMessagesDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{UserGroupDaoTest.java => UserGroupDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{UserGroupDaoWithPersisterTest.java => UserGroupDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{UserTokenDaoTest.java => UserTokenDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/user/{UserTokenDaoWithPersisterTest.java => UserTokenDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/webhook/{WebhookDaoTest.java => WebhookDaoIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/webhook/{WebhookDaoWithPersisterTest.java => WebhookDaoWithPersisterIT.java} (99%) rename server/sonar-db-dao/src/it/java/org/sonar/db/webhook/{WebhookDeliveryDaoTest.java => WebhookDeliveryDaoIT.java} (99%) rename server/sonar-db-dao/src/it/resources/org/sonar/core/qualitymodel/{DefaultModelFinderTest => DefaultModelFinderIT}/shared.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/component/{ResourceDaoTest => ResourceDaoIT}/update_authorization_date-result.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/component/{ResourceDaoTest => ResourceDaoIT}/update_authorization_date.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/issue/{IssueDaoTest => IssueDaoIT}/shared.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/issue/{IssueDaoTest => IssueDaoIT}/should_select_issue_and_component_ids.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/issue/{IssueDaoTest => IssueDaoIT}/should_select_non_closed_issues_by_module.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/issue/{IssueDaoTest => IssueDaoIT}/should_select_non_closed_issues_by_module_on_removed_project.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/issue/{IssueStatsDaoTest => IssueStatsDaoIT}/should_select_assignees.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/measure/{MeasureDaoTest => MeasureDaoIT}/empty.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/measure/{MeasureDaoTest => MeasureDaoIT}/insert-result.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/measure/{MeasureDaoTest => MeasureDaoIT}/past_measures.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/measure/{MeasureDaoTest => MeasureDaoIT}/select_by_snapshot_and_metric_keys.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/measure/{MeasureDaoTest => MeasureDaoIT}/shared.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/permission/{AuthorizationDaoTest => AuthorizationDaoIT}/should_return_root_project_keys_for_anonymous.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/permission/{AuthorizationDaoTest => AuthorizationDaoIT}/should_return_root_project_keys_for_group.xml (100%) rename server/sonar-db-dao/src/it/resources/org/sonar/db/permission/{AuthorizationDaoTest => AuthorizationDaoIT}/should_return_root_project_keys_for_user.xml (100%) rename server/sonar-db-dao/src/{it => test}/java/org/sonar/db/measure/MeasureTreeQueryTest.java (99%) diff --git a/build.gradle b/build.gradle index 34641360f60..ef662359dc0 100644 --- a/build.gradle +++ b/build.gradle @@ -167,6 +167,17 @@ subprojects { } } + sourceSets { + test { + resources { + srcDirs += ['src/it/resources'] + } + java { + srcDirs += ['src/it/java'] + } + } + } + // Central place for definition dependency versions and exclusions. dependencyManagement { dependencies { diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle index 6d3bad048e7..5413fef01b0 100644 --- a/server/sonar-db-core/build.gradle +++ b/server/sonar-db-core/build.gradle @@ -4,17 +4,6 @@ sonar { } } -sourceSets { - test { - resources { - srcDirs += ['src/it/resources'] - } - java{ - srcDirs += ['src/it/java'] - } - } -} - dependencies { // please keep the list grouped by configuration and ordered by name diff --git a/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsTest.java b/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java similarity index 99% rename from server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsTest.java rename to server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java index a69683aa2f7..5fd95eb47e1 100644 --- a/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsTest.java +++ b/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java @@ -65,13 +65,13 @@ import static org.sonar.db.DatabaseUtils.tableColumnExists; import static org.sonar.db.DatabaseUtils.tableExists; import static org.sonar.db.DatabaseUtils.toUniqueAndSortedList; -public class DatabaseUtilsTest { +public class DatabaseUtilsIT { private static final String DEFAULT_SCHEMA = "public"; private static final String SCHEMA_MIGRATIONS_TABLE = "SCHEMA_MIGRATIONS"; @Rule - public CoreDbTester dbTester = CoreDbTester.createForSchema(DatabaseUtilsTest.class, "sql.sql", false); + public CoreDbTester dbTester = CoreDbTester.createForSchema(DatabaseUtilsIT.class, "sql.sql", false); @Rule public LogTester logTester = new LogTester(); @@ -480,8 +480,8 @@ public class DatabaseUtilsTest { } - private static DatabaseUtilsTest.MyComparable myComparable(int ordinal) { - return new DatabaseUtilsTest.MyComparable(ordinal); + private static DatabaseUtilsIT.MyComparable myComparable(int ordinal) { + return new DatabaseUtilsIT.MyComparable(ordinal); } private static final class MyComparable implements Comparable { diff --git a/server/sonar-db-core/src/it/java/org/sonar/db/ResultSetIteratorTest.java b/server/sonar-db-core/src/it/java/org/sonar/db/ResultSetIteratorIT.java similarity index 98% rename from server/sonar-db-core/src/it/java/org/sonar/db/ResultSetIteratorTest.java rename to server/sonar-db-core/src/it/java/org/sonar/db/ResultSetIteratorIT.java index 7f707438b60..6cc03541882 100644 --- a/server/sonar-db-core/src/it/java/org/sonar/db/ResultSetIteratorTest.java +++ b/server/sonar-db-core/src/it/java/org/sonar/db/ResultSetIteratorIT.java @@ -31,10 +31,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; -public class ResultSetIteratorTest { +public class ResultSetIteratorIT { @Rule - public CoreDbTester dbTester = CoreDbTester.createForSchema(ResultSetIteratorTest.class, "schema.sql"); + public CoreDbTester dbTester = CoreDbTester.createForSchema(ResultSetIteratorIT.class, "schema.sql"); @Test public void create_iterator_from_statement() throws Exception { diff --git a/server/sonar-db-core/src/it/resources/org/sonar/db/DatabaseUtilsTest/sql.sql b/server/sonar-db-core/src/it/resources/org/sonar/db/DatabaseUtilsIT/sql.sql similarity index 100% rename from server/sonar-db-core/src/it/resources/org/sonar/db/DatabaseUtilsTest/sql.sql rename to server/sonar-db-core/src/it/resources/org/sonar/db/DatabaseUtilsIT/sql.sql diff --git a/server/sonar-db-core/src/it/resources/org/sonar/db/ResultSetIteratorTest/schema.sql b/server/sonar-db-core/src/it/resources/org/sonar/db/ResultSetIteratorIT/schema.sql similarity index 100% rename from server/sonar-db-core/src/it/resources/org/sonar/db/ResultSetIteratorTest/schema.sql rename to server/sonar-db-core/src/it/resources/org/sonar/db/ResultSetIteratorIT/schema.sql diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle index 27d7e36d4b1..9a2885a35dc 100644 --- a/server/sonar-db-dao/build.gradle +++ b/server/sonar-db-dao/build.gradle @@ -4,16 +4,6 @@ sonar { } } -sourceSets { - test { - resources { - srcDirs += ['src/it/resources'] - } - java{ - srcDirs += ['src/it/java'] - } - } -} dependencies { // please keep the list grouped by configuration and ordered by name diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanIT.java index 7e57f166439..9833b929e6e 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanIT.java @@ -26,7 +26,7 @@ import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo.Section; import static org.assertj.core.api.Assertions.assertThat; -public class DatabaseMBeanTest { +public class DatabaseMBeanIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperIT.java similarity index 97% rename from server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperIT.java index 5e3682b0d66..bd884247291 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperIT.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.sonar.api.utils.System2; import static org.assertj.core.api.Assertions.assertThat; -public class IsAliveMapperTest { +public class IsAliveMapperIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisIT.java index 6fe2424487e..d4db5c5ceae 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisIT.java @@ -29,7 +29,7 @@ import org.sonar.db.rule.RuleMapper; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; -public class MyBatisTest { +public class MyBatisIT { private static SQDatabase database; @BeforeClass diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2Test.java b/server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2IT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2Test.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2IT.java index 4d6afc68081..732beddd367 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2Test.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2IT.java @@ -28,7 +28,7 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -public class SQDatabaseForH2Test { +public class SQDatabaseForH2IT { SQDatabase db = SQDatabase.newH2Database("sonar2", true); @Before diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoIT.java index bc50b315daf..54f1c370254 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoIT.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; import static org.sonar.db.alm.integration.pat.AlmPatsTesting.newAlmPatDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubAlmSettingDto; -public class AlmPatDaoTest { +public class AlmPatDaoIT { private static final long NOW = 1000000L; private static final String A_UUID = "SOME_UUID"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterIT.java index 4c1c7812721..749f61cd827 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterIT.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.sonar.db.alm.integration.pat.AlmPatsTesting.newAlmPatDto; -public class AlmPatDaoWithPersisterTest { +public class AlmPatDaoWithPersisterIT { private static final long NOW = 1000000L; private static final String A_UUID = "SOME_UUID"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoIT.java index de17cf16b3f..74a255ce3f2 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoIT.java @@ -40,7 +40,7 @@ import static org.sonar.db.alm.setting.ALM.GITHUB; import static org.sonar.db.alm.setting.ALM.GITLAB; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubAlmSettingDto; -public class AlmSettingDaoTest { +public class AlmSettingDaoIT { private static final long NOW = 1000000L; private static final String A_UUID = "SOME_UUID"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterIT.java index 12bd69ae0ae..a4cafdfec14 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterIT.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubAlmSettingDto; -public class AlmSettingDaoWithPersisterTest { +public class AlmSettingDaoWithPersisterIT { private static final long NOW = 1000000L; private static final String A_UUID = "SOME_UUID"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoIT.java index be764013dab..f50f77d8496 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoIT.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; import static org.sonar.db.almsettings.AlmSettingsTesting.newBitbucketProjectAlmSettingDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubProjectAlmSettingDto; -public class ProjectAlmSettingDaoTest { +public class ProjectAlmSettingDaoIT { private static final long A_DATE = 1_000_000_000_000L; private static final long A_DATE_LATER = 1_700_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterIT.java index 163c3a3c821..69fc9d22d52 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterIT.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubAlmSettingDto; import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubProjectAlmSettingDto; -public class ProjectAlmSettingDaoWithPersisterTest { +public class ProjectAlmSettingDaoWithPersisterIT { private static final long A_DATE = 1_000_000_000_000L; private static final long A_DATE_LATER = 1_700_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoIT.java index 64f9de0d3a2..8d24f0a3d6f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoIT.java @@ -31,7 +31,7 @@ import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.audit.AuditDao.EXCEEDED_LENGTH; -public class AuditDaoTest { +public class AuditDaoIT { private static final long NOW = 1000000L; private final TestSystem2 system2 = new TestSystem2().setNow(NOW); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java index f920bdc5548..5f0876668ce 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java @@ -64,7 +64,7 @@ import static org.sonar.db.ce.CeQueueTesting.makeInProgress; import static org.sonar.db.ce.CeTaskTypes.REPORT; @RunWith(DataProviderRunner.class) -public class CeActivityDaoTest { +public class CeActivityDaoIT { private static final String MAINCOMPONENT_1 = randomAlphabetic(12); private static final String MAINCOMPONENT_2 = randomAlphabetic(13); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoIT.java index 9c762256ec0..92a53d4cb49 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoIT.java @@ -54,7 +54,7 @@ import static org.sonar.db.ce.CeQueueTesting.reset; import static org.sonar.db.ce.CeTaskCharacteristicDto.BRANCH_KEY; import static org.sonar.db.ce.CeTaskCharacteristicDto.PULL_REQUEST; -public class CeQueueDaoTest { +public class CeQueueDaoIT { private static final long INIT_TIME = 1_450_000_000_000L; private static final String TASK_UUID_1 = "TASK_1"; private static final String TASK_UUID_2 = "TASK_2"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoIT.java index bbd2a0ab564..fd4a08e33fd 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoIT.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; -public class CeScannerContextDaoTest { +public class CeScannerContextDaoIT { private static final String TABLE_NAME = "ce_scanner_context"; private static final String SOME_UUID = "some UUID"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoIT.java index 40f37b9f42e..cbe03fe8502 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoIT.java @@ -31,7 +31,7 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; -public class CeTaskCharacteristicDaoTest { +public class CeTaskCharacteristicDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoIT.java index ff74997ef14..85adf4ea88f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoIT.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class CeTaskInputDaoTest { +public class CeTaskInputDaoIT { private static final String A_UUID = "U1"; private static final String SOME_DATA = "this_is_a_report"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoIT.java index 8ae72104f1b..16ba965c87e 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoIT.java @@ -33,7 +33,7 @@ import org.sonar.db.user.UserDto; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; import static org.assertj.core.api.Assertions.assertThat; -public class CeTaskMessageDaoTest { +public class CeTaskMessageDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java index 1b4b6384d76..20a7112c2a0 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.tuple; -public class AnalysisPropertiesDaoTest { +public class AnalysisPropertiesDaoIT { private static final long NOW = 1_000L; @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoIT.java index fcd3877b6e3..deef40f73ca 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoIT.java @@ -31,7 +31,7 @@ import org.sonar.db.project.ProjectDto; import static org.assertj.core.api.Assertions.assertThat; -public class ApplicationProjectsDaoTest { +public class ApplicationProjectsDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoIT.java index 3156edc6e91..4d4fefa5a99 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoIT.java @@ -55,7 +55,7 @@ import static org.sonar.db.component.BranchType.BRANCH; import static org.sonar.db.component.BranchType.PULL_REQUEST; @RunWith(DataProviderRunner.class) -public class BranchDaoTest { +public class BranchDaoIT { private static final long NOW = 1_000L; private static final String SELECT_FROM = "select project_uuid as \"projectUuid\", uuid as \"uuid\", branch_type as \"branchType\", " + diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoIT.java index de315a06e37..5bb1d10d941 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoIT.java @@ -98,7 +98,7 @@ import static org.sonar.db.component.ComponentTreeQuery.Strategy.CHILDREN; import static org.sonar.db.component.ComponentTreeQuery.Strategy.LEAVES; @RunWith(DataProviderRunner.class) -public class ComponentDaoTest { +public class ComponentDaoIT { private static final String PROJECT_UUID = "project-uuid"; private static final String DIR_UUID = "dir-uuid"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoIT.java index 5e2282d61ec..8e62ecd2c12 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoIT.java @@ -45,7 +45,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory; import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; -public class ComponentKeyUpdaterDaoTest { +public class ComponentKeyUpdaterDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java index edcf436aa74..c68af53a84a 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java @@ -30,7 +30,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -public class ProjectLinkDaoTest { +public class ProjectLinkDaoIT { private final static long PAST = 5_000_000_000L; private final static long NOW = 10_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoIT.java index 3f99ac188aa..dd78e925e26 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoIT.java @@ -44,7 +44,7 @@ import static org.sonar.api.resources.Qualifiers.FILE; import static org.sonar.api.resources.Qualifiers.UNIT_TEST_FILE; @RunWith(DataProviderRunner.class) -public class ScrollForFileMoveComponentDaoTest { +public class ScrollForFileMoveComponentDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoIT.java index 04b691f84d2..32bce485471 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoIT.java @@ -62,7 +62,7 @@ import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.DESC; import static org.sonar.db.component.SnapshotTesting.newAnalysis; @RunWith(DataProviderRunner.class) -public class SnapshotDaoTest { +public class SnapshotDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java index 3d9b6f1c6b3..01863e2a177 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java @@ -39,7 +39,7 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.tuple; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; -public class DuplicationDaoTest { +public class DuplicationDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoIT.java index e86fe635cad..19c7d13d868 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoIT.java @@ -32,7 +32,7 @@ import org.sonar.db.DbTester; import static org.assertj.core.api.Assertions.assertThat; -public class EsQueueDaoTest { +public class EsQueueDaoIT { private static final int LIMIT = 10; private static TestSystem2 system2 = new TestSystem2().setNow(1_000); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoIT.java index 97a521409b5..d04b464275b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoIT.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.tuple; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class EventComponentChangeDaoTest { +public class EventComponentChangeDaoIT { private static Random random = new Random(); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoIT.java index bd7c9d11b93..54c25b4275f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoIT.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.component.SnapshotTesting.newAnalysis; import static org.sonar.db.event.EventTesting.newEvent; -public class EventDaoTest { +public class EventDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoIT.java index c6c44f4a11e..10c5d6025d6 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoIT.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.tuple; import static org.sonar.db.issue.IssueChangeDto.TYPE_COMMENT; import static org.sonar.db.issue.IssueChangeDto.TYPE_FIELD_CHANGE; -public class IssueChangeDaoTest { +public class IssueChangeDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperIT.java index ea3950ff0de..c97df108c1e 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperIT.java @@ -29,7 +29,7 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -public class IssueChangeMapperTest { +public class IssueChangeMapperIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoIT.java index c39707eefb2..c83cf5a4850 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoIT.java @@ -59,7 +59,7 @@ import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.issue.IssueTesting.newCodeReferenceIssue; import static org.sonar.db.protobuf.DbIssues.MessageFormattingType.CODE; -public class IssueDaoTest { +public class IssueDaoIT { private static final String PROJECT_UUID = "prj_uuid"; private static final String PROJECT_KEY = "prj_key"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperIT.java index a510974eb30..40af62b9d7a 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperIT.java @@ -55,7 +55,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; @RunWith(DataProviderRunner.class) -public class IssueMapperTest { +public class IssueMapperIT { private static final long NO_FILTERING_ON_CLOSE_DATE = 1L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoIT.java index dfb0e1a1408..2e00f7b1749 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoIT.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ProjectMappingsDaoTest { +public class ProjectMappingsDaoIT { private static final String EMPTY_STRING = ""; private static final String A_KEY_TYPE = "a_key_type"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoIT.java index 89e34ffd984..f63a7f5ef1f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoIT.java @@ -51,7 +51,7 @@ import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; import static org.sonar.db.measure.MeasureTesting.newLiveMeasure; -public class LiveMeasureDaoTest { +public class LiveMeasureDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java index 735a87dd092..27264295e4c 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java @@ -41,7 +41,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory; import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.SnapshotTesting.newAnalysis; -public class MeasureDaoTest { +public class MeasureDaoIT { private MetricDto coverage; private MetricDto complexity; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorIT.java index 460046ae197..b91b833a53b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorIT.java @@ -51,7 +51,7 @@ import static org.sonar.db.component.ComponentDbTester.defaults; import static org.sonar.db.component.ComponentDbTester.toProjectDto; import static org.sonar.db.component.SnapshotTesting.newAnalysis; -public class ProjectMeasuresIndexerIteratorTest { +public class ProjectMeasuresIndexerIteratorIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoIT.java index b8da7e7bc35..2a76e99b470 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoIT.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.within; import static org.sonar.db.metric.MetricTesting.newMetricDto; -public class MetricDaoTest { +public class MetricDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoIT.java index 34ba49f71fa..67d036a94e3 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoIT.java @@ -39,7 +39,7 @@ import static org.sonar.db.newcodeperiod.NewCodePeriodType.PREVIOUS_VERSION; import static org.sonar.db.newcodeperiod.NewCodePeriodType.REFERENCE_BRANCH; import static org.sonar.db.newcodeperiod.NewCodePeriodType.SPECIFIC_ANALYSIS; -public class NewCodePeriodDaoTest { +public class NewCodePeriodDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoIT.java index 6e4100d9c32..2d0dd6e4a81 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoIT.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.db.notification.NotificationQueueDto.toNotificationQueueDto; -public class NotificationQueueDaoTest { +public class NotificationQueueDaoIT { private final System2 system2 = mock(System2.class); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoIT.java index 8e48101304e..311542da461 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoIT.java @@ -49,7 +49,7 @@ import static org.sonar.db.permission.GlobalPermission.ADMINISTER; import static org.sonar.db.permission.GlobalPermission.ADMINISTER_QUALITY_PROFILES; import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; -public class AuthorizationDaoTest { +public class AuthorizationDaoIT { private static final String PROJECT_UUID = "uuid"; private static final String MISSING_UUID = "unknown"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoIT.java index 00841b794f2..2063a054bf0 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoIT.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.tuple; import static org.sonar.api.security.DefaultGroups.ANYONE; import static org.sonar.db.permission.PermissionQuery.DEFAULT_PAGE_SIZE; -public class GroupPermissionDaoTest { +public class GroupPermissionDaoIT { private static final String ANYONE_UUID = "Anyone"; private static final String MISSING_UUID = "-1"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterIT.java index a275d977fd7..beeb8c3bce7 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterIT.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.sonar.api.web.UserRole.ADMIN; -public class GroupPermissionDaoWithPersisterTest { +public class GroupPermissionDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoIT.java index 8b5214bb9d7..49d04dd3292 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoIT.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.tuple; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; import static org.sonar.db.permission.PermissionQuery.DEFAULT_PAGE_SIZE; -public class UserPermissionDaoTest { +public class UserPermissionDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterIT.java index fd836f3e8a5..f44eecfc994 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterIT.java @@ -43,7 +43,7 @@ import static org.sonar.db.permission.GlobalPermission.ADMINISTER; import static org.sonar.db.permission.GlobalPermission.SCAN; import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto; -public class UserPermissionDaoWithPersisterTest { +public class UserPermissionDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoIT.java index 0dfdd76264a..397b1a6f1d8 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoIT.java @@ -41,7 +41,7 @@ import static org.sonar.db.permission.PermissionQuery.DEFAULT_PAGE_SIZE; import static org.sonar.db.permission.PermissionQuery.builder; import static org.sonar.db.user.GroupTesting.newGroupDto; -public class GroupWithPermissionTemplateDaoTest { +public class GroupWithPermissionTemplateDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoIT.java index 0eac924423b..07ae32be964 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoIT.java @@ -36,7 +36,7 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -public class PermissionTemplateCharacteristicDaoTest { +public class PermissionTemplateCharacteristicDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); private final DbSession dbSession = db.getSession(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterIT.java index c01083ed34f..8c7832d094f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterIT.java @@ -34,7 +34,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class PermissionTemplateCharacteristicDaoWithPersisterTest { +public class PermissionTemplateCharacteristicDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoIT.java index c863316939e..7e0f8c28c0d 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoIT.java @@ -44,7 +44,7 @@ import static org.mockito.Mockito.when; import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto; import static org.sonar.db.user.GroupTesting.newGroupDto; -public class PermissionTemplateDaoTest { +public class PermissionTemplateDaoIT { private static final Date PAST = new Date(100_000_000_000L); private static final Date NOW = new Date(500_000_000_000L); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterIT.java index ee7e61f7f10..58301ef14c8 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterIT.java @@ -40,7 +40,7 @@ import static org.sonar.api.web.UserRole.ADMIN; import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto; import static org.sonar.db.user.GroupTesting.newGroupDto; -public class PermissionTemplateDaoWithPersisterTest { +public class PermissionTemplateDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); private static final Date PAST = new Date(100_000_000_000L); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoIT.java index 639cc9f1c4f..2e8a8de9722 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoIT.java @@ -40,7 +40,7 @@ import static org.sonar.api.web.UserRole.USER; import static org.sonar.db.permission.PermissionQuery.DEFAULT_PAGE_SIZE; import static org.sonar.db.permission.PermissionQuery.builder; -public class UserWithPermissionTemplateDaoTest { +public class UserWithPermissionTemplateDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoIT.java index d9e9f53616d..1851f6f1dc0 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoIT.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.plugin.PluginDto.Type.BUNDLED; import static org.sonar.db.plugin.PluginDto.Type.EXTERNAL; -public class PluginDaoTest { +public class PluginDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterIT.java index e5251b464a7..72179fd83e8 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterIT.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.sonar.db.plugin.PluginDto.Type.EXTERNAL; -public class PluginDaoWithPersisterTest { +public class PluginDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoIT.java index e8494423f86..f56ffabb3af 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoIT.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class PortfolioDaoTest { +public class PortfolioDaoIT { private final System2 system2 = new AlwaysIncreasingSystem2(1L, 1); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoIT.java index cc6665d7683..e4a075b6fc8 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoIT.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -public class ProjectBadgeTokenDaoTest { +public class ProjectBadgeTokenDaoIT { private final System2 system2 = new TestSystem2().setNow(1000L); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java index 51476f1449f..7364e759ef6 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoIT.java @@ -56,7 +56,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.sonar.api.measures.CoreMetrics.NCLOC_LANGUAGE_DISTRIBUTION_KEY; import static org.sonar.api.measures.Metric.ValueType.STRING; -public class ProjectDaoTest { +public class ProjectDaoIT { private final System2 system2 = new AlwaysIncreasingSystem2(1000L); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoIT.java index 5b538b68809..3bbdc0cfeed 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoIT.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class InternalComponentPropertiesDaoTest { +public class InternalComponentPropertiesDaoIT { private static final String SOME_KEY = "key1"; private static final String SOME_COMPONENT = "component1"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoIT.java index b325573604d..38899d988ee 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoIT.java @@ -64,7 +64,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -public class InternalPropertiesDaoTest { +public class InternalPropertiesDaoIT { private static final String EMPTY_STRING = ""; private static final String A_KEY = "a_key"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java index a6af409a481..92c40330142 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java @@ -68,7 +68,7 @@ import static org.sonar.db.property.PropertyTesting.newPropertyDto; import static org.sonar.db.property.PropertyTesting.newUserPropertyDto; @RunWith(DataProviderRunner.class) -public class PropertiesDaoTest { +public class PropertiesDaoIT { private static final String VALUE_SIZE_4000 = String.format("%1$4000.4000s", "*"); private static final String VALUE_SIZE_4001 = VALUE_SIZE_4000 + "P"; private static final long INITIAL_DATE = 1_444_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java index 333a15229a1..9f053f4bd57 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java @@ -47,7 +47,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; @RunWith(DataProviderRunner.class) -public class PropertiesDaoWithPersisterTest { +public class PropertiesDaoWithPersisterIT { private static final String KEY = "key"; private static final String ANOTHER_KEY = "another_key"; private static final String PROJECT_KEY = "project_key"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsIT.java index a44fabfd009..8c3a909e2ee 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsIT.java @@ -70,7 +70,7 @@ import static org.sonar.db.component.SnapshotDto.STATUS_UNPROCESSED; import static org.sonar.db.issue.IssueTesting.newCodeReferenceIssue; @RunWith(DataProviderRunner.class) -public class PurgeCommandsTest { +public class PurgeCommandsIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java index f9c3fc6cc32..0d35792599b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java @@ -112,7 +112,7 @@ import static org.sonar.db.issue.IssueTesting.newCodeReferenceIssue; import static org.sonar.db.webhook.WebhookDeliveryTesting.newDto; import static org.sonar.db.webhook.WebhookDeliveryTesting.selectAllDeliveryUuids; -public class PurgeDaoTest { +public class PurgeDaoIT { private static final String PROJECT_UUID = "P1"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditIT.java index d984a71d611..38f2dabd388 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditIT.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @RunWith(MockitoJUnitRunner.class) -public class PurgeDaoWithAuditTest { +public class PurgeDaoWithAuditIT { private final System2 system2 = mock(System2.class); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperIT.java index 5a0d001d588..848ac72b82e 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperIT.java @@ -32,7 +32,7 @@ import org.sonar.db.component.ComponentTesting; import static org.assertj.core.api.Assertions.assertThat; -public class PurgeMapperTest { +public class PurgeMapperIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoIT.java index 54df172590e..03a1cde80cb 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoIT.java @@ -31,7 +31,7 @@ import org.sonar.db.DbTester; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; -public class PushEventDaoTest { +public class PushEventDaoIT { private final TestSystem2 system2 = new TestSystem2().setNow(1L); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoIT.java index d03b6c59e3a..3fc1a4c6346 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoIT.java @@ -31,7 +31,7 @@ import org.sonar.db.project.ProjectDto; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; -public class ProjectQgateAssociationDaoTest { +public class ProjectQgateAssociationDaoIT { @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoIT.java index 24e7104aea6..6a46ce044d4 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoIT.java @@ -34,7 +34,7 @@ import org.sonar.db.metric.MetricDto; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; import static org.assertj.core.api.Assertions.assertThat; -public class QualityGateConditionDaoTest { +public class QualityGateConditionDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoIT.java index 73f0b6db08d..1dd49a244d1 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoIT.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.qualitygate.QualityGateFindingDto.PERCENT_VALUE_TYPE; import static org.sonar.db.qualitygate.QualityGateFindingDto.RATING_VALUE_TYPE; -public class QualityGateDaoTest { +public class QualityGateDaoIT { @Rule public final DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoIT.java index 0e00895f97e..b6a160e48b7 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoIT.java @@ -46,7 +46,7 @@ import static org.sonar.db.user.SearchPermissionQuery.ANY; import static org.sonar.db.user.SearchPermissionQuery.IN; import static org.sonar.db.user.SearchPermissionQuery.OUT; -public class QualityGateGroupPermissionsDaoTest { +public class QualityGateGroupPermissionsDaoIT { private final AuditPersister auditPersister = mock(AuditPersister.class); private final ArgumentCaptor newValueCaptor = ArgumentCaptor.forClass(GroupEditorNewValue.class); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoIT.java index ee22bd271f1..beea1928ad2 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoIT.java @@ -42,7 +42,7 @@ import static org.sonar.db.user.SearchPermissionQuery.ANY; import static org.sonar.db.user.SearchPermissionQuery.IN; import static org.sonar.db.user.SearchPermissionQuery.OUT; -public class QualityGateUserPermissionsDaoTest { +public class QualityGateUserPermissionsDaoIT { private final AuditPersister auditPersister = mock(AuditPersister.class); private final ArgumentCaptor newValueCaptor = ArgumentCaptor.forClass(UserEditorNewValue.class); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoIT.java index 3d908f56522..5af54de947d 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoIT.java @@ -54,7 +54,7 @@ import static org.sonar.db.qualityprofile.ActiveRuleDto.INHERITED; import static org.sonar.db.qualityprofile.ActiveRuleDto.OVERRIDES; import static org.sonar.db.qualityprofile.ActiveRuleDto.createFor; -public class ActiveRuleDaoTest { +public class ActiveRuleDaoIT { private static final long NOW = 10_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoIT.java index 6be546eae50..e7428304b37 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoIT.java @@ -31,7 +31,7 @@ import org.sonar.db.DbTester; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -public class DefaultQProfileDaoTest { +public class DefaultQProfileDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoIT.java index e9429e9413b..0ab04ea2c51 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoIT.java @@ -35,7 +35,7 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; -public class QProfileChangeDaoTest { +public class QProfileChangeDaoIT { private System2 system2 = new AlwaysIncreasingSystem2(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoIT.java index 887c0b2fdf6..c61b1608162 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoIT.java @@ -47,7 +47,7 @@ import static org.sonar.db.qualityprofile.SearchQualityProfilePermissionQuery.IN import static org.sonar.db.qualityprofile.SearchQualityProfilePermissionQuery.OUT; import static org.sonar.db.qualityprofile.SearchQualityProfilePermissionQuery.builder; -public class QProfileEditGroupsDaoTest { +public class QProfileEditGroupsDaoIT { private static final long NOW = 10_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoIT.java index 615bc184d90..ddb126b479d 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoIT.java @@ -47,7 +47,7 @@ import static org.sonar.db.qualityprofile.SearchQualityProfilePermissionQuery.IN import static org.sonar.db.qualityprofile.SearchQualityProfilePermissionQuery.OUT; import static org.sonar.db.qualityprofile.SearchQualityProfilePermissionQuery.builder; -public class QProfileEditUsersDaoTest { +public class QProfileEditUsersDaoIT { private static final long NOW = 10_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoIT.java index fe56c743a37..228dc74c465 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoIT.java @@ -54,7 +54,7 @@ import static org.mockito.Mockito.when; import static org.sonar.db.qualityprofile.QualityProfileTesting.newQualityProfileDto; import static org.sonar.db.qualityprofile.QualityProfileTesting.newRuleProfileDto; -public class QualityProfileDaoTest { +public class QualityProfileDaoIT { private final System2 system = mock(System2.class); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoIT.java index fa3ffb89e8d..22fdbeb3a0b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoIT.java @@ -40,7 +40,7 @@ import org.sonar.db.rule.RuleParamDto; import static org.assertj.core.api.Assertions.assertThat; -public class QualityProfileExportDaoTest { +public class QualityProfileExportDaoIT { @Rule public DbTester db = DbTester.create(new AlwaysIncreasingSystem2()); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java index 25c23e412ec..c32e3821f9d 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.issue.Issue.RESOLUTION_WONT_FIX; import static org.sonar.db.component.ComponentTesting.newFileDto; -public class RegulatoryReportDaoTest { +public class RegulatoryReportDaoIT { private static final String PROJECT_UUID = "prj_uuid"; private static final String PROJECT_KEY = "prj_key"; private static final String FILE_UUID = "file_uuid"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoIT.java index 202f2b9d348..498680a1873 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoIT.java @@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.tuple; import static org.sonar.api.rule.RuleStatus.REMOVED; -public class RuleDaoTest { +public class RuleDaoIT { private static final String UNKNOWN_RULE_UUID = "unknown-uuid"; @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoIT.java index 015d10b65da..84042e8a822 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoIT.java @@ -36,7 +36,7 @@ import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -public class RuleRepositoryDaoTest { +public class RuleRepositoryDaoIT { private System2 system2 = new AlwaysIncreasingSystem2(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoIT.java index a7f9ac456ac..d426ba04796 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoIT.java @@ -44,7 +44,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ScannerAnalysisCacheDaoTest { +public class ScannerAnalysisCacheDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); private final static UuidFactory uuidFactory = new SequenceUuidFactory(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoIT.java similarity index 98% rename from server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoIT.java index 79ebb810180..4a4c8fcda0f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoIT.java @@ -30,7 +30,7 @@ import org.sonar.db.DbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -public class SchemaMigrationDaoTest { +public class SchemaMigrationDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoIT.java index ba7983ef674..fb99c012799 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoIT.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Fail.fail; @RunWith(DataProviderRunner.class) -public class ScimUserDaoTest { +public class ScimUserDaoIT { @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoIT.java index 01398aec0c3..d0e4b71e970 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoIT.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.sonar.db.component.ComponentTesting.newFileDto; -public class FileSourceDaoTest { +public class FileSourceDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoIT.java index c525d956212..01cee91dfc3 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoIT.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.db.user.GroupTesting.newGroupDto; -public class GroupDaoTest { +public class GroupDaoIT { private static final long NOW = 1_500_000L; private static final String MISSING_UUID = "unknown"; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterIT.java index b2f57626db6..54bd5b1fefb 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterIT.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -public class GroupDaoWithPersisterTest { +public class GroupDaoWithPersisterIT { private static final long NOW = 1_500_000L; private final AuditPersister auditPersister = mock(AuditPersister.class); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoIT.java index 556375cae11..fd8a8f02bf1 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoIT.java @@ -34,7 +34,7 @@ import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.db.user.GroupMembershipQuery.OUT; import static org.sonar.db.user.GroupMembershipQuery.builder; -public class GroupMembershipDaoTest { +public class GroupMembershipDaoIT { @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoIT.java index 76380f5a695..105f2354c48 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoIT.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.sonar.db.permission.GlobalPermission.ADMINISTER; -public class RoleDaoTest { +public class RoleDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoIT.java index 3f8b4306760..133d33806e8 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoIT.java @@ -30,7 +30,7 @@ import org.sonar.db.DbTester; import static org.assertj.core.api.Assertions.assertThat; -public class SamlMessageIdDaoTest { +public class SamlMessageIdDaoIT { private static final long NOW = 1_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoIT.java index 2bd9058e6a3..0f5aaebe61c 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoIT.java @@ -30,7 +30,7 @@ import org.sonar.db.DbTester; import static org.assertj.core.api.Assertions.assertThat; -public class SessionTokensDaoTest { +public class SessionTokensDaoIT { private static final long NOW = 1_000_000_000L; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoIT.java index 42b4c5d494c..d9bb04089db 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoIT.java @@ -46,7 +46,7 @@ import static org.sonar.db.user.GroupTesting.newGroupDto; import static org.sonar.db.user.UserTesting.newUserDto; @RunWith(DataProviderRunner.class) -public class UserDaoTest { +public class UserDaoIT { private static final long NOW = 1_500_000_000_000L; private TestSystem2 system2 = new TestSystem2().setNow(NOW); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterIT.java index ad2465979bf..09dd9d2f3ac 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterIT.java @@ -41,7 +41,7 @@ import static org.sonar.db.user.GroupTesting.newGroupDto; import static org.sonar.db.user.UserTesting.newUserDto; @RunWith(DataProviderRunner.class) -public class UserDaoWithPersisterTest { +public class UserDaoWithPersisterIT { private static final long NOW = 1_500_000_000_000L; private final AuditPersister auditPersister = mock(AuditPersister.class); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoIT.java index 4ecac45783c..ca83c196ef5 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoIT.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; import static org.sonar.db.ce.CeTaskMessageType.SUGGEST_DEVELOPER_EDITION_UPGRADE; -public class UserDismissedMessagesDaoTest { +public class UserDismissedMessagesDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoIT.java index c954b23d96c..a537b80da48 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoIT.java @@ -28,7 +28,7 @@ import org.sonar.db.DbTester; import static org.assertj.core.api.Assertions.assertThat; -public class UserGroupDaoTest { +public class UserGroupDaoIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterIT.java index 37090565f33..12719144e9b 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterIT.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -public class UserGroupDaoWithPersisterTest { +public class UserGroupDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java index 01e1dc6485a..25d2489d049 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.user.UserTokenTesting.newProjectAnalysisToken; import static org.sonar.db.user.UserTokenTesting.newUserToken; -public class UserTokenDaoTest { +public class UserTokenDaoIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterIT.java index aa14810271b..b35215b4863 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterIT.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.sonar.db.user.UserTokenTesting.newUserToken; -public class UserTokenDaoWithPersisterTest { +public class UserTokenDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); private final ArgumentCaptor newValueCaptor = ArgumentCaptor.forClass(UserTokenNewValue.class); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoIT.java index be18630eba8..f269317fa82 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoIT.java @@ -33,7 +33,7 @@ import org.sonar.db.project.ProjectDto; import static org.assertj.core.api.Assertions.assertThat; -public class WebhookDaoTest { +public class WebhookDaoIT { @Rule public final DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterIT.java index f47cbb305b4..2a896fce3f0 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterIT.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -public class WebhookDaoWithPersisterTest { +public class WebhookDaoWithPersisterIT { private final AuditPersister auditPersister = mock(AuditPersister.class); @Rule diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoIT.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoTest.java rename to server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoIT.java index 6f6f0f9b772..84bb7cb39c9 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoTest.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoIT.java @@ -33,7 +33,7 @@ import static com.google.common.collect.ImmutableList.of; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.webhook.WebhookTesting.newProjectWebhook; -public class WebhookDeliveryDaoTest { +public class WebhookDeliveryDaoIT { private static final long NOW = 1_500_000_000L; private static final long BEFORE = NOW - 1_000L; diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml b/server/sonar-db-dao/src/it/resources/org/sonar/core/qualitymodel/DefaultModelFinderIT/shared.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/core/qualitymodel/DefaultModelFinderIT/shared.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date-result.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date-result.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoIT/update_authorization_date.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/shared.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/shared.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/shared.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/shared.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/should_select_issue_and_component_ids.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/should_select_issue_and_component_ids.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/should_select_non_closed_issues_by_module.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/should_select_non_closed_issues_by_module.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/should_select_non_closed_issues_by_module_on_removed_project.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoIT/should_select_non_closed_issues_by_module_on_removed_project.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueStatsDaoIT/should_select_assignees.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueStatsDaoIT/should_select_assignees.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/empty.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/empty.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/empty.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/empty.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/insert-result.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/insert-result.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/insert-result.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/insert-result.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/past_measures.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/past_measures.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/past_measures.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/past_measures.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/select_by_snapshot_and_metric_keys.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/select_by_snapshot_and_metric_keys.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/select_by_snapshot_and_metric_keys.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/select_by_snapshot_and_metric_keys.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/shared.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/shared.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/shared.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoIT/shared.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoIT/should_return_root_project_keys_for_anonymous.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoIT/should_return_root_project_keys_for_anonymous.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoIT/should_return_root_project_keys_for_group.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoIT/should_return_root_project_keys_for_group.xml diff --git a/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoIT/should_return_root_project_keys_for_user.xml similarity index 100% rename from server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml rename to server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoIT/should_return_root_project_keys_for_user.xml diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureTreeQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java similarity index 99% rename from server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureTreeQueryTest.java rename to server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java index 966f190cc9c..da9ed2361f4 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureTreeQueryTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java @@ -30,8 +30,7 @@ import static org.sonar.db.measure.MeasureTreeQuery.Strategy.CHILDREN; import static org.sonar.db.measure.MeasureTreeQuery.Strategy.LEAVES; public class MeasureTreeQueryTest { - - + @Test public void create_query() { MeasureTreeQuery query = MeasureTreeQuery.builder() -- 2.39.5