1 files changed, 17 insertions, 31 deletions
diff --git a/guava-tests/test/com/google/common/io/ResourcesTest.java b/guava-tests/test/com/google/common/io/ResourcesTest.java
index 47779a8..8aedfa3 100644
--- a/guava-tests/test/com/google/common/io/ResourcesTest.java
+++ b/guava-tests/test/com/google/common/io/ResourcesTest.java
@@ -17,13 +17,10 @@
 package com.google.common.io;
 
 import static com.google.common.base.CharMatcher.WHITESPACE;
-import static org.truth0.Truth.ASSERT;
+import static org.junit.contrib.truth.Truth.ASSERT;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
-import com.google.common.testing.NullPointerTester;
-
-import junit.framework.TestSuite;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -40,19 +37,17 @@ import java.util.List;
  */
 public class ResourcesTest extends IoTestCase {
 
-  public static TestSuite suite() {
-    TestSuite suite = new TestSuite();
-    suite.addTest(ByteSourceTester.tests("Resources.asByteSource[URL]",
-        SourceSinkFactories.urlByteSourceFactory(), true));
-    suite.addTest(CharSourceTester.tests("Resources.asCharSource[URL, Charset]",
-        SourceSinkFactories.urlCharSourceFactory()));
-    suite.addTestSuite(ResourcesTest.class);
-    return suite;
-  }
-
   public void testUrlSupplier() throws IOException {
+    try {
+      Resources.newInputStreamSupplier(null);
+      fail("expected NPE");
+    } catch (NullPointerException expected) {
+      // expected
+    }
+
+    URL url = getClass().getResource("/com/google/common/io/Resources.class");
     byte[] data = ByteStreams.toByteArray(
-        Resources.newInputStreamSupplier(classfile(Resources.class)));
+        Resources.newInputStreamSupplier(url));
     assertEquals(0xCAFEBABE,
         new DataInputStream(new ByteArrayInputStream(data)).readInt());
   }
@@ -63,9 +58,10 @@ public class ResourcesTest extends IoTestCase {
     ASSERT.that(Resources.toString(resource, Charsets.US_ASCII))
         .isNotEqualTo(I18N);
   }
-
+  
   public void testToToByteArray() throws IOException {
-    byte[] data = Resources.toByteArray(classfile(Resources.class));
+    URL url = getClass().getResource("/com/google/common/io/Resources.class");
+    byte[] data = Resources.toByteArray(url);
     assertEquals(0xCAFEBABE,
         new DataInputStream(new ByteArrayInputStream(data)).readInt());
   }
@@ -106,7 +102,7 @@ public class ResourcesTest extends IoTestCase {
     Resources.copy(resource, out);
     assertEquals(I18N, out.toString("UTF-8"));
   }
-
+  
   public void testGetResource_notFound() {
     try {
       Resources.getResource("no such resource");
@@ -115,12 +111,12 @@ public class ResourcesTest extends IoTestCase {
       assertEquals("resource no such resource not found.", e.getMessage());
     }
   }
-
+  
   public void testGetResource() {
     assertNotNull(
         Resources.getResource("com/google/common/io/testdata/i18n.txt"));
   }
-
+  
   public void testGetResource_relativePath_notFound() {
     try {
       Resources.getResource(
@@ -132,18 +128,8 @@ public class ResourcesTest extends IoTestCase {
           e.getMessage());
     }
   }
-
+  
   public void testGetResource_relativePath() {
     assertNotNull(Resources.getResource(getClass(), "testdata/i18n.txt"));
   }
-
-  public void testNulls() {
-    new NullPointerTester()
-        .setDefault(URL.class, classfile(ResourcesTest.class))
-        .testAllPublicStaticMethods(Resources.class);
-  }
-
-  private static URL classfile(Class<?> c) {
-    return c.getResource(c.getSimpleName() + ".class");
-  }
 }