From 8fdc0ad3dad96e6c5a420bafa97ce91e9abfb878 Mon Sep 17 00:00:00 2001
From: rlf <rasmus@lockfuglsang.dk>
Date: Sat, 19 Nov 2016 13:51:11 -0700
Subject: [PATCH] Fixed failing tests (thanks @rlf)

* This is the test fixing portion of PR#1746
* This fixes using a HashMap and relying on the order of the values.
---
 .../MultiverseCore/TestWorldProperties.java           |  7 +++++++
 .../MultiverseCore/utils/MockWorldFactory.java        | 11 +++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
index bf53b71d..b73116c3 100644
--- a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
+++ b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
@@ -104,6 +104,9 @@ public class TestWorldProperties {
         verify(mockCommandSender).sendMessage("Starting import of world 'world'...");
         verify(mockCommandSender).sendMessage(ChatColor.GREEN + "Complete!");
 
+        assertEquals(core.getServer().getWorlds().size(), 1);
+        assertEquals(core.getServer().getWorlds().get(0).getName(), "world");
+
         // Import a second world
         String[] netherArgs = new String[] { "import", "world_nether", "nether" };
         core.onCommand(mockCommandSender, mockCommand, "", netherArgs);
@@ -111,6 +114,10 @@ public class TestWorldProperties {
         verify(mockCommandSender, VerificationModeFactory.times(2)).sendMessage(
                 ChatColor.GREEN + "Complete!");
 
+        assertEquals(core.getServer().getWorlds().size(), 2);
+        assertEquals(core.getServer().getWorlds().get(0).getName(), "world");
+        assertEquals(core.getServer().getWorlds().get(1).getName(), "world_nether");
+
         // ////////////////////////////////////////////////
         // let's set some world-properties
         // we can test the API with this, too :D
diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java b/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java
index fb2223cc..c5b68069 100644
--- a/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java
+++ b/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java
@@ -24,12 +24,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.WeakHashMap;
+import java.util.LinkedHashMap;
 
 import static org.mockito.Mockito.*;
 
 public class MockWorldFactory {
 
-    private static final Map<String, World> createdWorlds = new HashMap<String, World>();
+    private static final Map<String, World> createdWorlds = new LinkedHashMap<String, World>();
     private static final Map<UUID, World> worldUIDS = new HashMap<UUID, World>();
 
     private static final Map<World, Boolean> pvpStates = new WeakHashMap<World, Boolean>();
@@ -212,13 +213,7 @@ public class MockWorldFactory {
     }
 
     public static List<World> getWorlds() {
-        // we have to invert the order!
-        ArrayList<World> myList = new ArrayList<World>(createdWorlds.values());
-        List<World> retList = new ArrayList<World>();
-        for (int i = (myList.size() - 1); i >= 0; i--) {
-            retList.add(myList.get(i));
-        }
-        return retList;
+        return new ArrayList<World>(createdWorlds.values());
     }
 
     public static void clearWorlds() {