Skip to content

Commit 2a888fa

Browse files
filiphrfiliphr
committed
Use AssertJ in the entire codebase
1 parent eecdc48 commit 2a888fa

19 files changed

Lines changed: 63 additions & 115 deletions

File tree

‎modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EngineMappingsValidationTest.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@
1313
package org.flowable.test.persistence;
1414

1515
import static org.assertj.core.api.Assertions.assertThat;
16+
import static org.assertj.core.api.Assertions.fail;
1617
import static org.flowable.test.persistence.EntityParameterTypesOverview.getColumnType;
1718
import static org.flowable.test.persistence.EntityParameterTypesOverview.getParameterType;
18-
import static org.junit.jupiter.api.Assertions.assertFalse;
19-
import static org.junit.jupiter.api.Assertions.assertNotNull;
20-
import static org.junit.jupiter.api.Assertions.assertTrue;
21-
import static org.junit.jupiter.api.Assertions.fail;
2219

2320
import java.io.BufferedReader;
2421
import java.io.ByteArrayOutputStream;
@@ -39,6 +36,7 @@
3936
import javax.xml.transform.stream.StreamResult;
4037

4138
import org.apache.commons.lang3.StringUtils;
39+
import org.flowable.common.engine.impl.persistence.entity.Entity;
4240
import org.flowable.test.persistence.EntityHelperUtil.EntityMappingPackageInformation;
4341
import org.flowable.test.persistence.EntityHelperUtil.EntityPackageTestArgumentsProvider;
4442
import org.junit.jupiter.params.ParameterizedTest;
@@ -69,7 +67,7 @@ public class EngineMappingsValidationTest {
6967
@ArgumentsSource(EntityPackageTestArgumentsProvider.class)
7068
public void verifyMappedEntitiesExist(EntityMappingPackageInformation packageInformation) {
7169
Map<String, Document> mappedResources = EntityHelperUtil.readMappingFile(packageInformation);
72-
assertFalse(mappedResources.isEmpty());
70+
assertThat(mappedResources).isNotEmpty();
7371

7472
for (String mappedResource : mappedResources.keySet()) {
7573
Document mappingFileContent = mappedResources.get(mappedResource);
@@ -84,10 +82,13 @@ public void verifyEntitiesInEntityDependencyOrder(EntityMappingPackageInformatio
8482
Map<String, Document> mappedResources = EntityHelperUtil.readMappingFile(packageInformation);
8583
for (String mappedResource : mappedResources.keySet()) {
8684
Document mappingFileContent = mappedResources.get(mappedResource);
87-
assertTrue(packageInformation.getEntityInsertOrder().contains(getAndAssertEntityImplClass(mappingFileContent, mappedResource)),
88-
"No insert entry in EntityDependencyOrder for " + mappedResource);
89-
assertTrue(packageInformation.getEntityDeleteOrder().contains(getAndAssertEntityImplClass(mappingFileContent, mappedResource)),
90-
"No delete entry in EntityDependencyOrder for " + mappedResource);
85+
Class<? extends Entity> entityImplClass = getAndAssertEntityImplClass(mappingFileContent, mappedResource);
86+
assertThat(packageInformation.getEntityInsertOrder())
87+
.withFailMessage("No insert entry in EntityDependencyOrder for " + mappedResource)
88+
.contains(entityImplClass);
89+
assertThat(packageInformation.getEntityDeleteOrder())
90+
.withFailMessage("No delete entry in EntityDependencyOrder for " + mappedResource)
91+
.contains(entityImplClass);
9192
}
9293
}
9394

@@ -199,7 +200,7 @@ public void verifyUpdateStatements(EntityMappingPackageInformation packageInform
199200
@ArgumentsSource(EntityPackageTestArgumentsProvider.class)
200201
public void verifyAllParametersAreTyped(EntityMappingPackageInformation packageInformation) throws IOException {
201202
Map<String, String> mappedResources = EntityHelperUtil.readMappingFileAsString(packageInformation);
202-
assertFalse(mappedResources.isEmpty());
203+
assertThat(mappedResources).isNotEmpty();
203204

204205
for (String mappedResource : mappedResources.keySet()) {
205206
System.out.println("Checking mapping " + mappedResource);
@@ -313,21 +314,21 @@ protected Class<?> getAndAssertEntityInterfaceClass(Document mappingFileContent,
313314
String expectedClass = entityPackage + "." + mappedEntity + "Entity";
314315
try {
315316
Class<?> c = Class.forName(expectedClass);
316-
assertNotNull(c);
317+
assertThat(c).isNotNull();
317318
return c;
318319
} catch (Exception e) {
319320
fail("Entity interface class " + entityPackage + "." + mappedEntity + " for " + mappedEntity + " not found");
320321
}
321322
return null;
322323
}
323324

324-
protected Class<?> getAndAssertEntityImplClass(Document mappingFileContent, String mappedEntity) {
325+
protected Class<? extends Entity> getAndAssertEntityImplClass(Document mappingFileContent, String mappedEntity) {
325326
String entityPackage = getEntityPackageFromMapperElement(mappingFileContent);
326327
String expectedClass = entityPackage + "." + mappedEntity + "EntityImpl";
327328
try {
328329
Class<?> c = Class.forName(expectedClass);
329-
assertNotNull(c);
330-
return c;
330+
assertThat(c).isNotNull();
331+
return (Class<? extends Entity>) c;
331332
} catch (Exception e) {
332333
fail("Entity interface class " + expectedClass + " for " + mappedEntity + " not found");
333334
}

‎modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityHelperUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
package org.flowable.test.persistence;
1414

15-
import static org.junit.jupiter.api.Assertions.assertFalse;
15+
import static org.assertj.core.api.Assertions.assertThat;
1616

1717
import java.io.IOException;
1818
import java.nio.charset.StandardCharsets;
@@ -99,7 +99,7 @@ public static Map<String, Document> readMappingFile(EntityMappingPackageInformat
9999

100100
resources.remove("TableData"); // not an entity
101101

102-
assertFalse(resources.isEmpty());
102+
assertThat(resources).isNotEmpty();
103103

104104
return resources;
105105
} catch (Exception e) {
@@ -139,7 +139,7 @@ public static Map<String, String> readMappingFileAsString(EntityMappingPackageIn
139139

140140
resources.remove("TableData"); // not an entity
141141

142-
assertFalse(resources.isEmpty());
142+
assertThat(resources).isNotEmpty();
143143

144144
return resources;
145145
} catch (Exception e) {

‎modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/migration/CaseInstanceMigrationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static org.assertj.core.api.Assertions.assertThat;
1818
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1919
import static org.flowable.cmmn.converter.CmmnXmlConstants.ELEMENT_STAGE;
20-
import static org.junit.Assert.assertNotNull;
2120

2221
import java.util.HashMap;
2322
import java.util.List;
@@ -1292,7 +1291,7 @@ void withMilestone() {
12921291
}
12931292

12941293
MilestoneInstance milestoneInstance = cmmnRuntimeService.createMilestoneInstanceQuery().milestoneInstanceCaseInstanceId(caseInstance.getId()).singleResult();
1295-
assertNotNull(milestoneInstance);
1294+
assertThat(milestoneInstance).isNotNull();
12961295

12971296
// Act
12981297
cmmnMigrationService.createCaseInstanceMigrationBuilder()

‎modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/MilestoneTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.flowable.cmmn.model.Milestone;
2727
import org.flowable.cmmn.test.FlowableCmmnTestCase;
2828
import org.flowable.task.api.Task;
29-
import org.junit.Assert;
3029
import org.junit.jupiter.api.Test;
3130

3231
/**
@@ -60,7 +59,7 @@ public void testMilestoneVariable() {
6059
public void testRepeatingMilestoneWithLocalVariables() {
6160
CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("testRepeatingMilestone").start();
6261

63-
Assert.assertEquals(0, cmmnRuntimeService.createMilestoneInstanceQuery().count());
62+
assertThat(cmmnRuntimeService.createMilestoneInstanceQuery().count()).isZero();
6463

6564
for (int i = 1; i <= 10; i++) {
6665
cmmnTaskService.complete(cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).singleResult().getId());
@@ -95,7 +94,7 @@ public void testMilestoneUpdatesBusinessStatusWithExpression() {
9594
}
9695

9796
public void assertMilestoneState(String caseInstanceId, int nrOfExpectedCompletedMilestones) {
98-
Assert.assertEquals(nrOfExpectedCompletedMilestones, cmmnRuntimeService.createMilestoneInstanceQuery().count());
97+
assertThat(cmmnRuntimeService.createMilestoneInstanceQuery().count()).isEqualTo(nrOfExpectedCompletedMilestones);
9998

10099
List<PlanItemInstance> milestonePlanItemInstances = cmmnRuntimeService.createPlanItemInstanceQuery()
101100
.planItemInstanceName("Milestone")

‎modules/flowable-cxf/src/test/java/org/flowable/engine/impl/webservice/WebServiceTaskTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import static org.assertj.core.api.Assertions.assertThat;
1616
import static org.assertj.core.api.Assertions.assertThatThrownBy;
17-
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.assertj.core.api.Assertions.entry;
1818

1919
import java.net.URL;
2020
import java.text.SimpleDateFormat;
@@ -360,10 +360,12 @@ public void testWebServiceInvocationReturningSeveralParams() throws Exception {
360360

361361
final HistoricProcessInstance histProcInst = historyService.createHistoricProcessInstanceQuery()
362362
.processInstanceId(processInstance.getId()).includeProcessVariables().singleResult();
363-
final Map<String, Object> procVariables = histProcInst.getProcessVariables();
364-
assertEquals("23", procVariables.get("outParam1"));
365-
assertEquals(23, procVariables.get("outParam2"));
366-
assertEquals("23-23", procVariables.get("outParam3"));
363+
assertThat(histProcInst.getProcessVariables())
364+
.contains(
365+
entry("outParam1", "23"),
366+
entry("outParam2", 23),
367+
entry("outParam3", "23-23")
368+
);
367369
}
368370

369371
}

‎modules/flowable-engine/src/test/java/org/flowable/engine/test/api/mgmt/ManagementServiceTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.flowable.job.service.impl.persistence.entity.JobEntity;
5353
import org.flowable.job.service.impl.persistence.entity.SuspendedJobEntity;
5454
import org.flowable.job.service.impl.persistence.entity.TimerJobEntity;
55-
import org.junit.Assert;
5655
import org.junit.jupiter.api.Test;
5756

5857
/**
@@ -669,10 +668,8 @@ void testMoveDeadLetterJobToInvalidHistoryJob() {
669668
return job;
670669
});
671670

672-
try {
673-
managementService.moveDeadLetterJobToHistoryJob(deadLetterJob.getId(), 3);
674-
Assert.fail();
675-
} catch (FlowableIllegalArgumentException e) { }
671+
assertThatThrownBy(() -> managementService.moveDeadLetterJobToHistoryJob(deadLetterJob.getId(), 3))
672+
.isInstanceOf(FlowableIllegalArgumentException.class);
676673

677674
managementService.deleteDeadLetterJob(deadLetterJob.getId());
678675
}

‎modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/async/AsyncTaskTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import static org.assertj.core.api.Assertions.assertThat;
1616
import static org.assertj.core.api.Assertions.assertThatThrownBy;
17+
import static org.assertj.core.api.Assertions.fail;
1718
import static org.assertj.core.api.Assertions.tuple;
1819

1920
import java.util.Collections;
@@ -36,7 +37,6 @@
3637
import org.flowable.job.service.impl.persistence.entity.JobEntity;
3738
import org.flowable.variable.api.history.HistoricVariableInstance;
3839
import org.flowable.variable.api.persistence.entity.VariableInstance;
39-
import org.junit.Assert;
4040
import org.junit.jupiter.api.Test;
4141

4242
public class AsyncTaskTest extends PluggableFlowableTestCase {
@@ -569,7 +569,7 @@ public void testMultiInstanceAsyncTask() {
569569
sequenceFlowCount++;
570570

571571
} else {
572-
Assert.fail("Unexpected activity found " + historicActivityInstance.getActivityId());
572+
fail("Unexpected activity found " + historicActivityInstance.getActivityId());
573573
}
574574
}
575575

@@ -609,7 +609,7 @@ public void testMultiInstanceTask() {
609609
sequenceFlowCount++;
610610

611611
} else {
612-
Assert.fail("Unexpected activity found " + historicActivityInstance.getActivityId());
612+
fail("Unexpected activity found " + historicActivityInstance.getActivityId());
613613
}
614614
}
615615

@@ -666,7 +666,7 @@ public void testMultiInstanceAsyncSequentialTask() {
666666
sequenceFlowCount++;
667667

668668
} else {
669-
Assert.fail("Unexpected activity found " + historicActivityInstance.getActivityId());
669+
fail("Unexpected activity found " + historicActivityInstance.getActivityId());
670670
}
671671
}
672672

@@ -706,7 +706,7 @@ public void testMultiInstanceSequentialTask() {
706706
sequenceFlowCount++;
707707

708708
} else {
709-
Assert.fail("Unexpected activity found " + historicActivityInstance.getActivityId());
709+
fail("Unexpected activity found " + historicActivityInstance.getActivityId());
710710
}
711711
}
712712

‎modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.assertj.core.api.Assertions.assertThat;
1717
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1818
import static org.assertj.core.api.Assertions.tuple;
19-
import static org.junit.jupiter.api.Assertions.assertThrows;
2019

2120
import java.util.Arrays;
2221
import java.util.Date;
@@ -1129,22 +1128,17 @@ public void testCallSubProcessWithFallbackToDefaultTenantFalseInSameTenant() {
11291128
tenantId = "flowable"
11301129
)
11311130
public void testCallSubProcessWithFallbackToDefaultTenantFalse() {
1132-
assertThrows(
1133-
FlowableObjectNotFoundException.class,
1134-
() -> assertCallActivityToFallback()
1135-
);
1131+
assertThatThrownBy(this::assertCallActivityToFallback)
1132+
.isInstanceOf(FlowableObjectNotFoundException.class);
11361133
}
11371134

11381135
@Test
11391136
@Deployment(resources = { "org/flowable/engine/test/bpmn/callactivity/CallActivity.testCallSimpleSubProcessWithFallbackWrongNonBoolean.bpmn20.xml"},
11401137
tenantId = "flowable"
11411138
)
11421139
public void testCallSubProcessWithFallbackToDefaultTenantNonBooleanValue() {
1143-
assertThrows(
1144-
FlowableException.class,
1145-
() -> assertCallActivityToFallback(),
1146-
"Unable to recognize fallbackToDefaultTenant value 1"
1147-
);
1140+
assertThatThrownBy(this::assertCallActivityToFallback, "Unable to recognize fallbackToDefaultTenant value 1")
1141+
.isInstanceOf(FlowableException.class);
11481142
}
11491143

11501144
@Test

‎modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/usertask/TaskDueDateExtensionsTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package org.flowable.engine.test.bpmn.usertask;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
17-
import static org.junit.Assert.assertThrows;
17+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1818

1919
import java.text.SimpleDateFormat;
2020
import java.time.Instant;
@@ -85,9 +85,8 @@ public void testDueDateExtensionWithUnparseableDate() throws Exception {
8585
Map<String, Object> variables = new HashMap<>();
8686
variables.put("dateVariable", notAValidDate);
8787

88-
assertThrows(FlowableIllegalArgumentException.class, () -> {
89-
runtimeService.startProcessInstanceByKey("dueDateExtensionWithUnparseableDate", variables);
90-
});
88+
assertThatThrownBy(() -> runtimeService.startProcessInstanceByKey("dueDateExtensionWithUnparseableDate", variables))
89+
.isInstanceOf(FlowableIllegalArgumentException.class);
9190
}
9291

9392
@Test

‎modules/flowable-engine/src/test/java/org/flowable/engine/test/db/EntitiesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package org.flowable.engine.test.db;
1414

1515
import static org.assertj.core.api.Assertions.assertThat;
16-
import static org.junit.Assert.fail;
16+
import static org.assertj.core.api.Assertions.fail;
1717

1818
import java.nio.charset.StandardCharsets;
1919
import java.util.HashSet;

0 commit comments

Comments
 (0)