1 files changed, 3 insertions, 16 deletions
diff --git a/src/test/java/org/bukkit/WorldTypeTest.java b/src/test/java/org/bukkit/WorldTypeTest.java
index 8d063ca5..154d0b49 100644
--- a/src/test/java/org/bukkit/WorldTypeTest.java
+++ b/src/test/java/org/bukkit/WorldTypeTest.java
@@ -1,9 +1,7 @@
 package org.bukkit;
 
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
+import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.*;
 
 import net.minecraft.server.WorldType;
 import org.junit.Test;
@@ -11,21 +9,10 @@ import org.junit.Test;
 public class WorldTypeTest {
     @Test
     public void testTypes() {
-        List<WorldType> missingTypes = new ArrayList<WorldType>();
-
         for (WorldType type : WorldType.types) {
             if (type == null) continue;
 
-            if (org.bukkit.WorldType.getByName(type.name()) == null) {
-                missingTypes.add(type);
-            }
-        }
-
-        if (!missingTypes.isEmpty()) {
-            for (WorldType type : missingTypes) {
-                System.out.println(type.name() + " is missing!");
-            }
-            fail("Missing (" + missingTypes.size() + ") WorldTypes!");
+            assertThat(type.name() + " has no Bukkit world", org.bukkit.WorldType.getByName(type.name()), is(not(nullValue())));
         }
     }
 }