zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged bug fix from Stable into Unstable

This commit is contained in:
David Roazen 2013-02-26 21:41:13 -05:00
parent dd338bebd0 65d31ba4ad
commit a53b4a7521
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
public/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java → protected/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java
View File

6
public/java/test/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java
View File

@ -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);
}

2
public/java/test/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java
View File

@ -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.<String>emptyList());

2
public/java/test/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java
View File

@ -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);
}