Skip to content

Commit 490107b

Browse files
committed
Fix tests due to world folder format changes
1 parent 122e351 commit 490107b

3 files changed

Lines changed: 24 additions & 1 deletion

File tree

src/test/java/org/mvplugins/multiverse/core/mock/MVServerMock.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public World createWorld(@NotNull WorldCreator creator) {
3939
world.getWorldFolder().mkdirs();
4040
createFile(new File(world.getWorldFolder(), "uid.dat"));
4141
createFile(new File(world.getWorldFolder(), "level.dat"));
42+
new File(world.getWorldFolder(), "region").mkdir();
43+
new File(world.getWorldFolder(), "data").mkdir();
4244
addWorld(world);
4345
return world;
4446
}

src/test/java/org/mvplugins/multiverse/core/world/WorldManagerTest.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ import org.hamcrest.MatcherAssert.assertThat
77
import org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventClassMatcher.hasFiredEventInstance
88
import org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventClassMatcher.hasNotFiredEventInstance
99
import org.mvplugins.multiverse.core.TestWithMockBukkit
10-
import org.mvplugins.multiverse.core.event.world.*
10+
import org.mvplugins.multiverse.core.event.world.MVWorldClonedEvent
11+
import org.mvplugins.multiverse.core.event.world.MVWorldCreatedEvent
12+
import org.mvplugins.multiverse.core.event.world.MVWorldDeleteEvent
13+
import org.mvplugins.multiverse.core.event.world.MVWorldImportedEvent
14+
import org.mvplugins.multiverse.core.event.world.MVWorldLoadedEvent
15+
import org.mvplugins.multiverse.core.event.world.MVWorldPropertyChangedEvent
16+
import org.mvplugins.multiverse.core.event.world.MVWorldRegeneratedEvent
17+
import org.mvplugins.multiverse.core.event.world.MVWorldRemovedEvent
18+
import org.mvplugins.multiverse.core.event.world.MVWorldUnloadedEvent
1119
import org.mvplugins.multiverse.core.world.options.CloneWorldOptions
1220
import org.mvplugins.multiverse.core.world.options.CreateWorldOptions
1321
import org.mvplugins.multiverse.core.world.options.DeleteWorldOptions
@@ -190,6 +198,8 @@ class WorldManagerTest : TestWithMockBukkit() {
190198
fun `Load world failed - world folder exists but not imported`() {
191199
File(Bukkit.getWorldContainer(), "worldfolder").mkdir()
192200
File(Bukkit.getWorldContainer(), "worldfolder/level.dat").createNewFile()
201+
File(Bukkit.getWorldContainer(), "worldfolder/data").mkdir()
202+
File(Bukkit.getWorldContainer(), "worldfolder/region").mkdir()
193203
assertEquals(
194204
LoadFailureReason.WORLD_EXIST_FOLDER,
195205
worldManager.loadWorld("worldfolder").failureReason
@@ -270,8 +280,10 @@ class WorldManagerTest : TestWithMockBukkit() {
270280
fun `Get potential worlds`() {
271281
File(Bukkit.getWorldContainer(), "newworld1").mkdir()
272282
File(Bukkit.getWorldContainer(), "newworld1/level.dat").createNewFile()
283+
File(Bukkit.getWorldContainer(), "newworld1/data").mkdir()
273284
File(Bukkit.getWorldContainer(), "newworld2").mkdir()
274285
File(Bukkit.getWorldContainer(), "newworld2/level.dat").createNewFile()
286+
File(Bukkit.getWorldContainer(), "newworld2/data").mkdir()
275287
assertEquals(setOf("newworld1", "newworld2"), worldManager.getPotentialWorlds().toSet())
276288
}
277289

src/test/java/org/mvplugins/multiverse/core/world/WorldNameCheckerTest.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ class WorldNameCheckerTest : TestWithMockBukkit() {
4545
fun `Valid world folder`() {
4646
File(Bukkit.getWorldContainer(), "test").mkdir()
4747
File(Bukkit.getWorldContainer(), "test/level.dat").createNewFile()
48+
File(Bukkit.getWorldContainer(), "test/data").mkdir()
49+
assertEquals(WorldNameChecker.FolderStatus.VALID, worldNameChecker.checkFolder("test"))
50+
}
51+
52+
@Test
53+
fun `Valid world folder v26-1 format`() {
54+
File(Bukkit.getWorldContainer(), "test").mkdir()
55+
File(Bukkit.getWorldContainer(), "test/region").mkdir()
56+
File(Bukkit.getWorldContainer(), "test/data").mkdir()
4857
assertEquals(WorldNameChecker.FolderStatus.VALID, worldNameChecker.checkFolder("test"))
4958
}
5059

0 commit comments

Comments
 (0)