aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2017-07-06 15:00:29 +0200
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2017-07-17 10:52:47 +0200
commit6c080c35d769ac11be5f203536c19d7dbf66a5a6 (patch)
treed5ac21b626e7799b27ac7609b76bf8720fb248ce
parent441e1e45649d7f200e03519f71a689d9b5dd7e4c (diff)
downloadsonarqube-6c080c35d769ac11be5f203536c19d7dbf66a5a6.tar.gz
sonarqube-6c080c35d769ac11be5f203536c19d7dbf66a5a6.zip
SONAR-9525 fix CeWorkerImplTest#verifyWorkerUuid
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
index 73381b49dfa..5325f56771a 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
@@ -59,9 +59,10 @@ public class CeWorkerImplTest {
private InternalCeQueue queue = mock(InternalCeQueue.class);
private ReportTaskProcessor taskProcessor = mock(ReportTaskProcessor.class);
private CeLogging ceLogging = spy(CeLogging.class);
- private ArgumentCaptor<String> workerUuid = ArgumentCaptor.forClass(String.class);
+ private ArgumentCaptor<String> workerUuidCaptor = ArgumentCaptor.forClass(String.class);
private int randomOrdinal = new Random().nextInt();
- private CeWorker underTest = new CeWorkerImpl(randomOrdinal, UUID.randomUUID().toString(), queue, ceLogging, taskProcessorRepository);
+ private String workerUuid = UUID.randomUUID().toString();
+ private CeWorker underTest = new CeWorkerImpl(randomOrdinal, workerUuid, queue, ceLogging, taskProcessorRepository);
private InOrder inOrder = Mockito.inOrder(ceLogging, taskProcessor, queue);
@Test
@@ -237,8 +238,8 @@ public class CeWorkerImplTest {
}
private void verifyWorkerUuid() {
- verify(queue).peek(workerUuid.capture());
- assertThat(workerUuid.getValue()).startsWith(workerUuid.getValue());
+ verify(queue).peek(workerUuidCaptor.capture());
+ assertThat(workerUuidCaptor.getValue()).isEqualTo(workerUuid);
}
private static CeTask createCeTask(@Nullable String submitterLogin) {