Skip to content

Commit cd6eeb4

Browse files
bedaHovorkaclaude
bedaHovorka
and
claude
committed
Migrate test suite from AssertJ to AssertK
Replace AssertJ with AssertK assertion library across all test files to leverage Kotlin-native assertion syntax and improved type safety. Changes: - Replace AssertJ dependency with AssertK in build.gradle.kts - Add assertk.version property (0.28.1) to gradle.properties - Create AssertKExtensions.kt with custom extensions: - withMessage() for assertion descriptions (replaces .as()) - hasSizeGreaterThanOrEqualTo() for collection size assertions - containsAnyOf() for flexible collection membership checks - Migrate all 19 test files to AssertK assertions: - Replace assertThat() imports and syntax - Convert .as() to withMessage() for test descriptions - Update extracting() patterns to map() for property extraction - Fix fail() calls to use assertk.fail() with proper message syntax - Add necessary imports (isSameAs, isInstanceOf, etc.) - Maintain test parity: All 242 tests passing Migration preserves all existing test behavior while providing better Kotlin integration and more idiomatic assertion syntax. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 58e9844 commit cd6eeb4

19 files changed

Lines changed: 862 additions & 300 deletions

‎build.gradle.kts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ val slf4jVersion: String by project
4646
val logbackVersion: String by project
4747
val junitPlatformVersion: String by project
4848
val junitJupiterVersion: String by project
49-
val assertjVersion: String by project
49+
val assertkVersion: String by project
5050
val mockitoVersion: String by project
5151
val javaVersion: String by project
5252
val kotlinVersion: String by project
@@ -96,8 +96,7 @@ dependencies {
9696
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion") // JUnit 5 engine
9797
testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitPlatformVersion") // JUnit platform launcher
9898
testRuntimeOnly("org.junit.platform:junit-platform-console:$junitPlatformVersion") // JUnit platform console
99-
testImplementation("org.assertj:assertj-core:$assertjVersion") // Fluent assertions
100-
testImplementation("com.willowtreeapps.assertk:assertk:0.28.1") // AssertK for Kotlin tests
99+
testImplementation("com.willowtreeapps.assertk:assertk:$assertkVersion") // AssertK for Kotlin tests
101100
testImplementation("org.mockito:mockito-core:$mockitoVersion") // Mocking framework
102101
testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") // Mockito-JUnit integration
103102
}
@@ -517,7 +516,7 @@ tasks.register("printConfig") {
517516
| SLF4J: $slf4jVersion
518517
| Logback: $logbackVersion
519518
| JUnit: $junitJupiterVersion
520-
| AssertJ: $assertjVersion
519+
| AssertK: $assertkVersion
521520
| Mockito: $mockitoVersion
522521
|
523522
|Build Outputs:

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ slf4jVersion=2.0.17
1919
logbackVersion=1.5.23
2020
junitPlatformVersion=1.11.4
2121
junitJupiterVersion=5.11.4
22-
assertjVersion=3.27.6
22+
assertkVersion=0.28.1
2323
mockitoVersion=5.21.0
2424

2525
# Gradle daemon and parallel build settings

‎src/test/kotlin/cz/vutbr/fit/interlockSim/context/BresenhamJoinTest.kt‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ package cz.vutbr.fit.interlockSim.context
1212
import cz.vutbr.fit.interlockSim.objects.cells.Cell.SpatialType
1313
import cz.vutbr.fit.interlockSim.objects.cells.InOut
1414
import cz.vutbr.fit.interlockSim.objects.tracks.SimpleTrackBlock
15+
import cz.vutbr.fit.interlockSim.testutil.withMessage
1516
import cz.vutbr.fit.interlockSim.util.Point
1617
import cz.vutbr.fit.interlockSim.xml.XMLContextFactory
17-
import org.assertj.core.api.Assertions.*
18+
import assertk.assertThat
19+
import assertk.assertions.isEqualTo
20+
import assertk.assertions.isGreaterThan
21+
import assertk.assertions.isNotNull
22+
import assertk.assertions.isSameAs
1823
import org.junit.jupiter.api.BeforeEach
1924
import org.junit.jupiter.api.DisplayName
2025
import org.junit.jupiter.api.Test
@@ -56,7 +61,7 @@ class BresenhamJoinTest {
5661
for (x in 2..9) {
5762
val cell = context.getRailWayNetGrid().getCellAt(x, 5)
5863
assertThat(cell)
59-
.withFailMessage("Expected cell at ($x, 5) from horizontal Bresenham line")
64+
.withMessage("Expected cell at ($x, 5) from horizontal Bresenham line")
6065
.isNotNull()
6166
}
6267
}
@@ -82,7 +87,7 @@ class BresenhamJoinTest {
8287
for (y in 2..9) {
8388
val cell = context.getRailWayNetGrid().getCellAt(5, y)
8489
assertThat(cell)
85-
.withFailMessage("Expected cell at (5, $y) from vertical Bresenham line")
90+
.withMessage("Expected cell at (5, $y) from vertical Bresenham line")
8691
.isNotNull()
8792
}
8893
}
@@ -116,7 +121,7 @@ class BresenhamJoinTest {
116121
}
117122
// Bresenham for 45-degree line should create at least 1 of the intermediate diagonal positions
118123
assertThat(diagonalCellCount)
119-
.withFailMessage("Expected Bresenham to create cells along 45-degree diagonal from (5,5) to (12,12)")
124+
.withMessage("Expected Bresenham to create cells along 45-degree diagonal from (5,5) to (12,12)")
120125
.isGreaterThan(0)
121126
}
122127

@@ -147,7 +152,6 @@ class BresenhamJoinTest {
147152
}
148153
}
149154
assertThat(cellCount)
150-
.withFailMessage("Expected Bresenham to create multiple intermediate cells for shallow slope")
151155
.isGreaterThan(0)
152156
}
153157

@@ -177,7 +181,6 @@ class BresenhamJoinTest {
177181
}
178182
}
179183
assertThat(cellCount)
180-
.withFailMessage("Expected Bresenham to create multiple intermediate cells for steep slope")
181184
.isGreaterThan(0)
182185
}
183186

@@ -229,7 +232,7 @@ class BresenhamJoinTest {
229232
}
230233
}
231234
assertThat(cellCount)
232-
.withFailMessage("Expected Bresenham to create cells along diagonal from (10,10) to (15,15)")
235+
.withMessage("Expected Bresenham to create cells along diagonal from (10,10) to (15,15)")
233236
.isGreaterThan(0)
234237
}
235238

@@ -271,10 +274,10 @@ class BresenhamJoinTest {
271274
}
272275

273276
assertThat(count1)
274-
.withFailMessage("Expected cells in forward direction")
277+
.withMessage("Expected cells in forward direction")
275278
.isGreaterThan(0)
276279
assertThat(count2)
277-
.withFailMessage("Expected cells in reverse direction")
280+
.withMessage("Expected cells in reverse direction")
278281
.isGreaterThan(0)
279282
}
280283

‎src/test/kotlin/cz/vutbr/fit/interlockSim/context/ConcurrentSaveTest.kt‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@ package cz.vutbr.fit.interlockSim.context
1212

1313
import cz.vutbr.fit.interlockSim.testutil.TestContextBuilder
1414
import cz.vutbr.fit.interlockSim.xml.XMLContextFactory
15-
import org.assertj.core.api.Assertions.assertThat
15+
import assertk.assertThat
16+
import cz.vutbr.fit.interlockSim.testutil.exists
17+
import cz.vutbr.fit.interlockSim.testutil.isFile
18+
import cz.vutbr.fit.interlockSim.testutil.withMessage
19+
import assertk.assertions.isEmpty
20+
import assertk.assertions.isEqualTo
21+
import assertk.assertions.isGreaterThan
22+
import assertk.assertions.isNotNull
23+
import assertk.assertions.isTrue
1624
import org.junit.jupiter.api.AfterEach
1725
import org.junit.jupiter.api.DisplayName
1826
import org.junit.jupiter.api.MethodOrderer
@@ -119,10 +127,10 @@ class ConcurrentSaveTest {
119127
val completed = doneLatch.await(DEFAULT_TIMEOUT_SECONDS.toLong(), TimeUnit.SECONDS)
120128

121129
// Assert
122-
assertThat(completed).`as`("All threads should complete within timeout").isTrue()
123-
assertThat(exceptions).`as`("No exceptions should occur").isEmpty()
130+
assertThat(completed).withMessage("All threads should complete within timeout").isTrue()
131+
assertThat(exceptions).withMessage("No exceptions should occur").isEmpty()
124132
assertThat(successCount.get())
125-
.`as`("All saves should succeed")
133+
.withMessage("All saves should succeed")
126134
.isEqualTo(threadCount)
127135

128136
// Verify all files were created and are valid
@@ -174,17 +182,17 @@ class ConcurrentSaveTest {
174182
val completed = doneLatch.await(DEFAULT_TIMEOUT_SECONDS.toLong(), TimeUnit.SECONDS)
175183

176184
// Assert - Either all succeeded (with proper locking) or some failed gracefully
177-
assertThat(completed).`as`("All threads should complete").isTrue()
185+
assertThat(completed).withMessage("All threads should complete").isTrue()
178186
assertThat(successCount.get() + exceptions.size)
179-
.`as`("All threads should either succeed or fail")
187+
.withMessage("All threads should either succeed or fail")
180188
.isEqualTo(threadCount)
181189
assertThat(targetFile).exists().isFile()
182190

183191
// Most importantly: verify file integrity - should be valid XML
184192
val loaded = XMLContextFactory.getInstance().createContext(targetFile)
185193
assertThat(loaded).isNotNull()
186194
assertThat(loaded.getRailWayNetGrid())
187-
.`as`("File should contain valid context data")
195+
.withMessage("File should contain valid context data")
188196
.isNotNull()
189197
}
190198

@@ -243,11 +251,11 @@ class ConcurrentSaveTest {
243251
val completed = doneLatch.await(DEFAULT_TIMEOUT_SECONDS.toLong(), TimeUnit.SECONDS)
244252

245253
// Assert
246-
assertThat(completed).`as`("Both threads should complete").isTrue()
254+
assertThat(completed).withMessage("Both threads should complete").isTrue()
247255

248256
// At least one operation should succeed (even if they interfere)
249257
assertThat(saveSuccess.get() + modifySuccess.get())
250-
.`as`("At least one operation should succeed")
258+
.withMessage("At least one operation should succeed")
251259
.isGreaterThan(0)
252260

253261
// If save succeeded, verify file is valid XML (not corrupted)
@@ -256,7 +264,7 @@ class ConcurrentSaveTest {
256264
assertThat(loaded).isNotNull()
257265
// Should have a valid grid
258266
assertThat(loaded.getRailWayNetGrid())
259-
.`as`("File should contain valid context")
267+
.withMessage("File should contain valid context")
260268
.isNotNull()
261269
}
262270
}
@@ -304,7 +312,7 @@ class ConcurrentSaveTest {
304312

305313
// Checksum might differ due to formatting, but structure should be intact
306314
val finalChecksum = calculateChecksum(targetFile)
307-
assertThat(finalChecksum).`as`("File should still be readable").isNotNull()
315+
assertThat(finalChecksum).withMessage("File should still be readable").isNotNull()
308316
}
309317

310318
// ==================== Helper Methods ====================

‎src/test/kotlin/cz/vutbr/fit/interlockSim/context/ContextTest.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ import cz.vutbr.fit.interlockSim.objects.paths.ArrayPath
1616
import cz.vutbr.fit.interlockSim.objects.tracks.SimpleTrackBlock
1717
import cz.vutbr.fit.interlockSim.util.Point
1818
import cz.vutbr.fit.interlockSim.xml.XMLContextFactory
19-
import org.assertj.core.api.Assertions.*
19+
import assertk.assertThat
20+
import assertk.assertions.isNotNull
21+
import assertk.assertions.isNull
22+
import assertk.assertions.isSameAs
23+
import assertk.assertions.isTrue
2024
import org.junit.jupiter.api.BeforeEach
2125
import org.junit.jupiter.api.Test
2226

‎src/test/kotlin/cz/vutbr/fit/interlockSim/context/DefaultContextTest.kt‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,21 @@ import cz.vutbr.fit.interlockSim.objects.tracks.SimpleTrackBlock
1616
import cz.vutbr.fit.interlockSim.testutil.TestContextBuilder
1717
import cz.vutbr.fit.interlockSim.util.Point
1818
import cz.vutbr.fit.interlockSim.xml.XMLContextFactory
19-
import org.assertj.core.api.Assertions.*
19+
import assertk.assertThat
20+
import cz.vutbr.fit.interlockSim.testutil.assertThatCode
21+
import cz.vutbr.fit.interlockSim.testutil.containsAnyOf
22+
import cz.vutbr.fit.interlockSim.testutil.doesNotThrowAnyException
23+
import cz.vutbr.fit.interlockSim.testutil.isNotSameAs
24+
import cz.vutbr.fit.interlockSim.testutil.isSameAs
25+
import cz.vutbr.fit.interlockSim.testutil.withMessage
26+
import assertk.assertions.contains
27+
import assertk.assertions.isFalse
28+
import assertk.assertions.isEqualTo
29+
import assertk.assertions.isGreaterThan
30+
import assertk.assertions.isInstanceOf
31+
import assertk.assertions.isNotNull
32+
import assertk.assertions.isNull
33+
import assertk.assertions.isTrue
2034
import org.junit.jupiter.api.BeforeEach
2135
import org.junit.jupiter.api.DisplayName
2236
import org.junit.jupiter.api.Nested
@@ -119,10 +133,10 @@ class DefaultContextTest {
119133

120134
// Assert
121135
assertThat(context.getRailWayNetGrid().getCellAt(5, 5))
122-
.withFailMessage("Original position should be empty")
136+
.withMessage("Original position should be empty")
123137
.isNull()
124138
assertThat(context.getRailWayNetGrid().getCellAt(10, 10))
125-
.withFailMessage("New position should contain cell")
139+
.withMessage("New position should contain cell")
126140
.isSameAs(inOut)
127141
}
128142

@@ -202,7 +216,7 @@ class DefaultContextTest {
202216
assertThat(e.message).isNotNull()
203217
} catch (e: UnsupportedOperationException) {
204218
// Also acceptable - SimpleTrackBlock doesn't support getNextTrackSection
205-
assertThat(e.message).contains("SimpleTrackBlock does not support")
219+
assertThat(e.message ?: "").contains("SimpleTrackBlock does not support")
206220
}
207221
}
208222

@@ -391,8 +405,8 @@ class DefaultContextTest {
391405

392406
// Assert
393407
assertThat(context).isNotNull()
394-
assertThat(context.getRailWayNetGrid().getCellAt(1, 1)).isInstanceOf(InOut::class.java)
395-
assertThat(context.getRailWayNetGrid().getCellAt(5, 5)).isInstanceOf(InOut::class.java)
408+
assertThat(context.getRailWayNetGrid().getCellAt(1, 1)).isNotNull().isInstanceOf(InOut::class)
409+
assertThat(context.getRailWayNetGrid().getCellAt(5, 5)).isNotNull().isInstanceOf(InOut::class)
396410
}
397411

398412
@Test
@@ -404,7 +418,7 @@ class DefaultContextTest {
404418
// Assert
405419
assertThat(context).isNotNull()
406420
val semaphoreCell = context.getRailWayNetGrid().getCellAt(4, 2)
407-
assertThat(semaphoreCell).isInstanceOf(RailSemaphore::class.java)
421+
assertThat(semaphoreCell).isNotNull().isInstanceOf(RailSemaphore::class)
408422
}
409423

410424
@Test
@@ -415,7 +429,7 @@ class DefaultContextTest {
415429

416430
// Assert
417431
assertThat(context).isNotNull()
418-
assertThat(context.getRailWayNetGrid().getCellAt(1, 1)).isInstanceOf(InOut::class.java)
432+
assertThat(context.getRailWayNetGrid().getCellAt(1, 1)).isNotNull().isInstanceOf(InOut::class)
419433
}
420434

421435
@Test
@@ -431,9 +445,9 @@ class DefaultContextTest {
431445

432446
// Assert
433447
assertThat(context).isNotNull()
434-
assertThat(context.getRailWayNetGrid().getCellAt(2, 2)).isInstanceOf(InOut::class.java)
435-
assertThat(context.getRailWayNetGrid().getCellAt(5, 5)).isInstanceOf(RailSemaphore::class.java)
436-
assertThat(context.getRailWayNetGrid().getCellAt(8, 8)).isInstanceOf(InOut::class.java)
448+
assertThat(context.getRailWayNetGrid().getCellAt(2, 2)).isNotNull().isInstanceOf(InOut::class)
449+
assertThat(context.getRailWayNetGrid().getCellAt(5, 5)).isNotNull().isInstanceOf(RailSemaphore::class)
450+
assertThat(context.getRailWayNetGrid().getCellAt(8, 8)).isNotNull().isInstanceOf(InOut::class)
437451
}
438452
}
439453
}

‎src/test/kotlin/cz/vutbr/fit/interlockSim/context/PropertyChangeTest.kt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ import cz.vutbr.fit.interlockSim.objects.cells.InOut
1414
import cz.vutbr.fit.interlockSim.objects.tracks.SimpleTrackBlock
1515
import cz.vutbr.fit.interlockSim.util.Point
1616
import cz.vutbr.fit.interlockSim.xml.XMLContextFactory
17-
import org.assertj.core.api.Assertions.*
17+
import assertk.assertThat
18+
import assertk.assertions.contains
19+
import assertk.assertions.hasSize
20+
import assertk.assertions.isEmpty
21+
import assertk.assertions.isEqualTo
22+
import cz.vutbr.fit.interlockSim.testutil.containsAnyOf
23+
import cz.vutbr.fit.interlockSim.testutil.hasSizeGreaterThanOrEqualTo
1824
import org.junit.jupiter.api.BeforeEach
1925
import org.junit.jupiter.api.DisplayName
2026
import org.junit.jupiter.api.Test
@@ -87,8 +93,7 @@ class PropertyChangeTest {
8793

8894
// Verify that joinCells operation triggered at least one PropertyChange event
8995
assertThat(listener.events).hasSizeGreaterThanOrEqualTo(1)
90-
assertThat(listener.events)
91-
.extracting<String> { it.propertyName }
96+
assertThat(listener.events.map { it.propertyName })
9297
.containsAnyOf(ContextChangeListener.JOIN_CREATED, ContextChangeListener.JOIN_FAILED)
9398
}
9499

@@ -108,8 +113,7 @@ class PropertyChangeTest {
108113
context.joinCells(key1, key2, trackBlock)
109114

110115
assertThat(listener.events).hasSizeGreaterThanOrEqualTo(1)
111-
assertThat(listener.events)
112-
.extracting<String> { it.propertyName }
116+
assertThat(listener.events.map { it.propertyName })
113117
.contains(ContextChangeListener.JOIN_FAILED)
114118
}
115119

‎src/test/kotlin/cz/vutbr/fit/interlockSim/objects/cells/CellTest.kt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ package cz.vutbr.fit.interlockSim.objects.cells
1212
import cz.vutbr.fit.interlockSim.objects.cells.Cell.Segment
1313
import cz.vutbr.fit.interlockSim.objects.cells.Cell.SpatialType
1414
import cz.vutbr.fit.interlockSim.util.Point
15-
import org.assertj.core.api.Assertions.*
15+
import assertk.assertThat
16+
import cz.vutbr.fit.interlockSim.testutil.withMessage
17+
import assertk.assertions.isFalse
18+
import assertk.assertions.isNotSameAs
19+
import assertk.assertions.isSameAs
20+
import assertk.assertions.isTrue
21+
import assertk.fail
1622
import org.junit.jupiter.api.Test
1723
import java.util.EnumMap
1824

@@ -42,8 +48,8 @@ class CellTest {
4248

4349
val tr = s.transform(center)
4450
assertThat(tr).isNotSameAs(center) // Must not return same object
45-
assertThat(center == tr).`as`("transformed point is equal").isFalse()
46-
assertThat(points.values.contains(tr)).`as`("transformed point is generated twice").isFalse()
51+
assertThat(center == tr).withMessage("transformed point is equal").isFalse()
52+
assertThat(points.values.contains(tr)).withMessage("transformed point is generated twice").isFalse()
4753
points[s] = tr
4854
}
4955
}
@@ -68,7 +74,7 @@ class CellTest {
6874
val sem2 = newCell(clazz, false, t, objects)
6975

7076
assertThat(sem1.direction())
71-
.`as`("direction for class ${clazz.simpleName} and $t")
77+
.withMessage("direction for class ${clazz.simpleName} and $t")
7278
.isSameAs(Segment.anti(sem2.direction()))
7379
} catch (e: IllegalArgumentException) {
7480
val message = e.message
@@ -90,7 +96,7 @@ class CellTest {
9096
clazz == RailSemaphore::class.java -> RailSemaphore(o, t) as OrientedNodeCell
9197
clazz == InOut::class.java -> InOut("xx", o, t) as OrientedNodeCell
9298
else -> {
93-
fail<OrientedNodeCell>("Unexpected cell class: $clazz, objects: ${objects.contentToString()}")
99+
fail("Unexpected cell class: $clazz, objects: ${objects.contentToString()}")
94100
}
95101
}
96102
}

0 commit comments

Comments
 (0)