diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2022-09-20 11:59:16 -0500 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2022-10-12 20:03:43 +0000 |
| commit | 566094fc629ab1e92afb0cdf191a0e2c685b5c35 (patch) | |
| tree | ce172266109cf1c4e81a041e460c6cc7bcd5d50e /server/sonar-ce/src/test/java/org | |
| parent | bcfb1cac55137b838da7a93385b20e0e5ed47abb (diff) | |
| download | sonarqube-566094fc629ab1e92afb0cdf191a0e2c685b5c35.tar.gz sonarqube-566094fc629ab1e92afb0cdf191a0e2c685b5c35.zip | |
SONAR-17352 Refactor component keys to not include branch suffix
Diffstat (limited to 'server/sonar-ce/src/test/java/org')
| -rw-r--r-- | server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java index 935948712d7..05b04d9ac2f 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java @@ -351,8 +351,8 @@ public class InternalCeQueueImplTest { assertThat(peek).isPresent(); assertThat(peek.get().getUuid()).isEqualTo(task.getUuid()); assertThat(peek.get().getType()).isEqualTo(CeTaskTypes.REPORT); - assertThat(peek.get().getComponent()).contains(new CeTask.Component(branch.uuid(), branch.getDbKey(), branch.name())); - assertThat(peek.get().getMainComponent()).contains(new CeTask.Component(project.uuid(), project.getDbKey(), project.name())); + assertThat(peek.get().getComponent()).contains(new CeTask.Component(branch.uuid(), branch.getKey(), branch.name())); + assertThat(peek.get().getMainComponent()).contains(new CeTask.Component(project.uuid(), project.getKey(), project.name())); // no more pending tasks peek = underTest.peek(WORKER_UUID_2, true); @@ -608,7 +608,7 @@ public class InternalCeQueueImplTest { if (componentDto != null) { CeTask.Component component = task.getComponent().get(); assertThat(component.getUuid()).isEqualTo(componentDto.uuid()); - assertThat(component.getKey()).contains(componentDto.getDbKey()); + assertThat(component.getKey()).contains(componentDto.getKey()); assertThat(component.getName()).contains(componentDto.name()); } else if (taskSubmit.getComponent().isPresent()) { assertThat(task.getComponent()).contains(new CeTask.Component(taskSubmit.getComponent().get().getUuid(), null, null)); @@ -644,7 +644,7 @@ public class InternalCeQueueImplTest { } private ComponentDto newProjectDto(String uuid) { - return ComponentTesting.newPublicProjectDto(uuid).setName("name_" + uuid).setDbKey("key_" + uuid); + return ComponentTesting.newPublicProjectDto(uuid).setName("name_" + uuid).setKey("key_" + uuid); } private CeTask submit(String reportType, ComponentDto componentDto) { |