From f43c3c6a841654c072ccfd3e43a45397e15d43aa Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Mon, 12 Feb 2024 16:12:49 +0100 Subject: [PATCH] Use AssertJ recursive assertion and replace getCause with cause assertion --- .../CmmnHistoryServiceTaskLogTest.java | 16 +++++++++++---- .../history/HistoryServiceTaskLogTest.java | 12 ++++++++--- .../AbstractProcessInstanceMigrationTest.java | 4 +++- ...cessInstanceMigrationCallActivityTest.java | 12 ++++++++--- .../ProcessInstanceMigrationDocumentTest.java | 8 ++++++-- .../ProcessInstanceMigrationTest.java | 20 ++++++++++++++----- .../http/bpmn/HttpServiceTaskTest.java | 2 +- .../boot/ldap/FlowableLdapPropertiesTest.java | 6 ++++-- .../ProcessEngineAutoConfigurationTest.java | 6 ++++-- 9 files changed, 63 insertions(+), 23 deletions(-) diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/CmmnHistoryServiceTaskLogTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/CmmnHistoryServiceTaskLogTest.java index b3139ade7cd..1efb8608ae8 100644 --- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/CmmnHistoryServiceTaskLogTest.java +++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/CmmnHistoryServiceTaskLogTest.java @@ -727,7 +727,9 @@ protected void assertThatTaskLogIsFetched(HistoricTaskLogEntryBuilder historicTa List pagedLogEntries = historicTaskLogEntryQuery.listPage(1, 1); assertThat(pagedLogEntries).hasSize(1); - assertThat(pagedLogEntries.get(0)).isEqualToComparingFieldByField(logEntries.get(1)); + assertThat(pagedLogEntries.get(0)) + .usingRecursiveComparison() + .isEqualTo(logEntries.get(1)); } finally { deleteTaskWithLogEntries(anotherTask.getId()); @@ -753,7 +755,9 @@ protected void assertThatAllTaskLogIsFetched(HistoricTaskLogEntryBuilder histori List pagedLogEntries = historicTaskLogEntryQuery.listPage(1, 1); assertThat(pagedLogEntries).hasSize(1); - assertThat(pagedLogEntries.get(0)).isEqualToComparingFieldByField(logEntries.get(1)); + assertThat(pagedLogEntries.get(0)) + .usingRecursiveComparison() + .isEqualTo(logEntries.get(1)); } finally { deleteTaskWithLogEntries(anotherTask.getId()); @@ -855,7 +859,9 @@ public void queryForTaskLogEntriesByToIncludedTimeStamp() { List pagedLogEntries = historicTaskLogEntryQuery.listPage(1, 1); assertThat(pagedLogEntries).hasSize(1); - assertThat(pagedLogEntries.get(0)).isEqualToComparingFieldByField(logEntries.get(1)); + assertThat(pagedLogEntries.get(0)) + .usingRecursiveComparison() + .isEqualTo(logEntries.get(1)); } finally { deleteTaskWithLogEntries(anotherTask.getId()); @@ -934,7 +940,9 @@ public void queryForTaskLogEntriesByLogNumber() { List pagedLogEntries = historicTaskLogEntryQuery.listPage(1, 1); assertThat(pagedLogEntries).hasSize(1); - assertThat(pagedLogEntries.get(0)).isEqualToComparingFieldByField(logEntries.get(1)); + assertThat(pagedLogEntries.get(0)) + .usingRecursiveComparison() + .isEqualTo(logEntries.get(1)); } finally { deleteTaskWithLogEntries(anotherTask.getId()); diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoryServiceTaskLogTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoryServiceTaskLogTest.java index 9b884fa3997..c68b5214f20 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoryServiceTaskLogTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/history/HistoryServiceTaskLogTest.java @@ -836,7 +836,9 @@ protected void assertThatTaskLogIsFetched(HistoricTaskLogEntryBuilder historicTa List pagedLogEntries = historicTaskLogEntryQuery.listPage(1, 1); assertThat(pagedLogEntries).hasSize(1); - assertThat(pagedLogEntries.get(0)).isEqualToComparingFieldByField(logEntries.get(1)); + assertThat(pagedLogEntries.get(0)) + .usingRecursiveComparison() + .isEqualTo(logEntries.get(1)); } } finally { @@ -865,7 +867,9 @@ protected void assertThatAllTaskLogIsFetched(HistoricTaskLogEntryBuilder histori List pagedLogEntries = historicTaskLogEntryQuery.listPage(1, 1); assertThat(pagedLogEntries).hasSize(1); - assertThat(pagedLogEntries.get(0)).isEqualToComparingFieldByField(logEntries.get(1)); + assertThat(pagedLogEntries.get(0)) + .usingRecursiveComparison() + .isEqualTo(logEntries.get(1)); } } finally { @@ -940,7 +944,9 @@ public void queryForTaskLogEntriesByToTimeStamp() { List pagedLogEntries = historicTaskLogEntryQuery.listPage(1, 1); assertThat(pagedLogEntries).hasSize(1); - assertThat(pagedLogEntries.get(0)).isEqualToComparingFieldByField(logEntries.get(1)); + assertThat(pagedLogEntries.get(0)) + .usingRecursiveComparison() + .isEqualTo(logEntries.get(1)); } } finally { diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/AbstractProcessInstanceMigrationTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/AbstractProcessInstanceMigrationTest.java index 4f3219ff95b..9df357884ba 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/AbstractProcessInstanceMigrationTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/AbstractProcessInstanceMigrationTest.java @@ -52,7 +52,9 @@ protected void checkActivityInstances(ProcessDefinition processDefinition, Proce activityInstance -> { HistoricActivityInstance historicActivityInstance = historyService.createHistoricActivityInstanceQuery() .activityInstanceId(activityInstance.getId()).singleResult(); - assertThat(activityInstance).isEqualToComparingFieldByField(historicActivityInstance); + assertThat(activityInstance) + .usingRecursiveComparison() + .isEqualTo(historicActivityInstance); } ); } else { diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationCallActivityTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationCallActivityTest.java index 455e423640b..10f84d39d40 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationCallActivityTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationCallActivityTest.java @@ -1796,7 +1796,9 @@ public void testMigrateProcessWithCallActivityWithoutAlteringTheSubProcessDefini .containsOnly(procDefWithCallActivityV2.getId()); ProcessInstance subProcessInstanceAfterMigration = runtimeService.createProcessInstanceQuery().superProcessInstanceId(processInstance.getId()) .singleResult(); - assertThat(subProcessInstanceAfterMigration).isEqualToComparingFieldByField(subProcessInstance); + assertThat(subProcessInstanceAfterMigration) + .usingRecursiveComparison() + .isEqualTo(subProcessInstance); List subProcessExecutionsAfterMigration = runtimeService.createExecutionQuery().processInstanceId(subProcessInstanceAfterMigration.getId()) .onlyChildExecutions().list(); assertThat(subProcessExecutionsAfterMigration) @@ -1807,7 +1809,9 @@ public void testMigrateProcessWithCallActivityWithoutAlteringTheSubProcessDefini .containsOnly(procDefSubProcess.getId()); subProcessExecutions.sort(Comparator.comparing(Execution::getId)); subProcessExecutionsAfterMigration.sort(Comparator.comparing(Execution::getId)); - assertThat(subProcessExecutionsAfterMigration).usingFieldByFieldElementComparator().isEqualTo(subProcessExecutions); + assertThat(subProcessExecutionsAfterMigration) + .usingRecursiveFieldByFieldElementComparator() + .isEqualTo(subProcessExecutions); List subProcessTasksAfterMigration = taskService.createTaskQuery().processInstanceId(subProcessInstance.getId()).list(); assertThat(subProcessTasksAfterMigration) @@ -1816,7 +1820,9 @@ public void testMigrateProcessWithCallActivityWithoutAlteringTheSubProcessDefini subProcessTasks.sort(Comparator.comparing(Task::getId)); subProcessTasksAfterMigration.sort(Comparator.comparing(Task::getId)); - assertThat(subProcessTasksAfterMigration).usingFieldByFieldElementComparator().isEqualTo(subProcessTasks); + assertThat(subProcessTasksAfterMigration) + .usingRecursiveFieldByFieldElementComparator() + .isEqualTo(subProcessTasks); subProcessTasksAfterMigration.forEach(this::completeTask); diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationDocumentTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationDocumentTest.java index 2575997001b..615a070ab0f 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationDocumentTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationDocumentTest.java @@ -105,8 +105,12 @@ public void testDeSerializeCompleteProcessInstanceMigrationDocument() { .containsExactly(oneToOneMapping, oneToManyMapping, manyToOneMapping); assertThat(migrationDocument.getActivitiesLocalVariables()).isEqualTo(activityLocalVariables); assertThat(migrationDocument.getProcessInstanceVariables()).isEqualTo(processInstanceVariables); - assertThat(migrationDocument.getPreUpgradeScript()).isEqualToComparingFieldByField(new Script("groovy", "1+1")); - assertThat(migrationDocument.getPostUpgradeScript()).isEqualToComparingFieldByField(new Script("groovy", "2+2")); + assertThat(migrationDocument.getPreUpgradeScript()) + .usingRecursiveComparison() + .isEqualTo(new Script("groovy", "1+1")); + assertThat(migrationDocument.getPostUpgradeScript()) + .usingRecursiveComparison() + .isEqualTo(new Script("groovy", "2+2")); } @Test diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationTest.java index 4e01ff7069d..9cfc17ad194 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationTest.java @@ -1925,7 +1925,9 @@ public void testMigrateActivityToActivityWithTimerInNewDefinition() { Execution execution = runtimeService.createExecutionQuery().parentId(task.getExecutionId()).singleResult(); Job job = managementService.createTimerJobQuery().executionId(execution.getId()).singleResult(); assertThat(job) - .isEqualToIgnoringGivenFields(timerJob, "originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef"); + .usingRecursiveComparison() + .ignoringFields("originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef") + .isEqualTo(timerJob); // Verify events assertThat(changeStateEventListener.hasEvents()).isTrue(); @@ -1992,7 +1994,9 @@ public void testMigrateActivityWithTimerToActivityWithoutTimerInNewDefinition() Execution execution = runtimeService.createExecutionQuery().parentId(task.getExecutionId()).singleResult(); Job job = managementService.createTimerJobQuery().executionId(execution.getId()).singleResult(); assertThat(job) - .isEqualToIgnoringGivenFields(timerJob, "originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef"); + .usingRecursiveComparison() + .ignoringFields("originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef") + .isEqualTo(timerJob); changeStateEventListener.clear(); @@ -2096,7 +2100,9 @@ public void testMigrateActivityWithTimerToActivityWithTimerInNewDefinition() { Execution execution = runtimeService.createExecutionQuery().parentId(task.getExecutionId()).singleResult(); Job job = managementService.createTimerJobQuery().executionId(execution.getId()).singleResult(); assertThat(job) - .isEqualToIgnoringGivenFields(timerJob2, "originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef"); + .usingRecursiveComparison() + .ignoringFields("originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef") + .isEqualTo(timerJob2); assertThat(timerJob1) .extracting(Job::getExecutionId) .isNotEqualTo(timerJob2); @@ -2530,7 +2536,9 @@ public void testMigrateActivityToActivityWithTimerInsideEmbeddedSubProcessInNewD Execution timerExecution = runtimeService.createExecutionQuery().parentId(task.getExecutionId()).singleResult(); Job timerFromTask = managementService.createTimerJobQuery().executionId(timerExecution.getId()).singleResult(); assertThat(timerJob) - .isEqualToIgnoringGivenFields(timerFromTask, "originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef"); + .usingRecursiveComparison() + .ignoringFields("originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef") + .isEqualTo(timerFromTask); // Verify events assertThat(changeStateEventListener.hasEvents()).isTrue(); @@ -2619,7 +2627,9 @@ public void testMigrateActivityToActivityWithTimerInsideEmbeddedSubProcessInNewD Execution timerExecution = runtimeService.createExecutionQuery().parentId(task.getExecutionId()).singleResult(); Job timerFromTask = managementService.createTimerJobQuery().executionId(timerExecution.getId()).singleResult(); assertThat(timerJob) - .isEqualToIgnoringGivenFields(timerFromTask, "originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef"); + .usingRecursiveComparison() + .ignoringFields("originalPersistentState", "customValuesByteArrayRef", "exceptionByteArrayRef") + .isEqualTo(timerFromTask); // Verify events assertThat(changeStateEventListener.hasEvents()).isTrue(); diff --git a/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTest.java b/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTest.java index 53e1f479418..5f8eeb46275 100644 --- a/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTest.java +++ b/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTest.java @@ -285,7 +285,7 @@ public void testConnectTimeout() { public void testRequestTimeout() { assertThatThrownBy(() -> runtimeService.startProcessInstanceByKey("requestTimeout")) .isExactlyInstanceOf(FlowableException.class) - .getCause().isInstanceOfAny(SocketTimeoutException.class, SocketException.class); + .cause().isInstanceOfAny(SocketTimeoutException.class, SocketException.class); } @Test diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/ldap/FlowableLdapPropertiesTest.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/ldap/FlowableLdapPropertiesTest.java index 94d5f76fb46..762da8beae1 100644 --- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/ldap/FlowableLdapPropertiesTest.java +++ b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/ldap/FlowableLdapPropertiesTest.java @@ -69,7 +69,8 @@ public void shouldCorrectlyCustomizeLdapConfiguration() { assertThat(ldapConfiguration) .as("Base Ldap Configuration") - .isEqualToIgnoringGivenFields(properties, + .usingRecursiveComparison() + .ignoringFields( "queryUserByUserId", "queryUserByFullNameLike", "queryAllUsers", @@ -87,7 +88,8 @@ public void shouldCorrectlyCustomizeLdapConfiguration() { "groupCacheExpirationTime", "ldapQueryBuilder", "groupCacheListener" - ); + ) + .isEqualTo(properties); assertThat(ldapConfiguration) .as("Query properties") diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/test/spring/boot/process/ProcessEngineAutoConfigurationTest.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/test/spring/boot/process/ProcessEngineAutoConfigurationTest.java index 5c0828aea7f..08b1c1536d8 100644 --- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/test/spring/boot/process/ProcessEngineAutoConfigurationTest.java +++ b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/test/spring/boot/process/ProcessEngineAutoConfigurationTest.java @@ -446,7 +446,8 @@ public void processEngineWithCustomIdGenerator() { assertThat(dbIdGenerator.getIdBlockSize()).isEqualTo(engineConfiguration.getIdBlockSize()); assertThat(dbIdGenerator.getCommandExecutor()).isEqualTo(engineConfiguration.getCommandExecutor()); assertThat(dbIdGenerator.getCommandConfig()) - .isEqualToComparingFieldByField(engineConfiguration.getDefaultCommandConfig().transactionRequiresNew()); + .usingRecursiveComparison() + .isEqualTo(engineConfiguration.getDefaultCommandConfig().transactionRequiresNew()); }); }); } @@ -467,7 +468,8 @@ public void processEngineWithCustomIdGeneratorAsBean() { assertThat(dbIdGenerator.getIdBlockSize()).isEqualTo(engineConfiguration.getIdBlockSize()); assertThat(dbIdGenerator.getCommandExecutor()).isEqualTo(engineConfiguration.getCommandExecutor()); assertThat(dbIdGenerator.getCommandConfig()) - .isEqualToComparingFieldByField(engineConfiguration.getDefaultCommandConfig().transactionRequiresNew()); + .usingRecursiveComparison() + .isEqualTo(engineConfiguration.getDefaultCommandConfig().transactionRequiresNew()); }) .isEqualTo(context.getBean(IdGenerator.class)); });