From 77ee1ebbc008e5d8bf26ca291c0bbf6ade9d3699 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 28 Sep 2017 15:35:58 +1300
Subject: [PATCH] Fixed faulty tests.

---
 src/main/java/seng302/visualiser/MapMaker.java             | 2 +-
 src/test/java/seng302/serverDiscovery/ServerTableTest.java | 3 ++-
 src/test/java/steps/CustomMapsSteps.java                   | 7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/visualiser/MapMaker.java b/src/main/java/seng302/visualiser/MapMaker.java
index 5bda5b7e..946d36e6 100644
--- a/src/main/java/seng302/visualiser/MapMaker.java
+++ b/src/main/java/seng302/visualiser/MapMaker.java
@@ -35,7 +35,7 @@ public class MapMaker {
     private XMLGenerator xmlGenerator = new XMLGenerator();
 
     private List<String> maps = new ArrayList<>(
-        Arrays.asList("default.xml", "horseshoe.xml", "madagascar.xml", "loop.xml"));
+        Arrays.asList("default.xml", "horseshoe.xml", "loop.xml", "madagascar.xml"));
 
     public static MapMaker getInstance() {
         if (instance == null) {
diff --git a/src/test/java/seng302/serverDiscovery/ServerTableTest.java b/src/test/java/seng302/serverDiscovery/ServerTableTest.java
index 320b1ad4..0f3e7cf4 100644
--- a/src/test/java/seng302/serverDiscovery/ServerTableTest.java
+++ b/src/test/java/seng302/serverDiscovery/ServerTableTest.java
@@ -48,9 +48,10 @@ public class ServerTableTest {
 
         serverTable.addServer(listing);
 
+        listing.decrementTtl();
         listing.decrementTtl();
 
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         assertTrue(!serverTable.getAllServers().contains(listing));
     }
diff --git a/src/test/java/steps/CustomMapsSteps.java b/src/test/java/steps/CustomMapsSteps.java
index 42e9314b..c8e5a3ce 100644
--- a/src/test/java/steps/CustomMapsSteps.java
+++ b/src/test/java/steps/CustomMapsSteps.java
@@ -3,6 +3,9 @@ package steps;
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.Then;
 import java.io.File;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Comparator;
 import org.junit.Assert;
 import seng302.visualiser.MapMaker;
 
@@ -29,11 +32,11 @@ public class CustomMapsSteps {
     @Then("^all of them can be seen$")
     public void all_of_them_can_be_seen() throws Throwable {
         File[] files = new File(this.getClass().getResource("/maps/").getPath()).listFiles();
+        Arrays.sort(files);
         for (File file : files) {
             if (file.isFile()) {
-                Assert.assertTrue(file.getAbsolutePath().equals(mapMaker.getCurrentRacePath()));
+                Assert.assertTrue(file.getAbsolutePath().endsWith(mapMaker.getCurrentRacePath()));
                 mapMaker.next();
-                System.out.println(file.getAbsolutePath());
             }
         }
     }