This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch postgresql in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d519f7b9ac1c27f9f34de3a2d193a2894ad647a8 Author: Quan Tran <[email protected]> AuthorDate: Fri Mar 29 13:07:37 2024 +0700 JAMES-2586 Relax TaskExecutionDetailsProjectionContract: can compare ZonedDateTime(s) with different timezones --- .../TaskExecutionDetailsProjectionContract.java | 36 +++++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/server/task/task-memory/src/test/java/org/apache/james/task/eventsourcing/TaskExecutionDetailsProjectionContract.java b/server/task/task-memory/src/test/java/org/apache/james/task/eventsourcing/TaskExecutionDetailsProjectionContract.java index 131812e497..0c89c93aec 100644 --- a/server/task/task-memory/src/test/java/org/apache/james/task/eventsourcing/TaskExecutionDetailsProjectionContract.java +++ b/server/task/task-memory/src/test/java/org/apache/james/task/eventsourcing/TaskExecutionDetailsProjectionContract.java @@ -45,7 +45,14 @@ public interface TaskExecutionDetailsProjectionContract { testee.update(TASK_EXECUTION_DETAILS()); Optional<TaskExecutionDetails> taskExecutionDetails = OptionConverters.toJava(testee.load(TASK_ID())); - assertThat(taskExecutionDetails).contains(TASK_EXECUTION_DETAILS()); + + assertThat(taskExecutionDetails.get()) + .usingRecursiveComparison() + .ignoringFields("submittedDate") + .isEqualTo(TASK_EXECUTION_DETAILS()); + + assertThat(taskExecutionDetails.get().getSubmittedDate().isEqual(TASK_EXECUTION_DETAILS().getSubmittedDate())) + .isTrue(); } @Test @@ -54,7 +61,14 @@ public interface TaskExecutionDetailsProjectionContract { testee.update(TASK_EXECUTION_DETAILS_WITH_ADDITIONAL_INFORMATION()); Optional<TaskExecutionDetails> taskExecutionDetails = OptionConverters.toJava(testee.load(TASK_ID())); - assertThat(taskExecutionDetails).contains(TASK_EXECUTION_DETAILS_WITH_ADDITIONAL_INFORMATION()); + + assertThat(taskExecutionDetails.get()) + .usingRecursiveComparison() + .ignoringFields("submittedDate") + .isEqualTo(TASK_EXECUTION_DETAILS_WITH_ADDITIONAL_INFORMATION()); + + assertThat(taskExecutionDetails.get().getSubmittedDate().isEqual(TASK_EXECUTION_DETAILS_WITH_ADDITIONAL_INFORMATION().getSubmittedDate())) + .isTrue(); } @Test @@ -65,7 +79,14 @@ public interface TaskExecutionDetailsProjectionContract { testee.update(TASK_EXECUTION_DETAILS_UPDATED()); Optional<TaskExecutionDetails> taskExecutionDetails = OptionConverters.toJava(testee.load(TASK_ID())); - assertThat(taskExecutionDetails).contains(TASK_EXECUTION_DETAILS_UPDATED()); + + assertThat(taskExecutionDetails.get()) + .usingRecursiveComparison() + .ignoringFields("submittedDate") + .isEqualTo(TASK_EXECUTION_DETAILS_UPDATED()); + + assertThat(taskExecutionDetails.get().getSubmittedDate().isEqual(TASK_EXECUTION_DETAILS_UPDATED().getSubmittedDate())) + .isTrue(); } @Test @@ -89,7 +110,10 @@ public interface TaskExecutionDetailsProjectionContract { testee.update(TASK_EXECUTION_DETAILS_2()); List<TaskExecutionDetails> taskExecutionDetails = asJava(testee.list()); - assertThat(taskExecutionDetails).containsOnly(TASK_EXECUTION_DETAILS(), TASK_EXECUTION_DETAILS_2()); + + assertThat(taskExecutionDetails) + .usingRecursiveFieldByFieldElementComparatorIgnoringFields("submittedDate") + .containsOnly(TASK_EXECUTION_DETAILS(), TASK_EXECUTION_DETAILS_2()); } @Test @@ -99,6 +123,8 @@ public interface TaskExecutionDetailsProjectionContract { testee.update(TASK_EXECUTION_DETAILS_UPDATED()); List<TaskExecutionDetails> taskExecutionDetails = asJava(testee.list()); - assertThat(taskExecutionDetails).containsOnly(TASK_EXECUTION_DETAILS_UPDATED()); + assertThat(taskExecutionDetails) + .usingRecursiveFieldByFieldElementComparatorIgnoringFields("submittedDate") + .containsOnly(TASK_EXECUTION_DETAILS_UPDATED()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
