Skip to content

Commit bd549ff

Browse files
CopilotbedaHovorka
Copilot
and
bedaHovorka
committed
Fix deprecated AssertK methods
Co-authored-by: bedaHovorka <5263405+bedaHovorka@users.noreply.github.com>
1 parent 1ceed76 commit bd549ff

10 files changed

Lines changed: 66 additions & 83 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import assertk.assertThat
1313
import assertk.assertions.isEqualTo
1414
import assertk.assertions.isGreaterThan
1515
import assertk.assertions.isNotNull
16-
import assertk.assertions.isSameAs
16+
import assertk.assertions.isSameInstanceAs
1717
import cz.vutbr.fit.interlockSim.objects.cells.Cell.SpatialType
1818
import cz.vutbr.fit.interlockSim.objects.cells.InOut
1919
import cz.vutbr.fit.interlockSim.objects.tracks.SimpleTrackBlock
@@ -202,8 +202,8 @@ class BresenhamJoinTest {
202202

203203
// Assert - No intermediate cells should be created (direct join)
204204
// The grid should only contain the two endpoint cells
205-
assertThat(context.getRailWayNetGrid().getCellAt(5, 5)).isSameAs(inA)
206-
assertThat(context.getRailWayNetGrid().getCellAt(6, 5)).isSameAs(inB)
205+
assertThat(context.getRailWayNetGrid().getCellAt(5, 5)).isSameInstanceAs(inA)
206+
assertThat(context.getRailWayNetGrid().getCellAt(6, 5)).isSameInstanceAs(inB)
207207
}
208208

209209
@Test

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package cz.vutbr.fit.interlockSim.context
1212
import assertk.assertThat
1313
import assertk.assertions.isNotNull
1414
import assertk.assertions.isNull
15-
import assertk.assertions.isSameAs
15+
import assertk.assertions.isSameInstanceAs
1616
import assertk.assertions.isTrue
1717
import cz.vutbr.fit.interlockSim.objects.cells.Cell.SpatialType
1818
import cz.vutbr.fit.interlockSim.objects.cells.InOut
@@ -53,8 +53,8 @@ class ContextTest {
5353
@Test
5454
fun testGetNextTrackBlock() {
5555
// When current is null, should return the first connected track block
56-
assertThat(context.getNextTrackBlock(inA, null)).isSameAs(tl)
57-
assertThat(context.getNextTrackBlock(outB, null)).isSameAs(tl)
56+
assertThat(context.getNextTrackBlock(inA, null)).isSameInstanceAs(tl)
57+
assertThat(context.getNextTrackBlock(outB, null)).isSameInstanceAs(tl)
5858

5959
// When current is a track block, the method tries to find the next segment
6060
// But with SimpleTrackBlock which only has one section, there is no following segment
@@ -71,10 +71,10 @@ class ContextTest {
7171
// When current is null, getNextTrackSection gets the first track block
7272
// and calls getNextTrackSection on it with null, which returns the block itself
7373
val nextFromA = context.getNextTrackSection(inA, null)
74-
assertThat(nextFromA).isSameAs(tl)
74+
assertThat(nextFromA).isSameInstanceAs(tl)
7575

7676
val nextFromB = context.getNextTrackSection(outB, null)
77-
assertThat(nextFromB).isSameAs(tl)
77+
assertThat(nextFromB).isSameInstanceAs(tl)
7878

7979
// When current is a track section (the SimpleTrackBlock acts as its own section),
8080
// SimpleTrackBlock.getNextTrackSection() returns null because it only has one section

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import assertk.assertions.isGreaterThan
1717
import assertk.assertions.isInstanceOf
1818
import assertk.assertions.isNotNull
1919
import assertk.assertions.isNull
20+
import assertk.assertions.isSameInstanceAs
21+
import assertk.assertions.isNotSameInstanceAs
2022
import assertk.assertions.isTrue
2123
import cz.vutbr.fit.interlockSim.objects.cells.Cell.SpatialType
2224
import cz.vutbr.fit.interlockSim.objects.cells.InOut
@@ -26,8 +28,6 @@ import cz.vutbr.fit.interlockSim.testutil.TestContextBuilder
2628
import cz.vutbr.fit.interlockSim.testutil.assertThatCode
2729
import cz.vutbr.fit.interlockSim.testutil.containsAnyOf
2830
import cz.vutbr.fit.interlockSim.testutil.doesNotThrowAnyException
29-
import cz.vutbr.fit.interlockSim.testutil.isNotSameAs
30-
import cz.vutbr.fit.interlockSim.testutil.isSameAs
3131
import cz.vutbr.fit.interlockSim.testutil.withMessage
3232
import cz.vutbr.fit.interlockSim.util.Point
3333
import cz.vutbr.fit.interlockSim.xml.XMLContextFactory
@@ -72,7 +72,7 @@ class DefaultContextTest {
7272

7373
// Assert
7474
val retrievedCell = context.getRailWayNetGrid().getCellAt(5, 5)
75-
assertThat(retrievedCell).isSameAs(inOut)
75+
assertThat(retrievedCell).isSameInstanceAs(inOut)
7676
}
7777

7878
@Test
@@ -89,7 +89,8 @@ class DefaultContextTest {
8989

9090
// Assert
9191
val retrievedCell = context.getRailWayNetGrid().getCellAt(5, 5)
92-
assertThat(retrievedCell).isSameAs(second).isNotSameAs(first)
92+
assertThat(retrievedCell).isSameInstanceAs(second)
93+
assertThat(retrievedCell).isNotSameInstanceAs(first)
9394
}
9495

9596
@Test
@@ -137,7 +138,7 @@ class DefaultContextTest {
137138
.isNull()
138139
assertThat(context.getRailWayNetGrid().getCellAt(10, 10))
139140
.withMessage("New position should contain cell")
140-
.isSameAs(inOut)
141+
.isSameInstanceAs(inOut)
141142
}
142143

143144
@Test
@@ -190,8 +191,8 @@ class DefaultContextTest {
190191
@Test
191192
@DisplayName("getNextTrackBlock from InOut with null returns block")
192193
fun getNextTrackBlock_fromInOutWithNull_returnsTrackBlock() {
193-
assertThat(context.getNextTrackBlock(inA, null)).isSameAs(tl1)
194-
assertThat(context.getNextTrackBlock(outB, null)).isSameAs(tl2)
194+
assertThat(context.getNextTrackBlock(inA, null)).isSameInstanceAs(tl1)
195+
assertThat(context.getNextTrackBlock(outB, null)).isSameInstanceAs(tl2)
195196
}
196197

197198
@Test

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ package cz.vutbr.fit.interlockSim.objects.cells
1111

1212
import assertk.assertThat
1313
import assertk.assertions.isFalse
14-
import assertk.assertions.isNotSameAs
15-
import assertk.assertions.isSameAs
14+
import assertk.assertions.isNotSameInstanceAs
15+
import assertk.assertions.isSameInstanceAs
1616
import assertk.assertions.isTrue
1717
import assertk.fail
1818
import cz.vutbr.fit.interlockSim.objects.cells.Cell.Segment
@@ -41,13 +41,13 @@ class CellTest {
4141
val dx = s.dx
4242
val dy = s.dy
4343

44-
assertThat(Segment.segmentFor(dx, dy)).isSameAs(s)
44+
assertThat(Segment.segmentFor(dx, dy)).isSameInstanceAs(s)
4545

46-
assertThat(Segment.anti(Segment.anti(s))).isSameAs(s)
46+
assertThat(Segment.anti(Segment.anti(s))).isSameInstanceAs(s)
4747
assertThat(Segment.conflict(s, s)).isTrue()
4848

4949
val tr = s.transform(center)
50-
assertThat(tr).isNotSameAs(center) // Must not return same object
50+
assertThat(tr).isNotSameInstanceAs(center) // Must not return same object
5151
assertThat(center == tr).withMessage("transformed point is equal").isFalse()
5252
assertThat(points.values.contains(tr)).withMessage("transformed point is generated twice").isFalse()
5353
points[s] = tr
@@ -75,7 +75,7 @@ class CellTest {
7575

7676
assertThat(sem1.direction())
7777
.withMessage("direction for class ${clazz.simpleName} and $t")
78-
.isSameAs(Segment.anti(sem2.direction()))
78+
.isSameInstanceAs(Segment.anti(sem2.direction()))
7979
} catch (e: IllegalArgumentException) {
8080
val message = e.message
8181
if (message != null && message == RailSwitch.UNSUPORTED_SWITCH_TYPES_MESSAGE) {

‎src/test/kotlin/cz/vutbr/fit/interlockSim/sim/GeneratorTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import assertk.assertThat
1414
import assertk.assertions.isEqualTo
1515
import assertk.assertions.isGreaterThan
1616
import assertk.assertions.isNotNull
17-
import assertk.assertions.isNotSameAs
17+
import assertk.assertions.isNotSameInstanceAs
1818
import cz.vutbr.fit.interlockSim.testutil.MockSimulationContext
1919
import cz.vutbr.fit.interlockSim.testutil.TestContextBuilder
2020
import org.junit.jupiter.api.BeforeEach
@@ -267,7 +267,7 @@ class GeneratorTest {
267267
assertThat(random1).isNotNull()
268268
assertThat(random2).isNotNull()
269269
// Different instances (not same object reference)
270-
assertThat(random1).isNotSameAs(random2)
270+
assertThat(random1).isNotSameInstanceAs(random2)
271271
}
272272
}
273273

‎src/test/kotlin/cz/vutbr/fit/interlockSim/sim/InOutWorkerTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import assertk.assertions.isEqualTo
1414
import assertk.assertions.isFailure
1515
import assertk.assertions.isInstanceOf
1616
import assertk.assertions.isNotNull
17-
import assertk.assertions.isNotSameAs
18-
import assertk.assertions.isSameAs
17+
import assertk.assertions.isNotSameInstanceAs
18+
import assertk.assertions.isSameInstanceAs
1919
import assertk.assertions.isTrue
2020
import cz.vutbr.fit.interlockSim.context.DefaultContext
2121
import cz.vutbr.fit.interlockSim.context.SimulationContext
@@ -141,7 +141,7 @@ class InOutWorkerTest {
141141

142142
assertThat(queue1)
143143
.withMessage("Multiple getQueqe calls should return same instance")
144-
.isSameAs(queue2)
144+
.isSameInstanceAs(queue2)
145145
}
146146
}
147147

@@ -329,8 +329,8 @@ class InOutWorkerTest {
329329

330330
assertThat(workerA).isNotNull()
331331
assertThat(workerB).isNotNull()
332-
assertThat(workerA).isNotSameAs(workerB)
333-
assertThat(workerA.getQueqe()).isNotSameAs(workerB.getQueqe())
332+
assertThat(workerA).isNotSameInstanceAs(workerB)
333+
assertThat(workerA.getQueqe()).isNotSameInstanceAs(workerB.getQueqe())
334334
}
335335
}
336336
}

‎src/test/kotlin/cz/vutbr/fit/interlockSim/testutil/AssertKExtensions.kt‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -107,32 +107,6 @@ fun <T> Assert<Collection<T>>.containsAnyOf(vararg elements: T) =
107107
expected("to contain any of:${show(elements.toList())} but was:${show(actual)}")
108108
}
109109

110-
/**
111-
* Extension function to assert that two objects are the same instance.
112-
*
113-
* Usage: assertThat(obj1).isSameAs(obj2)
114-
*/
115-
fun <T> Assert<T>.isSameAs(expected: T): Assert<T> =
116-
apply {
117-
given { actual ->
118-
if (actual === expected) return@given
119-
expected("to be the same instance as:${show(expected)} but was:${show(actual)}")
120-
}
121-
}
122-
123-
/**
124-
* Extension function to assert that two objects are not the same instance.
125-
*
126-
* Usage: assertThat(obj1).isNotSameAs(obj2)
127-
*/
128-
fun <T> Assert<T>.isNotSameAs(expected: T): Assert<T> =
129-
apply {
130-
given { actual ->
131-
if (actual !== expected) return@given
132-
expected("to not be the same instance as:${show(expected)}")
133-
}
134-
}
135-
136110
/**
137111
* Extension function to assert that a block of code executes without throwing an exception.
138112
*

‎src/test/kotlin/cz/vutbr/fit/interlockSim/util/HashMapGraphTest.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,11 @@ class HashMapGraphTest {
224224
graph.put("A", "D", 200)
225225
graph.put("B", "C", 250)
226226

227+
@Suppress("UNCHECKED_CAST")
227228
val removed = graph.removeAll("A") as Collection<Int>
228229

229230
assertThat(removed).hasSize(3)
231+
@Suppress("UNCHECKED_CAST")
230232
assertThat(removed as Iterable<Int>).containsExactlyInAnyOrder(100, 150, 200)
231233
assertThat(graph.get("A", "B")).isNull()
232234
assertThat(graph.get("A", "C")).isNull()
@@ -239,9 +241,11 @@ class HashMapGraphTest {
239241
graph.put("A", "B", 100)
240242
graph.put("C", "D", 200)
241243

244+
@Suppress("UNCHECKED_CAST")
242245
val nodes = graph.remove(100) as Collection<String>
243246

244247
assertThat(nodes).hasSize(2)
248+
@Suppress("UNCHECKED_CAST")
245249
assertThat(nodes as Iterable<String>).containsExactlyInAnyOrder("A", "B")
246250
assertThat(graph.get("A", "B")).isNull()
247251
assertThat(graph.get("C", "D")).withMessage("Other edges should remain").isEqualTo(200)
@@ -253,9 +257,11 @@ class HashMapGraphTest {
253257
graph.put("C", "D", 100)
254258
graph.put("E", "F", 200)
255259

260+
@Suppress("UNCHECKED_CAST")
256261
val nodes = graph.remove(100) as Collection<String>
257262

258263
assertThat(nodes).hasSize(4)
264+
@Suppress("UNCHECKED_CAST")
259265
assertThat(nodes as Iterable<String>).containsExactlyInAnyOrder("A", "B", "C", "D")
260266
assertThat(graph.get("E", "F")).withMessage("Edge with different value should remain").isEqualTo(200)
261267
}
@@ -270,6 +276,7 @@ class HashMapGraphTest {
270276
graph.put("A", "C", 150)
271277
graph.put("B", "C", 200)
272278

279+
@Suppress("UNCHECKED_CAST")
273280
val edges = graph.get("A") as Collection<Int>
274281

275282
assertThat(edges).hasSize(2)
@@ -291,6 +298,7 @@ class HashMapGraphTest {
291298
graph.put("B", "C", 150)
292299
graph.put("C", "D", 200)
293300

301+
@Suppress("UNCHECKED_CAST")
294302
val values = graph.values() as Collection<Int>
295303

296304
assertThat(values).hasSize(3)
@@ -319,7 +327,9 @@ class HashMapGraphTest {
319327
graph.put("A", "D", 3)
320328
graph.put("A", "E", 4)
321329

330+
@Suppress("UNCHECKED_CAST")
322331
assertThat(graph.get("A") as Collection<Int>).hasSize(4)
332+
@Suppress("UNCHECKED_CAST")
323333
assertThat(graph.nodeSet() as Iterable<String>).containsExactlyInAnyOrder("A", "B", "C", "D", "E")
324334
assertThat(graph.size()).isEqualTo(4)
325335
}

0 commit comments

Comments
 (0)