diff --git a/src/fastaFromBed/fastaFromBedMain.cpp b/src/fastaFromBed/fastaFromBedMain.cpp index c5da8be27d4aced484241c695471d7f3246e54f8..4f6d317ef98d5dd4322fdc1e180fce79a84e0d28 100644 --- a/src/fastaFromBed/fastaFromBedMain.cpp +++ b/src/fastaFromBed/fastaFromBedMain.cpp @@ -88,7 +88,7 @@ int fastafrombed_main(int argc, char* argv[]) { else if(PARAMETER_CHECK("-name", 5, parameterLength)) { useNameOnly = true; } - else if(PARAMETER_CHECK("-exons", 6, parameterLength)) { + else if(PARAMETER_CHECK("-split", 6, parameterLength)) { useExons = true; } else if(PARAMETER_CHECK("-tab", 4, parameterLength)) { @@ -131,7 +131,7 @@ void fastafrombed_help(void) { cerr << "\t-bed\tBED/GFF/VCF file of ranges to extract from -fi" << endl; cerr << "\t-fo\tOutput file (can be FASTA or TAB-delimited)" << endl; cerr << "\t-name\tUse the name field for the FASTA header" << endl; - cerr << "\t-exons\tgiven a bed12, concat the sequence from exons" << endl; + cerr << "\t-split\tgiven a bed12, concat the sequence from exons" << endl; cerr << "\t-tab\tWrite output in TAB delimited format." << endl; cerr << "\t\t- Default is FASTA format." << endl << endl; diff --git a/test/fastaFromBed/blocks.bed b/test/fastaFromBed/blocks.bed index fb4b725d6127c5a9f154e5569342d6b24f832a81..60049dc34aa9bc9c6e4ce16f95abf3c0014bf09f 100644 --- a/test/fastaFromBed/blocks.bed +++ b/test/fastaFromBed/blocks.bed @@ -1 +1,2 @@ chr1 0 40 three_blocks_match 0 + 0 0 0 3 2,10,10, 5,16,36, +chr1 0 40 three_blocks_match 0 + 0 0 0 3 1,1,1, 10,20,30, diff --git a/test/fastaFromBed/t.fa b/test/fastaFromBed/t.fa index cfbdc59c4038b606fe04c8bb3be09a08f8c6a1af..9d1bb901e64120c755a2306ed0219980a3e1affc 100644 --- a/test/fastaFromBed/t.fa +++ b/test/fastaFromBed/t.fa @@ -1,6 +1,6 @@ >chr1 -aaaaaaaaaa -cccccccccc -tttttttttt -gggggggggg -aaaaaaaaaa +aggggggggg +cggggggggg +tggggggggg +aggggggggg +cggggggggg diff --git a/test/fastaFromBed/test.sh b/test/fastaFromBed/test.sh index e7529749a46f4b9dedffd8e0269192865299d125..6ddf5d39105b2d5bfa3ef1b06be8bcc394891c66 100644 --- a/test/fastaFromBed/test.sh +++ b/test/fastaFromBed/test.sh @@ -1,3 +1,14 @@ -echo $'chr1\t1\t10' | ./bin/bedtools getfasta -fi test/fastaFromBed/t.fa -bed stdin -fo t.txt +echo $'chr1\t1\t10' | ../../bin/bedtools getfasta -fi t.fa -bed stdin -fo stdout > /dev/null + +LEN=$(../../bin/bedtools getfasta -split -fi t.fa -bed blocks.bed -fo stdout | awk '(NR == 2){ print length($0) }') + +if [ "$LEN" != "22" ]; then + print "BAD"; +fi + +SEQ=$(../../bin/bedtools getfasta -split -fi t.fa -bed blocks.bed -fo stdout | awk '(NR == 4){ print $0 }') + +if [ "$SEQ" != "cta" ]; then + print "BAD"; +fi -./bin/bedtools getfasta -exons -fi test/fastaFromBed/t.fa -bed test/fastaFromBed/blocks.bed -fo stdout