diff --git a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotatorIntegrationTest.java b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotatorIntegrationTest.java index 8315a28fb..515888a09 100644 --- a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotatorIntegrationTest.java +++ b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotatorIntegrationTest.java @@ -259,6 +259,15 @@ public class VariantAnnotatorIntegrationTest extends WalkerTest { executeTest("using expression with multi-alleles", spec); } + @Test + public void testFilterInExpression(){ + /* The order of filters in the output seems platform-dependent. May need to change htsjdk to make the order consistent across platforms. [Sato] */ + WalkerTestSpec spec = new WalkerTestSpec( + baseTestString() + " --resource:foo " + privateTestDir + "annotationResourceWithFilter.vcf" + STANDARD_ANNOTATIONS + "--variant " + privateTestDir + "vcfexample3empty-multiAllele.vcf -E foo.FILTER -L " + privateTestDir + "vcfexample3empty-multiAllele.vcf", 1, + Arrays.asList("77bc144fd432b8886ab19ed20bfb9396")); + executeTest("annotate a vcf with the FILTER field of another vcf", spec); + } + @Test public void testUsingExpressionWithID() { WalkerTestSpec spec = new WalkerTestSpec( diff --git a/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotator.java b/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotator.java index 1529ed71b..ca386e8d8 100644 --- a/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotator.java +++ b/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotator.java @@ -97,6 +97,19 @@ import java.util.*; * -E foo.AF * --resourceAlleleConcordance * + * + *
+ * java -jar GenomeAnalysisTK.jar \ + * -R reference.fasta \ + * -T VariantAnnotator \ + * -o output.vcf \ + * --resource:foo resource.vcf \ + * --expression foo.AF \ + * --expression foo.FILTER \ + * -V input.vcf \ + *+ * */ @DocumentedGATKFeature( groupName = HelpConstants.DOCS_CAT_VARMANIP, extraDocs = {CommandLineGATK.class} ) @Requires(value={}) @@ -181,6 +194,7 @@ public class VariantAnnotator extends RodWalker