3 files changed, 8 insertions, 38 deletions
diff --git a/src/test/java/org/bukkit/AchievementTest.java b/src/test/java/org/bukkit/AchievementTest.java
deleted file mode 100644
index 53ac7fa6..00000000
--- a/src/test/java/org/bukkit/AchievementTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bukkit;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class AchievementTest {
-
-    @Test
-    public void getById() {
-        for (Achievement achievement : Achievement.values()) {
-            assertThat(Achievement.getById(achievement.getId()), is(achievement));
-        }
-    }
-
-    @Test
-    public void getByOffset() {
-        assertThat(Achievement.getById(Achievement.STATISTIC_OFFSET), is(Achievement.values()[0]));
-    }
-}
diff --git a/src/test/java/org/bukkit/MaterialTest.java b/src/test/java/org/bukkit/MaterialTest.java
index e74e2f28..cbca8409 100644
--- a/src/test/java/org/bukkit/MaterialTest.java
+++ b/src/test/java/org/bukkit/MaterialTest.java
@@ -15,8 +15,11 @@ public class MaterialTest {
     }
 
     @Test
-    public void getById() {
+    public void getById() throws Throwable {
         for (Material material : Material.values()) {
+            if (material.getClass().getField(material.name()).getAnnotation(Deprecated.class) != null) {
+                continue;
+            }
             assertThat(Material.getMaterial(material.getId()), is(material));
         }
     }
@@ -56,8 +59,11 @@ public class MaterialTest {
     }
 
     @Test
-    public void matchMaterialById() {
+    public void matchMaterialById() throws Throwable {
         for (Material material : Material.values()) {
+            if (material.getClass().getField(material.name()).getAnnotation(Deprecated.class) != null) {
+                continue;
+            }
             assertThat(Material.matchMaterial(String.valueOf(material.getId())), is(material));
         }
     }
diff --git a/src/test/java/org/bukkit/StatisticTest.java b/src/test/java/org/bukkit/StatisticTest.java
deleted file mode 100644
index 5fc763f0..00000000
--- a/src/test/java/org/bukkit/StatisticTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bukkit;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class StatisticTest {
-    @Test
-    public void getById() {
-        for (Statistic statistic : Statistic.values()) {
-            assertThat(Statistic.getById(statistic.getId()), is(statistic));
-        }
-    }
-}