diff options
| author | Lukasz Jarocki <lukasz.jarocki@sonarsource.com> | 2023-06-27 10:24:50 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2023-06-29 20:05:14 +0000 |
| commit | e999afdefa1060a504bde0889b969b88c18eca25 (patch) | |
| tree | 276e15aba0313d0bcfd185db70b6f0fd8f7b03f8 /server/sonar-ce | |
| parent | 114a4deec2e278438cb9db6666b9bc8dfc46ab2c (diff) | |
| download | sonarqube-e999afdefa1060a504bde0889b969b88c18eca25.tar.gz sonarqube-e999afdefa1060a504bde0889b969b88c18eca25.zip | |
SONAR-19558 enabled snapshots to correctly use project/branch uuid
Diffstat (limited to 'server/sonar-ce')
| -rw-r--r-- | server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java | 18 |
1 files changed, 9 insertions, 9 deletions
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 8aa991e6f11..fe6683c7753 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 @@ -66,32 +66,32 @@ public class AnalysisCacheCleaningSchedulerImplIT { var snapshotDao = dbTester.getDbClient().snapshotDao(); var snapshot1 = createSnapshot(LocalDateTime.now().minusDays(1).toInstant(ZoneOffset.UTC).toEpochMilli()); snapshotDao.insert(dbSession, snapshot1); - scannerAnalysisCacheDao.insert(dbSession, snapshot1.getComponentUuid(), new ByteArrayInputStream("data".getBytes())); + scannerAnalysisCacheDao.insert(dbSession, snapshot1.getRootComponentUuid(), new ByteArrayInputStream("data".getBytes())); var snapshot2 = createSnapshot(LocalDateTime.now().minusDays(6).toInstant(ZoneOffset.UTC).toEpochMilli()); snapshotDao.insert(dbSession, snapshot2); - scannerAnalysisCacheDao.insert(dbSession, snapshot2.getComponentUuid(), new ByteArrayInputStream("data".getBytes())); + scannerAnalysisCacheDao.insert(dbSession, snapshot2.getRootComponentUuid(), new ByteArrayInputStream("data".getBytes())); var snapshot3 = createSnapshot(LocalDateTime.now().minusDays(8).toInstant(ZoneOffset.UTC).toEpochMilli()); snapshotDao.insert(dbSession, snapshot3); - scannerAnalysisCacheDao.insert(dbSession, snapshot3.getComponentUuid(), new ByteArrayInputStream("data".getBytes())); + scannerAnalysisCacheDao.insert(dbSession, snapshot3.getRootComponentUuid(), new ByteArrayInputStream("data".getBytes())); var snapshot4 = createSnapshot(LocalDateTime.now().minusDays(30).toInstant(ZoneOffset.UTC).toEpochMilli()); snapshotDao.insert(dbSession, snapshot4); - scannerAnalysisCacheDao.insert(dbSession, snapshot4.getComponentUuid(), new ByteArrayInputStream("data".getBytes())); + scannerAnalysisCacheDao.insert(dbSession, snapshot4.getRootComponentUuid(), new ByteArrayInputStream("data".getBytes())); assertThat(dbTester.countRowsOfTable("scanner_analysis_cache")).isEqualTo(4); underTest.clean(); assertThat(dbTester.countRowsOfTable("scanner_analysis_cache")).isEqualTo(2); - assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot1.getComponentUuid())).isNotNull(); - assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot2.getComponentUuid())).isNotNull(); - assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot3.getComponentUuid())).isNull(); - assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot4.getComponentUuid())).isNull(); + assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot1.getRootComponentUuid())).isNotNull(); + assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot2.getRootComponentUuid())).isNotNull(); + assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot3.getRootComponentUuid())).isNull(); + assertThat(scannerAnalysisCacheDao.selectData(dbSession, snapshot4.getRootComponentUuid())).isNull(); } private static SnapshotDto createSnapshot(long buildtime) { return new SnapshotDto() .setUuid(uuidFactory.create()) - .setComponentUuid(uuidFactory.create()) + .setRootComponentUuid(uuidFactory.create()) .setStatus("P") .setLast(true) .setProjectVersion("2.1-SNAPSHOT") |