diff --git a/adam-apis/src/test/resources/small.sam b/adam-apis/src/test/resources/small.sam deleted file mode 120000 index de28ecd7ef..0000000000 --- a/adam-apis/src/test/resources/small.sam +++ /dev/null @@ -1 +0,0 @@ -../../../../adam-core/src/test/resources/small.sam \ No newline at end of file diff --git a/adam-apis/src/test/scala/org/bdgenomics/adam/apis/java/JavaADAMContextSuite.scala b/adam-apis/src/test/scala/org/bdgenomics/adam/apis/java/JavaADAMContextSuite.scala index fe61fb7825..6431a42ac4 100644 --- a/adam-apis/src/test/scala/org/bdgenomics/adam/apis/java/JavaADAMContextSuite.scala +++ b/adam-apis/src/test/scala/org/bdgenomics/adam/apis/java/JavaADAMContextSuite.scala @@ -27,14 +27,14 @@ import org.bdgenomics.formats.avro.AlignmentRecord class JavaADAMContextSuite extends ADAMFunSuite { sparkTest("can read a small .SAM file") { - val path = resourcePath("small.sam") + val path = copyResource("small.sam") val ctx = new JavaADAMContext(sc) val reads = ctx.adamRecordLoad(path) assert(reads.jrdd.count() === 20) } - ignore("can read a small .SAM file inside of java") { - val path = resourcePath("small.sam") + sparkTest("can read a small .SAM file inside of java") { + val path = copyResource("small.sam") val aRdd = sc.loadAlignments(path) val newReads = JavaADAMConduit.conduit(aRdd.rdd, aRdd.sequences, aRdd.recordGroups) diff --git a/adam-cli/src/test/resources/ordered.sam b/adam-cli/src/test/resources/ordered.sam deleted file mode 120000 index 0aa6493caa..0000000000 --- a/adam-cli/src/test/resources/ordered.sam +++ /dev/null @@ -1 +0,0 @@ -../../../../adam-core/src/test/resources/ordered.sam \ No newline at end of file diff --git a/adam-cli/src/test/resources/unordered.sam b/adam-cli/src/test/resources/unordered.sam deleted file mode 120000 index 69afd96123..0000000000 --- a/adam-cli/src/test/resources/unordered.sam +++ /dev/null @@ -1 +0,0 @@ -../../../../adam-core/src/test/resources/unordered.sam \ No newline at end of file diff --git a/adam-cli/src/test/scala/org/bdgenomics/adam/cli/TransformSuite.scala b/adam-cli/src/test/scala/org/bdgenomics/adam/cli/TransformSuite.scala index 85361956b4..ff66e333b1 100644 --- a/adam-cli/src/test/scala/org/bdgenomics/adam/cli/TransformSuite.scala +++ b/adam-cli/src/test/scala/org/bdgenomics/adam/cli/TransformSuite.scala @@ -23,7 +23,7 @@ import org.bdgenomics.adam.util.ADAMFunSuite class TransformSuite extends ADAMFunSuite { sparkTest("unordered sam to unordered sam") { - val inputPath = resourcePath("unordered.sam") + val inputPath = copyResource("unordered.sam") val actualPath = tmpFile("unordered.sam") val expectedPath = inputPath Transform(Array("-single", inputPath, actualPath)).run(sc) @@ -31,15 +31,15 @@ class TransformSuite extends ADAMFunSuite { } sparkTest("unordered sam to ordered sam") { - val inputPath = resourcePath("unordered.sam") + val inputPath = copyResource("unordered.sam") val actualPath = tmpFile("ordered.sam") - val expectedPath = resourcePath("ordered.sam") + val expectedPath = copyResource("ordered.sam") Transform(Array("-single", "-sort_reads", inputPath, actualPath)).run(sc) checkFiles(expectedPath, actualPath) } sparkTest("unordered sam, to adam, to sam") { - val inputPath = resourcePath("unordered.sam") + val inputPath = copyResource("unordered.sam") val intermediateAdamPath = tmpFile("unordered.adam") val actualPath = tmpFile("unordered.sam") val expectedPath = inputPath @@ -49,10 +49,10 @@ class TransformSuite extends ADAMFunSuite { } sparkTest("unordered sam, to adam, to ordered sam") { - val inputPath = resourcePath("unordered.sam") + val inputPath = copyResource("unordered.sam") val intermediateAdamPath = tmpFile("unordered.adam") val actualPath = tmpFile("ordered.sam") - val expectedPath = resourcePath("ordered.sam") + val expectedPath = copyResource("ordered.sam") Transform(Array(inputPath, intermediateAdamPath)).run(sc) Transform(Array("-single", "-sort_reads", intermediateAdamPath, actualPath)).run(sc) checkFiles(expectedPath, actualPath) diff --git a/adam-core/src/test/scala/org/bdgenomics/adam/util/ADAMFunSuite.scala b/adam-core/src/test/scala/org/bdgenomics/adam/util/ADAMFunSuite.scala index 4b6692d979..8ab5bcb3df 100644 --- a/adam-core/src/test/scala/org/bdgenomics/adam/util/ADAMFunSuite.scala +++ b/adam-core/src/test/scala/org/bdgenomics/adam/util/ADAMFunSuite.scala @@ -19,6 +19,8 @@ package org.bdgenomics.adam.util import java.nio.file.Files +import com.google.common.io.Resources + import org.bdgenomics.utils.misc.SparkFunSuite import scala.io.Source @@ -50,5 +52,11 @@ trait ADAMFunSuite extends SparkFunSuite { ) } } + + def copyResource(name: String): String = { + val tempFile = Files.createTempFile(name, "." + name.split('.').last) + Files.write(tempFile, Resources.toByteArray(getClass().getResource("/" + name))) + tempFile.toString + } }