1 files changed, 5 insertions, 21 deletions
diff --git a/guava-tests/test/com/google/common/primitives/ShortsTest.java b/guava-tests/test/com/google/common/primitives/ShortsTest.java
index 3cc7b61..e98510a 100644
--- a/guava-tests/test/com/google/common/primitives/ShortsTest.java
+++ b/guava-tests/test/com/google/common/primitives/ShortsTest.java
@@ -76,7 +76,7 @@ public class ShortsTest extends TestCase {
     assertEquals(LEAST, Shorts.saturatedCast(Long.MIN_VALUE));
   }
 
-  private static void assertCastFails(long value) {
+  private void assertCastFails(long value) {
     try {
       Shorts.checkedCast(value);
       fail("Cast to short should have failed: " + value);
@@ -363,24 +363,6 @@ public class ShortsTest extends TestCase {
     }
   }
 
-  public void testToArray_withConversion() {
-    short[] array = {(short) 0, (short) 1, (short) 2};
-
-    List<Byte> bytes = Arrays.asList((byte) 0, (byte) 1, (byte) 2);
-    List<Short> shorts = Arrays.asList((short) 0, (short) 1, (short) 2);
-    List<Integer> ints = Arrays.asList(0, 1, 2);
-    List<Float> floats = Arrays.asList((float) 0, (float) 1, (float) 2);
-    List<Long> longs = Arrays.asList((long) 0, (long) 1, (long) 2);
-    List<Double> doubles = Arrays.asList((double) 0, (double) 1, (double) 2);
-
-    assertTrue(Arrays.equals(array, Shorts.toArray(bytes)));
-    assertTrue(Arrays.equals(array, Shorts.toArray(shorts)));
-    assertTrue(Arrays.equals(array, Shorts.toArray(ints)));
-    assertTrue(Arrays.equals(array, Shorts.toArray(floats)));
-    assertTrue(Arrays.equals(array, Shorts.toArray(longs)));
-    assertTrue(Arrays.equals(array, Shorts.toArray(doubles)));
-  }
-
   public void testAsList_isAView() {
     short[] array = {(short) 0, (short) 1};
     List<Short> list = Shorts.asList(array);
@@ -418,7 +400,9 @@ public class ShortsTest extends TestCase {
   }
 
   @GwtIncompatible("NullPointerTester")
-  public void testNulls() {
-    new NullPointerTester().testAllPublicStaticMethods(Shorts.class);
+  public void testNulls() throws Exception {
+    NullPointerTester tester = new NullPointerTester();
+    tester.setDefault(short[].class, new short[0]);
+    tester.testAllPublicStaticMethods(Shorts.class);
   }
 }