-
Notifications
You must be signed in to change notification settings - Fork 597
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cleaning up, base level modes done, fixing integration and unit test …
…-- need intel build
- Loading branch information
Showing
23 changed files
with
2,562 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
src/test/java/org/broadinstitute/hellbender/tools/reference/MummerExecutorUnitTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package org.broadinstitute.hellbender.tools.reference; | ||
import org.broadinstitute.hellbender.CommandLineProgramTest; | ||
import org.broadinstitute.hellbender.testutils.IntegrationTestSpec; | ||
import org.broadinstitute.hellbender.utils.alignment.MummerExecutor; | ||
import org.broadinstitute.hellbender.utils.io.IOUtils; | ||
import org.testng.Assert; | ||
import org.testng.annotations.Test; | ||
|
||
import java.io.File; | ||
import java.io.IOException; | ||
|
||
public class MummerExecutorUnitTest extends CommandLineProgramTest { | ||
|
||
private final String COMPARE_REFERENCES_TEST_FILES_DIRECTORY = toolsTestDir + "/reference/CompareReferences/"; | ||
|
||
// need intel build for MUMmer | ||
@Test(enabled = false) | ||
public void testExecuteMummer() throws IOException { | ||
File fasta1 = new File(COMPARE_REFERENCES_TEST_FILES_DIRECTORY + "hg19mini.fasta"); | ||
File fasta2 = new File(COMPARE_REFERENCES_TEST_FILES_DIRECTORY + "hg19mini_chr2multiplesnps.fasta"); | ||
File expectedOutputDir = new File(getToolTestDataDir()); | ||
File actualOutputDir = IOUtils.createTempDir("testMummer"); | ||
MummerExecutor exec = new MummerExecutor(); | ||
|
||
exec.executeMummer(fasta1, fasta2, actualOutputDir); | ||
File expectedOutput = new File(expectedOutputDir, "expected.snps_output.snps"); | ||
File actualOutput = new File(actualOutputDir, "snps_output.snps"); | ||
IntegrationTestSpec.assertEqualTextFiles(actualOutput, expectedOutput); | ||
} | ||
|
||
@Test | ||
public void testPrepareMUMmerExecutionDirectory(){ | ||
MummerExecutor exec = new MummerExecutor(); | ||
File executableDirectory = exec.getMummerExecutableDirectory(); | ||
Assert.assertEquals(executableDirectory.listFiles().length, 4); | ||
|
||
for(File file : executableDirectory.listFiles()){ | ||
Assert.assertTrue(file.getTotalSpace() > 0); | ||
Assert.assertTrue(file.canExecute()); | ||
} | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
src/test/resources/org/broadinstitute/hellbender/tools/reference/CompareReferences/1.fasta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
...ence/CompareReferences/expected.SNPandINDEL.hg19mini.fasta_hg19mini_snpandindel.fasta.vcf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
##fileformat=VCFv4.2 | ||
##contig=<ID=1,length=16000> | ||
##contig=<ID=2,length=16000> | ||
##contig=<ID=3,length=16000> | ||
##contig=<ID=4,length=16000> | ||
#CHROM POS ID REF ALT QUAL FILTER INFO | ||
1 12881 . G C . . . | ||
2 10400 . AACCCCGAACCCCGAACCCCAACCCCAACCCCAACCCCAACCCTAACCCCTCACCCTCACCCTCGACCCCCGACCCCCGAC A . . . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...erence/CompareReferences/expected.hg19mini.fasta_hg19mini_chr2multiplesnps.fasta_snps.tsv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
|
||
Sequence Name Position hg19mini.fasta hg19mini_chr2multiplesnps.fasta | ||
2 13368 A T | ||
2 13770 A C | ||
|
9 changes: 9 additions & 0 deletions
9
...eference/CompareReferences/expected.hg19mini.fasta_hg19mini_snpsmultiplecontigs.fasta.vcf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
##fileformat=VCFv4.2 | ||
##contig=<ID=1,length=16000> | ||
##contig=<ID=2,length=16000> | ||
##contig=<ID=3,length=16000> | ||
##contig=<ID=4,length=16000> | ||
#CHROM POS ID REF ALT QUAL FILTER INFO | ||
1 12084 . A C . . . | ||
2 12084 . A T . . . | ||
4 14728 . T A . . . |
7 changes: 7 additions & 0 deletions
7
...rence/CompareReferences/expected.testDeletion.hg19mini.fasta_hg19mini_chr1indel.fasta.vcf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
##fileformat=VCFv4.2 | ||
##contig=<ID=1,length=16000> | ||
##contig=<ID=2,length=16000> | ||
##contig=<ID=3,length=16000> | ||
##contig=<ID=4,length=16000> | ||
#CHROM POS ID REF ALT QUAL FILTER INFO | ||
1 14000 . AACCTGCCCCACAGCCTTGCCTGGATTTCTATCTCCCTGGCTTGGTGCCAGTTCCTCCAAGTCGATGGCACCTCCCTCCCT A . . . |
7 changes: 7 additions & 0 deletions
7
...ence/CompareReferences/expected.testInsertion.hg19mini_chr1indel.fasta_hg19mini.fasta.vcf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
##fileformat=VCFv4.2 | ||
##contig=<ID=1,length=15920> | ||
##contig=<ID=2,length=16000> | ||
##contig=<ID=3,length=16000> | ||
##contig=<ID=4,length=16000> | ||
#CHROM POS ID REF ALT QUAL FILTER INFO | ||
1 13999 . T TACCTGCCCCACAGCCTTGCCTGGATTTCTATCTCCCTGGCTTGGTGCCAGTTCCTCCAAGTCGATGGCACCTCCCTCCCT . . . |
2 changes: 1 addition & 1 deletion
2
.../org/broadinstitute/hellbender/tools/reference/CompareReferences/hg19mini_chr1indel.fasta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.