diff --git a/public/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java b/protected/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java similarity index 100% rename from public/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java rename to protected/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java diff --git a/public/java/test/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java b/public/java/test/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java index 12c257796..8d0874ea1 100644 --- a/public/java/test/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java +++ b/public/java/test/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java @@ -64,16 +64,16 @@ public class EngineFeaturesIntegrationTest extends WalkerTest { } @Test() private void testMissingBAMnt1() { - testMissingFile("missing BAM", "-T UnifiedGenotyper -I missing.bam -nt 1"); + testMissingFile("missing BAM", "-T PrintReads -I missing.bam -nt 1"); } @Test() private void testMissingBAMnt4() { - testMissingFile("missing BAM", "-T UnifiedGenotyper -I missing.bam -nt 4"); + testMissingFile("missing BAM", "-T PrintReads -I missing.bam -nt 4"); } @Test() private void testMissingVCF() { testMissingFile("missing VCF", "-T SelectVariants -V missing.vcf"); } @Test() private void testMissingInterval() { - testMissingFile("missing interval", "-T UnifiedGenotyper -L missing.interval_list -I " + b37GoodBAM); + testMissingFile("missing interval", "-T PrintReads -L missing.interval_list -I " + b37GoodBAM); } diff --git a/public/java/test/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java b/public/java/test/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java index 7813c26be..55f9e1f7d 100644 --- a/public/java/test/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java +++ b/public/java/test/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java @@ -71,7 +71,7 @@ public class MaxRuntimeIntegrationTest extends WalkerTest { @Test(enabled = true, dataProvider = "MaxRuntimeProvider", timeOut = 60 * 1000) public void testMaxRuntime(final MaxRuntimeTestProvider cfg) { WalkerTest.WalkerTestSpec spec = new WalkerTest.WalkerTestSpec( - "-T UnifiedGenotyper -R " + hg18Reference + "-T PrintReads -R " + hg18Reference + " -I " + validationDataLocation + "NA12878.WEx.downsampled20x.bam -o /dev/null" + " -maxRuntime " + cfg.maxRuntime + " -maxRuntimeUnits " + cfg.unit, 0, Collections.emptyList()); diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java b/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java index 88086314a..a813fada2 100644 --- a/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java +++ b/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java @@ -75,7 +75,7 @@ public class DictionaryConsistencyIntegrationTest extends WalkerTest { @Test public void failBAM8() { executeTest("hg18bam-v-lexhg18", testBAM(lexHG18, hg18BAM, "chr1", UserException.LexicographicallySortedSequenceDictionary.class)); } private WalkerTest.WalkerTestSpec testBAM(String ref, String bam, String contig, Class c) { - return new WalkerTest.WalkerTestSpec("-T UnifiedGenotyper -I " + bam + " -R " + ref + " -L " + contig + ":10,000,000-11,000,000 -o %s", + return new WalkerTest.WalkerTestSpec("-T PrintReads -I " + bam + " -R " + ref + " -L " + contig + ":10,000,000-11,000,000 -o %s", 1, c); }