From edb999578a887fb4967ce2a15630a3dfd3c11421 Mon Sep 17 00:00:00 2001
From: Eric Stokes <fernferret@gmail.com>
Date: Sat, 15 Oct 2011 08:20:29 -0600
Subject: [PATCH] Seperated MockWorld tests

---
 .../MultiverseCore/test/TestMockWorld.java    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/onarandombox/MultiverseCore/test/TestMockWorld.java b/src/test/java/com/onarandombox/MultiverseCore/test/TestMockWorld.java
index fe0dd50d..54ad5407 100644
--- a/src/test/java/com/onarandombox/MultiverseCore/test/TestMockWorld.java
+++ b/src/test/java/com/onarandombox/MultiverseCore/test/TestMockWorld.java
@@ -2,36 +2,47 @@ package com.onarandombox.MultiverseCore.test;
 
 import junit.framework.Assert;
 import org.bukkit.World;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @RunWith(PowerMockRunner.class)
 public class TestMockWorld {
     private World mockWorld;
     private World mockNetherWorld;
-    @Test
-    public void testWorldInit() {
+
+    @Before
+    public void setUp() throws Exception {
         // Initialize a fake world and world_nether.
-        this.mockWorld = PowerMockito.mock(World.class);
+        this.mockWorld = mock(World.class);
         when(this.mockWorld.getName()).thenReturn("world");
         when(this.mockWorld.getEnvironment()).thenReturn(World.Environment.NORMAL);
 
-        this.mockNetherWorld = PowerMockito.mock(World.class);
+        this.mockNetherWorld = mock(World.class);
         when(this.mockNetherWorld.getName()).thenReturn("world_nether");
         when(this.mockNetherWorld.getEnvironment()).thenReturn(World.Environment.NETHER);
+    }
 
+    @Test
+    public void testWorldInit() {
+        Assert.assertNotNull(this.mockWorld);
+        Assert.assertNotNull(this.mockNetherWorld);
+    }
+
+    @Test
+    public void testWorldNames() {
         // Test the mock world objects
         Assert.assertEquals(this.mockWorld.getName(), "world");
         Assert.assertEquals(this.mockNetherWorld.getName(), "world_nether");
         verify(this.mockWorld).getName();
         verify(this.mockNetherWorld).getName();
+    }
 
+    @Test
+    public void testWorldEnvironments() {
         // Test the environments
         Assert.assertEquals(this.mockWorld.getEnvironment(), World.Environment.NORMAL);
         Assert.assertEquals(this.mockNetherWorld.getEnvironment(), World.Environment.NETHER);