Refactorize tests

Author: mcornaton

CHANGELOG.md

@@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file.
 - Add blockchain connection health indicator. (#601)
 - Block some connections and messages when blockchain connection is down. (#604)
 - Block deal watching mechanisms when communication with the blockchain node is lost. (#606)
-- Add `isEligibleToContributeAndFinalize` method to `Task`. (#619)
+- Use `isEligibleToContributeAndFinalize` method from `TaskDescription`. (#619)
 ### Bug Fixes
 - Clean call to `iexecHubService#getTaskDescriptionFromChain` in test. (#597)
 - Reject deal if TEE tag but trust not in {0,1}. (#598)

src/test/java/com/iexec/core/detector/task/FinalizedTaskDetectorTests.java

@@ -70,14 +70,7 @@ void shouldDetectTasks() {
         final String contributedAndFinalizedChainTaskId = "0x75bc5e94ed1486b940bd6cc0013c418efad58a0a52a3d08cee89faaa21970426";
         final Task contributeAndFinalizeTask = getContributeAndFinalizeDoneTask(contributedAndFinalizedChainTaskId).build();
         when(taskService.findByCurrentStatus(TaskStatus.RUNNING)).thenReturn(List.of(contributeAndFinalizeTask));
-
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(contributedAndFinalizedChainTaskId)
-                .isTeeTask(true)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
-        when(iexecHubService.getTaskDescription(contributedAndFinalizedChainTaskId)).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(contributeAndFinalizeTask);
 
         detector.detect();
 
@@ -114,15 +107,9 @@ void shouldDetectNoFinalizedTaskAsTaskIsRevealing() {
     @Test
     void shouldDetectContributeAndFinalizeDoneTask() {
         final Task task = getContributeAndFinalizeDoneTask(CHAIN_TASK_ID).build();
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(CHAIN_TASK_ID)
-                .isTeeTask(true)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
 
         when(taskService.findByCurrentStatus(TaskStatus.RUNNING)).thenReturn(List.of(task));
-        when(iexecHubService.getTaskDescription(CHAIN_TASK_ID)).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(task);
 
         detector.detectContributeAndFinalizeDoneTasks();
 
@@ -132,15 +119,9 @@ void shouldDetectContributeAndFinalizeDoneTask() {
     @Test
     void shouldDetectNoContributeAndFinalizeDoneTaskAsTaskIsRevealing() {
         final Task task = getOnchainRevealingTask(CHAIN_DEAL_ID).build();
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(task.getChainTaskId())
-                .isTeeTask(true)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
 
         when(taskService.findByCurrentStatus(TaskStatus.RUNNING)).thenReturn(List.of(task));
-        when(iexecHubService.getTaskDescription(task.getChainTaskId())).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(task);
 
         detector.detectContributeAndFinalizeDoneTasks();
 
@@ -186,13 +167,7 @@ void shouldChainTaskNotBeCompletedAsChainTaskNotCompleted() {
     @Test
     void shouldTaskBeContributeAndFinalizeDone() {
         final Task task = getContributeAndFinalizeDoneTask(CHAIN_TASK_ID).build();
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(CHAIN_TASK_ID)
-                .isTeeTask(true)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
-        when(iexecHubService.getTaskDescription(CHAIN_TASK_ID)).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(task);
 
         final boolean taskContributeAndFinalizeDone = detector.isTaskContributeAndFinalizeDone(task);
 
@@ -206,13 +181,7 @@ void shouldTaskNotBeContributeAndFinalizeDoneAsNotTee() {
                 .currentStatus(TaskStatus.FINALIZING)
                 .tag(NO_TEE_TAG)
                 .build();
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(CHAIN_TASK_ID)
-                .isTeeTask(false)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
-        when(iexecHubService.getTaskDescription(CHAIN_TASK_ID)).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(task);
 
         final boolean taskContributeAndFinalizeDone = detector.isTaskContributeAndFinalizeDone(task);
 
@@ -232,16 +201,10 @@ void shouldTaskNotBeContributeAndFinalizeDoneAsMultipleReplicates() {
                 .chainTaskId(CHAIN_TASK_ID)
                 .status(ChainTaskStatus.COMPLETED)
                 .build();
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(CHAIN_TASK_ID)
-                .isTeeTask(true)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
 
         when(replicatesService.getReplicates(CHAIN_TASK_ID)).thenReturn(List.of(replicate1, replicate2));
         when(iexecHubService.getChainTask(CHAIN_TASK_ID)).thenReturn(Optional.of(chainTask));
-        when(iexecHubService.getTaskDescription(CHAIN_TASK_ID)).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(task);
 
         final boolean taskContributeAndFinalizeDone = detector.isTaskContributeAndFinalizeDone(task);
 
@@ -257,15 +220,9 @@ void shouldTaskNotBeContributeAndFinalizeDoneAsReplicateNotDone() {
                 .build();
         final Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
         replicate.updateStatus(ReplicateStatus.COMPUTING, ReplicateStatusModifier.WORKER);
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(CHAIN_TASK_ID)
-                .isTeeTask(true)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
 
         when(replicatesService.getReplicates(CHAIN_TASK_ID)).thenReturn(List.of(replicate));
-        when(iexecHubService.getTaskDescription(CHAIN_TASK_ID)).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(task);
 
         final boolean taskContributeAndFinalizeDone = detector.isTaskContributeAndFinalizeDone(task);
 
@@ -285,16 +242,10 @@ void shouldTaskNotBeContributeAndFinalizeDoneAsChainTaskNotCompleted() {
                 .chainTaskId(CHAIN_TASK_ID)
                 .status(ChainTaskStatus.REVEALING)
                 .build();
-        final TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(CHAIN_TASK_ID)
-                .isTeeTask(true)
-                .trust(BigInteger.ONE)
-                .callback("")
-                .build();
 
         when(replicatesService.getReplicates(CHAIN_TASK_ID)).thenReturn(List.of(replicate));
         when(iexecHubService.getChainTask(CHAIN_TASK_ID)).thenReturn(Optional.of(chainTask));
-        when(iexecHubService.getTaskDescription(CHAIN_TASK_ID)).thenReturn(taskDescription);
+        mockTaskDescriptionFromTask(task);
 
         final boolean taskContributeAndFinalizeDone = detector.isTaskContributeAndFinalizeDone(task);
 
@@ -353,5 +304,15 @@ private Task.TaskBuilder getContributeAndFinalizeDoneTask(String chainTaskId) {
                 .tag(TEE_TAG)
                 .trust(1);
     }
+
+    private void mockTaskDescriptionFromTask(Task task) {
+        final TaskDescription taskDescription = TaskDescription.builder()
+                .chainTaskId(task.getChainTaskId())
+                .isTeeTask(task.isTeeTask())
+                .trust(BigInteger.valueOf(task.getTrust()))
+                .callback("")
+                .build();
+        when(iexecHubService.getTaskDescription(task.getChainTaskId())).thenReturn(taskDescription);
+    }
     // endregion
 }