From abf6645620e92539c8c70533d1ea01a3002b5c94 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Wed, 29 Jun 2016 22:31:10 +0700
Subject: [PATCH] Fix test

---
 .../authme/util/TeleportationServiceTest.java | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/test/java/fr/xephi/authme/util/TeleportationServiceTest.java b/src/test/java/fr/xephi/authme/util/TeleportationServiceTest.java
index ad9d9620..de8d286f 100644
--- a/src/test/java/fr/xephi/authme/util/TeleportationServiceTest.java
+++ b/src/test/java/fr/xephi/authme/util/TeleportationServiceTest.java
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 /**
  * Test for {@link TeleportationService}.
  */
+// TODO: Correct me!
 @RunWith(MockitoJUnitRunner.class)
 public class TeleportationServiceTest {
 
@@ -56,6 +57,20 @@ public class TeleportationServiceTest {
     @Mock
     private PlayerCache playerCache;
 
+    // We check that the World in Location is set, this method creates a mock World in Location for us
+    private static Location mockLocation() {
+        Location location = mock(Location.class);
+        given(location.getWorld()).willReturn(mock(World.class));
+        return location;
+    }
+
+    private static PlayerAuth createAuthWithLocation() {
+        return PlayerAuth.builder()
+            .name("bobby")
+            .locX(123.45).locY(23.4).locZ(-4.567)
+            .build();
+    }
+
     @Before
     public void setUpForcedWorlds() {
         given(settings.getProperty(RestrictionSettings.FORCE_SPAWN_ON_WORLDS))
@@ -113,7 +128,7 @@ public class TeleportationServiceTest {
         given(spawnLoader.getSpawnLocation(player)).willReturn(spawn);
 
         // when
-        teleportationService.teleportOnJoin(player);
+        teleportationService.teleportOnLoginEvent(player);
         runSyncDelayedTask(bukkitService);
 
         // then
@@ -135,6 +150,7 @@ public class TeleportationServiceTest {
         given(spawnLoader.getFirstSpawn()).willReturn(null);
 
         // when
+        teleportationService.teleportOnLoginEvent(player);
         teleportationService.teleportOnJoin(player);
 
         // then
@@ -161,6 +177,7 @@ public class TeleportationServiceTest {
         given(spawnLoader.getSpawnLocation(player)).willReturn(spawn);
 
         // when
+        teleportationService.teleportOnLoginEvent(player);
         teleportationService.teleportOnJoin(player);
         runSyncDelayedTask(bukkitService);
 
@@ -189,6 +206,7 @@ public class TeleportationServiceTest {
         }).when(bukkitService).callEvent(any(SpawnTeleportEvent.class));
 
         // when
+        teleportationService.teleportOnLoginEvent(player);
         teleportationService.teleportOnJoin(player);
         runSyncDelayedTask(bukkitService);
 
@@ -216,6 +234,7 @@ public class TeleportationServiceTest {
         }).when(bukkitService).callEvent(any(SpawnTeleportEvent.class));
 
         // when
+        teleportationService.teleportOnLoginEvent(player);
         teleportationService.teleportOnJoin(player);
         runSyncDelayedTask(bukkitService);
 
@@ -224,7 +243,6 @@ public class TeleportationServiceTest {
         verify(player, never()).teleport(any(Location.class));
     }
 
-
     // ---------
     // LOGIN
     // ---------
@@ -397,21 +415,6 @@ public class TeleportationServiceTest {
         verify(player).teleport(location);
     }
 
-
-    // We check that the World in Location is set, this method creates a mock World in Location for us
-    private static Location mockLocation() {
-        Location location = mock(Location.class);
-        given(location.getWorld()).willReturn(mock(World.class));
-        return location;
-    }
-
-    private static PlayerAuth createAuthWithLocation() {
-        return PlayerAuth.builder()
-            .name("bobby")
-            .locX(123.45).locY(23.4).locZ(-4.567)
-            .build();
-    }
-
     private void assertCorrectLocation(Location location, PlayerAuth auth, World world) {
         assertThat(location.getX(), equalTo(auth.getQuitLocX()));
         assertThat(location.getY(), equalTo(auth.getQuitLocY()));