Print

Print


Author: [log in to unmask]
Date: Wed Jun 10 16:18:46 2015
New Revision: 3126

Log:
Oops.  Remove unneeded dep on junit in compile scope.

Modified:
    java/trunk/integration-tests/src/main/java/org/hps/test/util/TestFileUrl.java
    java/trunk/integration-tests/src/main/java/org/hps/test/util/TestOutputFile.java

Modified: java/trunk/integration-tests/src/main/java/org/hps/test/util/TestFileUrl.java
 =============================================================================
--- java/trunk/integration-tests/src/main/java/org/hps/test/util/TestFileUrl.java	(original)
+++ java/trunk/integration-tests/src/main/java/org/hps/test/util/TestFileUrl.java	Wed Jun 10 16:18:46 2015
@@ -4,8 +4,6 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-
-import junit.framework.TestCase;
 
 import org.lcsim.util.cache.FileCache;
 
@@ -28,7 +26,7 @@
     private static final String BASE_URL = "http://www.lcsim.org/test/hps-java/";
         
     
-    private static URL createUrl(Class<? extends TestCase> testClass, String fileName) throws MalformedURLException {
+    private static URL createUrl(Class<?> testClass, String fileName) throws MalformedURLException {
         return new URL(BASE_URL + "/" + testClass.getSimpleName() + "/" + fileName);
     }
     
@@ -36,7 +34,7 @@
         return new FileCache().getCachedFile(url);
     }
     
-    public static File getInputFile(Class<? extends TestCase> testClass, String fileName) throws Exception {
+    public static File getInputFile(Class<?> testClass, String fileName) throws Exception {
         return getInputFile(createUrl(testClass, fileName));
     }
 }

Modified: java/trunk/integration-tests/src/main/java/org/hps/test/util/TestOutputFile.java
 =============================================================================
--- java/trunk/integration-tests/src/main/java/org/hps/test/util/TestOutputFile.java	(original)
+++ java/trunk/integration-tests/src/main/java/org/hps/test/util/TestOutputFile.java	Wed Jun 10 16:18:46 2015
@@ -1,8 +1,6 @@
 package org.hps.test.util;
 
 import java.io.File;
-
-import junit.framework.TestCase;
 
 /**
  * Convenience class for test file output (basically copied from lcsim.org).
@@ -22,7 +20,7 @@
      * @param testClass the TestCase class
      * @param filename the file name (should not use a directory)
      */
-    public TestOutputFile(Class<? extends TestCase> testClass, String filename) {
+    public TestOutputFile(Class<?> testClass, String filename) {
         super(TEST_OUTPUT_DIR + File.separator + testClass.getSimpleName() + File.separator + filename);
         File dir = this.getParentFile();
         if (!dir.exists()) {