From ebece82669c46e8657d10407ee1d5dc957af3a6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?L=C3=A9o=20Geoffroy?= Date: Fri, 30 Jun 2023 11:42:57 +0200 Subject: [PATCH] SONAR-19558 Update rest of tests for other modules --- .../sonar/auth/github/GitHubSettingsTest.java | 2 +- .../sonar/auth/github/IntegrationTest.java | 2 +- .../auth/saml/SamlIdentityProviderIT.java | 2 +- .../auth/saml/SamlMessageIdCheckerIT.java | 2 +- .../org/sonar/ce/queue/CeQueueImplIT.java | 2 +- .../ce/task/log/CeTaskMessagesImplIT.java | 2 +- .../AnalysisCacheCleaningSchedulerImplIT.java | 2 +- .../ComputeEngineContainerImplIT.java | 2 +- .../ce/monitoring/CeDatabaseMBeanImplIT.java | 2 +- .../sonar/ce/queue/InternalCeQueueImplIT.java | 4 +- .../ce/queue/NextPendingTaskPickerIT.java | 2 +- .../ce/taskprocessor/CeWorkerImplIT.java | 2 +- .../db/component/AnalysisPropertiesDaoIT.java | 7 +- .../db/component/AnalysisPropertiesMapper.xml | 2 +- .../webhook/AsynchronousWebHooksImplIT.java | 9 +- .../server/plugins/DetectPluginChangeIT.java | 2 +- .../server/rule/CachingRuleFinderIT.java | 2 +- .../plugins/PluginConsentVerifierTest.java | 2 +- .../project/ProjectDefaultVisibilityTest.java | 2 +- .../server/platform/PersistentSettingsIT.java | 2 +- .../platform/StartupMetadataPersisterIT.java | 2 +- .../platform/serverid/ServerIdManagerIT.java | 2 +- .../server/startup/RegisterMetricsIT.java | 2 +- .../server/startup/RegisterPluginsIT.java | 2 +- .../startup/UpgradeSuggestionsCleanerIT.java | 2 +- .../WebhookQGChangeEventListenerIT.java | 9 +- .../index/AsyncIssueIndexingImplTest.java | 2 +- .../CheckAnyonePermissionsAtStartupTest.java | 7 +- ...ckLanguageSpecificParamsAtStartupTest.java | 2 +- .../AlmConfigurationSectionTest.java | 2 +- .../monitoring/DbConnectionSectionIT.java | 2 +- .../monitoring/SettingsSectionTest.java | 2 +- .../ProjectsInWarningDaemonTest.java | 18 +-- .../sonar/server/rule/RegisterRulesTest.java | 2 +- .../RegisterPermissionTemplatesTest.java | 2 +- .../TelemetryDataLoaderImplTest.java | 134 +++++++++--------- .../index/ComponentIndexSearchTest.java | 64 +++++---- .../sonar/server/es/RecoveryIndexerTest.java | 2 +- .../IssueIndexSyncProgressCheckerTest.java | 81 +++++------ .../issue/index/IssueIndexTestCommon.java | 2 +- .../issue/index/IssueQueryFactoryTest.java | 70 +++++---- ...PushEventsPurgeSchedulerAndExecutorIT.java | 2 +- .../HotspotChangeEventServiceImplTest.java | 2 +- ...lityProfileChangeEventServiceImplTest.java | 52 +++---- .../polling/PushEventPollSchedulerTest.java | 2 +- .../sonar/server/ce/ws/ActivityActionIT.java | 2 +- .../web/SonarLintConnectionFilterIT.java | 2 +- 47 files changed, 278 insertions(+), 249 deletions(-) diff --git a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java index 5edd93d982c..c2ddf5cf2cd 100644 --- a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java +++ b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; public class GitHubSettingsTest { @Rule - public DbTester db = DbTester.create(System2.INSTANCE); + public DbTester db = DbTester.create(System2.INSTANCE, true); private MapSettings settings = new MapSettings(new PropertyDefinitions(System2.INSTANCE, GitHubSettings.definitions())); private InternalProperties internalProperties = mock(InternalProperties.class); diff --git a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java index f7ba8e35dd7..ef39a34c06d 100644 --- a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java +++ b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java @@ -59,7 +59,7 @@ public class IntegrationTest { public MockWebServer github = new MockWebServer(); @Rule - public DbTester db = DbTester.create(System2.INSTANCE); + public DbTester db = DbTester.create(System2.INSTANCE, true); // load settings with default values private MapSettings settings = new MapSettings(new PropertyDefinitions(System2.INSTANCE, GitHubSettings.definitions())); diff --git a/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlIdentityProviderIT.java b/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlIdentityProviderIT.java index ea83ab6ad49..4318530e2b8 100644 --- a/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlIdentityProviderIT.java +++ b/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlIdentityProviderIT.java @@ -68,7 +68,7 @@ public class SamlIdentityProviderIT { private static final String SP_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDSFoT371C0/klZuPgvKbGItkmTaf5CweNXL8u389d98aOXRpDQ7maTXdV/W+VcL8vUWg8yG6nn8CRwweYnGTNdn9UAdhgknvxQe3pq3EwOJyls4Fpiq6YTh+DQfiZUQizjFjDOr/GG5O2lNvTRkI4XZj/XnWjRqVZwttiA5tm1sKkvGdyOQljwn4Jja/VbITdV8GASumx66Bil/wamSsqIzm2RjsOOGSsf5VjYUPwDobpuSf+j4DLtWjem/9vIzI2wcE30uC8LBAgO3JAlIS9NQrchjS9xhMJRohOoitaSPmqsOy7D2BH0h7XX6TNgv/WYTkBY4eZPao3PsL2A6AmhAgMBAAECggEBAJj11HJAR96/leBBkFGmZaBIOGGgNoOcb023evfADhGgsZ8evamhKgX5t8w2uFPaaOl/eLje82Hvslh2lH+7FW8BRDBFy2Y+ay6d+I99PdLAKKUg5C4bE5v8vm6OqpGGbPAZ5AdYit3QKEa2MKG0QgA/bhQqg3rDdDA0sIWJjtF9MLv7LI7Tm0qgiHOKsI0MEBFk+ZoibgKWYh/dnfGDRWyC3Puqe13rdSheNJYUDR/0QMkd/EJNpLWv06uk+w8w2lU4RgN6TiV76ZZUIGZAAHFgMELJysgtBTCkOQY5roPu17OmMZjKfxngeIfNyd42q3/T6DmUbbwNYfP2HRMoiMECgYEA6SVc1mZ4ykytC9M61rZwT+2zXtJKudQVa0qpTtkf0aznRmnDOuc1bL7ewKIIIp9r5HKVteO6SKgpHmrP+qmvbwZ0Pz51Zg0MetoSmT9m0599/tOU2k6OI09dvQ4Xa3ccN5Czl61Q/HkMeAIDny8MrhGVBwhallE4J4fm/OjuVK0CgYEA5q6IVgqZtfcV1azIF6uOFt6blfn142zrwq0fF39jog2f+4jXaBKw6L4aP0HvIL83UArGppYY31894bLb6YL4EjS2JNbABM2VnJpJd4oGopOE42GCZlZRpf751zOptYAN23NFSujLlfaUfMbyrqIbRFC2DCdzNTU50GT5SAXX80UCgYEAlyvQvHwJCjMZaTd3SU1WGZ1o1qzIIyHvGXh5u1Rxm0TfWPquyfys2WwRhxoI6FoyXRgnFp8oZIAU2VIstL1dsUGgEnnvKVKAqw/HS3Keu80IpziNpdeVtjN59mGysc2zkBvVNx38Cxh6Cz5TFt4s/JkN5ld2VU0oeglWrtph3qkCgYALszZ/BrKdJBcba1QKv0zJpCjIBpGOI2whx54YFwH6qi4/F8W1JZ2LcHjsVG/IfWpUyPciY+KHEdGVrPiyc04Zvkquu6WpmLPJ6ZloUrvbaxgGYF+4yRADF1ecrqYg6onJY6NUFVKeHI+TdJPCf75aTK2vGCEjxbtU8ooiOQmm8QKBgEGe9ZdrwTP9rMQ35jYtzU+dT06k1r9BE9Q8CmrXl0HwK717ZWboX4J0YoFjxZC8PDsMl3p46MJ83rKbLU728uKig1AkZo7/OedxTWvezjZ1+lDyjC2EguXbgY1ecSC2HbJh9g+v8RUuhWxuA7RYoW92xVtKj+6l4vMadVP4Myp8-----END PRIVATE KEY-----"; @Rule - public DbTester db = DbTester.create(); + public DbTester db = DbTester.create(true); @Rule public LogTester log = new LogTester(); diff --git a/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlMessageIdCheckerIT.java b/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlMessageIdCheckerIT.java index 517269fe80a..59c759fe877 100644 --- a/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlMessageIdCheckerIT.java +++ b/server/sonar-auth-saml/src/it/java/org/sonar/auth/saml/SamlMessageIdCheckerIT.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.when; public class SamlMessageIdCheckerIT { @Rule - public DbTester db = DbTester.create(); + public DbTester db = DbTester.create(true); private DbSession dbSession = db.getSession(); diff --git a/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java b/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java index 32f62b39957..6f2d78562db 100644 --- a/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java +++ b/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java @@ -70,7 +70,7 @@ public class CeQueueImplIT { private System2 system2 = new TestSystem2().setNow(NOW); @Rule - public DbTester db = DbTester.create(system2); + public DbTester db = DbTester.create(system2, true); private DbSession session = db.getSession(); diff --git a/server/sonar-ce-task/src/it/java/org/sonar/ce/task/log/CeTaskMessagesImplIT.java b/server/sonar-ce-task/src/it/java/org/sonar/ce/task/log/CeTaskMessagesImplIT.java index aab0384acf5..22ad11a1512 100644 --- a/server/sonar-ce-task/src/it/java/org/sonar/ce/task/log/CeTaskMessagesImplIT.java +++ b/server/sonar-ce-task/src/it/java/org/sonar/ce/task/log/CeTaskMessagesImplIT.java @@ -48,7 +48,7 @@ import static org.mockito.Mockito.when; public class CeTaskMessagesImplIT { @Rule - public DbTester dbTester = DbTester.create(System2.INSTANCE); + public DbTester dbTester = DbTester.create(System2.INSTANCE, true); private DbClient dbClient = dbTester.getDbClient(); private UuidFactory uuidFactory = mock(UuidFactory.class); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java index fe6683c7753..2b049fe59fe 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java @@ -47,7 +47,7 @@ public class AnalysisCacheCleaningSchedulerImplIT { private System2 system2 = mock(System2.class); private final static UuidFactory uuidFactory = new SequenceUuidFactory(); @Rule - public DbTester dbTester = DbTester.create(system2); + public DbTester dbTester = DbTester.create(system2, true); private DbSession dbSession = dbTester.getSession(); private ScannerAnalysisCacheDao scannerAnalysisCacheDao = dbTester.getDbClient().scannerAnalysisCacheDao(); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/container/ComputeEngineContainerImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/container/ComputeEngineContainerImplIT.java index 8a57a3f413a..529c1478a45 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/container/ComputeEngineContainerImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/container/ComputeEngineContainerImplIT.java @@ -62,7 +62,7 @@ public class ComputeEngineContainerImplIT { public TemporaryFolder tempFolder = new TemporaryFolder(); @Rule - public DbTester db = DbTester.create(System2.INSTANCE); + public DbTester db = DbTester.create(System2.INSTANCE, true); private final ServiceLoaderWrapper serviceLoaderWrapper = mock(ServiceLoaderWrapper.class); private final ProcessProperties processProperties = new ProcessProperties(serviceLoaderWrapper); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/monitoring/CeDatabaseMBeanImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/monitoring/CeDatabaseMBeanImplIT.java index 8f43bd9b081..5d1e6df57bb 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/monitoring/CeDatabaseMBeanImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/monitoring/CeDatabaseMBeanImplIT.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class CeDatabaseMBeanImplIT { @Rule - public DbTester dbTester = DbTester.create(System2.INSTANCE); + public DbTester dbTester = DbTester.create(System2.INSTANCE, true); private final CeDatabaseMBeanImpl underTest = new CeDatabaseMBeanImpl(dbTester.getDbClient()); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java index 3eb49dbfde1..a5e7cc459ee 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/queue/InternalCeQueueImplIT.java @@ -76,7 +76,7 @@ public class InternalCeQueueImplIT { private final System2 system2 = new AlwaysIncreasingSystem2(); @Rule - public DbTester db = DbTester.create(system2); + public DbTester db = DbTester.create(system2, true); private final DbSession session = db.getSession(); private final UuidFactory uuidFactory = UuidFactoryImpl.INSTANCE; @@ -376,7 +376,7 @@ public class InternalCeQueueImplIT { assertThat(peek.get().getUuid()).isEqualTo(task.getUuid()); assertThat(peek.get().getType()).isEqualTo(CeTaskTypes.REPORT); assertThat(peek.get().getComponent()).contains(new CeTask.Component(mainBranchComponent.uuid(), mainBranchComponent.getKey(), mainBranchComponent.name())); - assertThat(peek.get().getEntity()).contains(peek.get().getComponent().get()); + assertThat(peek.get().getEntity()).contains(new CeTask.Component(projectData.getProjectDto().getUuid(), projectData.getProjectDto().getKey(), projectData.getProjectDto().getName())); // no more pending tasks peek = underTest.peek(WORKER_UUID_2, true); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/queue/NextPendingTaskPickerIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/queue/NextPendingTaskPickerIT.java index e4cda8dc5e1..4b90610038d 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/queue/NextPendingTaskPickerIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/queue/NextPendingTaskPickerIT.java @@ -58,7 +58,7 @@ public class NextPendingTaskPickerIT { private NextPendingTaskPicker underTest; @Rule - public DbTester db = DbTester.create(alwaysIncreasingSystem2); + public DbTester db = DbTester.create(alwaysIncreasingSystem2, true); @Before public void before() { diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java index 1fbc8fd3a47..5081a7e27d1 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java @@ -85,7 +85,7 @@ public class CeWorkerImplIT { @Rule public LogTester logTester = new LogTester(); @Rule - public DbTester db = DbTester.create(system2); + public DbTester db = DbTester.create(system2, true); private DbSession session = db.getSession(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java index b82888d7c64..f76141792cb 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoIT.java @@ -161,7 +161,7 @@ public class AnalysisPropertiesDaoIT { String analysisUuid = randomAlphanumeric(40); List propertyDtos = Arrays.asList( - newAnalysisPropertyDto(random.nextInt(10), "key1",analysisUuid), + newAnalysisPropertyDto(random.nextInt(10), "key1", analysisUuid), newAnalysisPropertyDto(random.nextInt(10), "key2", analysisUuid), newAnalysisPropertyDto(random.nextInt(10), "key3", analysisUuid) ); @@ -182,7 +182,8 @@ public class AnalysisPropertiesDaoIT { final String analysisPropertyKey = "key"; for (int i = 0; i < 7; i++) { String uuid = "uuid" + i; - ProjectDto project = dbTester.components().insertPrivateProject(p -> p.setUuid(uuid).setBranchUuid(uuid)).getProjectDto(); + ProjectDto project = dbTester.components().insertPrivateProject(c -> { + }, p -> p.setUuid(uuid)).getProjectDto(); dbTester.components().insertSnapshot(project, s -> s.setLast(true).setUuid(uuid)); // branches shouldn't be taken into account dbTester.components().insertProjectBranch(project); @@ -206,7 +207,7 @@ public class AnalysisPropertiesDaoIT { tuple("uuid3", "undetected"), tuple("uuid4", "git"), tuple("uuid5", "git") - ); + ); } private AnalysisPropertyDto insertAnalysisPropertyDto(int valueLength) { diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml index b356165dcd1..d085e0fd203 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml @@ -33,7 +33,7 @@