From 91ad18a1b43158352c3b0454f4a1f86da6c1cba3 Mon Sep 17 00:00:00 2001 From: Darth Android Date: Sat, 17 Nov 2012 11:13:58 -0600 Subject: Cache material data constructors. Fixes BUKKIT-2980 Reobtaining a constructor is not a trivial operation, this change makes the Material enum store the respective constructors for each MaterialData. Additionally 'fixed' the material tests to use proper generics. --- src/test/java/org/bukkit/MaterialTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/test/java/org') diff --git a/src/test/java/org/bukkit/MaterialTest.java b/src/test/java/org/bukkit/MaterialTest.java index 46be920b..c1051caf 100644 --- a/src/test/java/org/bukkit/MaterialTest.java +++ b/src/test/java/org/bukkit/MaterialTest.java @@ -1,11 +1,9 @@ package org.bukkit; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.isA; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import org.bukkit.material.MaterialData; import org.junit.Test; public class MaterialTest { @@ -42,14 +40,12 @@ public class MaterialTest { assertThat(Material.getMaterial(null), is(nullValue())); } - // [EB]: gawd we need better code >.> - @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void getData() { for (Material material : Material.values()) { - Class clazz = material.getData(); + Class clazz = material.getData(); - assertThat(material.getNewData((byte) 0), isA(clazz)); + assertThat(material.getNewData((byte) 0), is(instanceOf(clazz))); } } -- cgit v1.2.3