summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-01-25 11:59:37 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-01-25 12:04:21 +0000
commitdf17927d453745954950c74574b6f480504017a7 (patch)
treee38c9beaf235c49abc1afaebd5a953209c739911
parentc8f17232cf6eacbebf9b7feb4763d22fedc6daec (diff)
downloadcraftbukkit-df17927d453745954950c74574b6f480504017a7.tar
craftbukkit-df17927d453745954950c74574b6f480504017a7.tar.gz
craftbukkit-df17927d453745954950c74574b6f480504017a7.tar.lz
craftbukkit-df17927d453745954950c74574b6f480504017a7.tar.xz
craftbukkit-df17927d453745954950c74574b6f480504017a7.zip
Fix PerMaterialTest skipping useful tests for certain blocks
-rw-r--r--src/test/java/org/bukkit/PerMaterialTest.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java
index f689cbf4..1b532e14 100644
--- a/src/test/java/org/bukkit/PerMaterialTest.java
+++ b/src/test/java/org/bukkit/PerMaterialTest.java
@@ -41,10 +41,6 @@ public class PerMaterialTest extends AbstractTestingBase {
public static List<Object[]> data() {
List<Object[]> list = Lists.newArrayList();
for (Material material : Material.values()) {
- if (INVALIDATED_MATERIALS.contains(material)) {
- continue;
- }
-
list.add(new Object[] {material});
}
return list;
@@ -75,6 +71,8 @@ public class PerMaterialTest extends AbstractTestingBase {
@Test
public void maxDurability() {
+ if (INVALIDATED_MATERIALS.contains(material)) return;
+
if (material == Material.AIR) {
assertThat((int) material.getMaxDurability(), is(0));
} else if (material.isBlock()){
@@ -85,6 +83,8 @@ public class PerMaterialTest extends AbstractTestingBase {
@Test
public void maxStackSize() {
+ if (INVALIDATED_MATERIALS.contains(material)) return;
+
final ItemStack bukkit = new ItemStack(material);
final CraftItemStack craft = CraftItemStack.asCraftCopy(bukkit);
if (material == Material.AIR) {