Skip to content

Commit cb9a9ac

Browse files
BixilonBixilon
committed
fix tests
1 parent 197edc7 commit cb9a9ac

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

‎src/integration-test/kotlin/de/bixilon/minosoft/data/world/chunk/ChunkSectionTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Minosoft
3-
* Copyright (C) 2020-2025 Moritz Zwerger
3+
* Copyright (C) 2020-2026 Moritz Zwerger
44
*
55
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
66
*
@@ -157,7 +157,7 @@ class ChunkSectionTest {
157157
section[InSectionPosition(2, 3, 4)] = TestBlockStates.TEST1
158158

159159
assertEquals(updates, listOf(
160-
SingleBlockUpdate(section.chunk, BlockPosition(2, 35, 4), TestBlockStates.TEST1),
160+
SingleBlockUpdate(section.chunk, BlockPosition(2, 35, 4), null, TestBlockStates.TEST1),
161161
))
162162
}
163163

@@ -170,7 +170,7 @@ class ChunkSectionTest {
170170
section[InSectionPosition(2, 3, 4)] = null
171171

172172
assertEquals(updates, listOf(
173-
SingleBlockUpdate(section.chunk, BlockPosition(2, 35, 4), null),
173+
SingleBlockUpdate(section.chunk, BlockPosition(2, 35, 4), TestBlockStates.TEST1, null),
174174
))
175175
}
176176

@@ -183,7 +183,7 @@ class ChunkSectionTest {
183183
section[InSectionPosition(2, 3, 4)] = TestBlockStates.TEST2
184184

185185
assertEquals(updates, listOf(
186-
SingleBlockUpdate(section.chunk, BlockPosition(2, 35, 4), TestBlockStates.TEST2),
186+
SingleBlockUpdate(section.chunk, BlockPosition(2, 35, 4), TestBlockStates.TEST1, TestBlockStates.TEST2),
187187
))
188188
}
189189

‎src/integration-test/kotlin/de/bixilon/minosoft/data/world/chunk/chunk/ChunkTest.kt‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Minosoft
3-
* Copyright (C) 2020-2025 Moritz Zwerger
3+
* Copyright (C) 2020-2026 Moritz Zwerger
44
*
55
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
66
*
@@ -21,12 +21,11 @@ import de.bixilon.minosoft.data.registries.dimension.DimensionProperties
2121
import de.bixilon.minosoft.data.world.World
2222
import de.bixilon.minosoft.data.world.biome.WorldBiomes
2323
import de.bixilon.minosoft.data.world.chunk.update.AbstractWorldUpdate
24-
import de.bixilon.minosoft.data.world.chunk.update.WorldUpdateEvent
2524
import de.bixilon.minosoft.data.world.chunk.update.WorldUpdateTestUtil.collectUpdates
2625
import de.bixilon.minosoft.data.world.chunk.update.block.ChunkLocalBlockUpdate
26+
import de.bixilon.minosoft.data.world.chunk.update.block.ProposedBlockChange
2727
import de.bixilon.minosoft.data.world.positions.ChunkPosition
2828
import de.bixilon.minosoft.data.world.positions.InChunkPosition
29-
import de.bixilon.minosoft.modding.event.listener.CallbackEventListener.Companion.listen
3029
import de.bixilon.minosoft.modding.event.master.EventMaster
3130
import de.bixilon.minosoft.protocol.network.session.play.PlaySession
3231
import de.bixilon.minosoft.test.ITUtil.allocate
@@ -52,23 +51,23 @@ class ChunkTest {
5251

5352
fun `apply single update`() {
5453
val chunk = create()
55-
chunk.apply(ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), TestBlockStates.TEST1))
54+
chunk.apply(ProposedBlockChange(InChunkPosition(1, 2, 3), TestBlockStates.TEST1))
5655

5756
assertEquals(chunk[InChunkPosition(1, 2, 3)], TestBlockStates.TEST1)
5857
}
5958

6059
fun `apply single update with block entity`() {
6160
val chunk = create()
62-
chunk.apply(ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), TestBlockStates.ENTITY1))
61+
chunk.apply(ProposedBlockChange(InChunkPosition(1, 2, 3), TestBlockStates.ENTITY1))
6362

6463
assertTrue(chunk.getBlockEntity(InChunkPosition(1, 2, 3)) is TestBlockEntities.TestBlockEntity)
6564
}
6665

6766
fun `apply multiple updates`() {
6867
val chunk = create()
6968
chunk.apply(
70-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), TestBlockStates.TEST1),
71-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 30, 3), TestBlockStates.TEST2),
69+
ProposedBlockChange(InChunkPosition(1, 2, 3), TestBlockStates.TEST1),
70+
ProposedBlockChange(InChunkPosition(1, 30, 3), TestBlockStates.TEST2),
7271
)
7372

7473
assertEquals(chunk[InChunkPosition(1, 2, 3)], TestBlockStates.TEST1)
@@ -78,8 +77,8 @@ class ChunkTest {
7877
fun `apply multiple updates with entities`() {
7978
val chunk = create()
8079
chunk.apply(
81-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), TestBlockStates.ENTITY1),
82-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 30, 3), TestBlockStates.ENTITY2),
80+
ProposedBlockChange(InChunkPosition(1, 2, 3), TestBlockStates.ENTITY1),
81+
ProposedBlockChange(InChunkPosition(1, 30, 3), TestBlockStates.ENTITY2),
8382
)
8483

8584
assertTrue(chunk.getBlockEntity(InChunkPosition(1, 2, 3)) is TestBlockEntities.TestBlockEntity)
@@ -89,8 +88,8 @@ class ChunkTest {
8988
fun `don't create section if just clearing blocks`() {
9089
val chunk = create()
9190
chunk.apply(
92-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), null),
93-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 5, 3), null),
91+
ProposedBlockChange(InChunkPosition(1, 2, 3), null),
92+
ProposedBlockChange(InChunkPosition(1, 5, 3), null),
9493
)
9594

9695
assertNull(chunk[0])
@@ -99,13 +98,16 @@ class ChunkTest {
9998
fun `trigger update event`() {
10099
val chunk = create()
101100
val updates = setOf(
102-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), TestBlockStates.TEST1),
103-
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 30, 3), TestBlockStates.TEST2),
101+
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), null, TestBlockStates.TEST1),
102+
ChunkLocalBlockUpdate.Change(InChunkPosition(1, 30, 3), null, TestBlockStates.TEST2),
104103
)
105104

106105
val events = chunk.world.collectUpdates()
107106

108-
chunk.apply(*updates.toTypedArray())
107+
chunk.apply(
108+
ProposedBlockChange(InChunkPosition(1, 2, 3), TestBlockStates.TEST1),
109+
ProposedBlockChange(InChunkPosition(1, 30, 3), TestBlockStates.TEST2),
110+
)
109111

110112

111113
assertEquals(events, listOf(
@@ -116,8 +118,9 @@ class ChunkTest {
116118
fun `trigger update event only changes`() {
117119
val chunk = create()
118120

119-
val update1 = ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), TestBlockStates.TEST1)
120-
val update2 = ChunkLocalBlockUpdate.Change(InChunkPosition(1, 30, 3), TestBlockStates.TEST2)
121+
val update1 = ProposedBlockChange(InChunkPosition(1, 2, 3), TestBlockStates.TEST1)
122+
val actual1 = ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), null, TestBlockStates.TEST1)
123+
val update2 = ProposedBlockChange(InChunkPosition(1, 30, 3), TestBlockStates.TEST2)
121124

122125
chunk.apply(update2)
123126

@@ -128,15 +131,15 @@ class ChunkTest {
128131

129132

130133
assertEquals(updates, listOf(
131-
ChunkLocalBlockUpdate(chunk, setOf(update1)),
134+
ChunkLocalBlockUpdate(chunk, setOf(actual1)),
132135
))
133136
}
134137

135138
fun `trigger update event without changes`() {
136139
val chunk = create()
137140

138-
val update1 = ChunkLocalBlockUpdate.Change(InChunkPosition(1, 2, 3), TestBlockStates.TEST1)
139-
val update2 = ChunkLocalBlockUpdate.Change(InChunkPosition(1, 30, 3), TestBlockStates.TEST2)
141+
val update1 = ProposedBlockChange(InChunkPosition(1, 2, 3), TestBlockStates.TEST1)
142+
val update2 = ProposedBlockChange(InChunkPosition(1, 30, 3), TestBlockStates.TEST2)
140143

141144
chunk.apply(update1); chunk.apply(update2)
142145

0 commit comments

Comments
 (0)