Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DbSnpBitSetUtil should verify that the VCF dict should match the inpu… #1889

Merged
merged 5 commits into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/picard/util/DbSnpBitSetUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import htsjdk.variant.vcf.VCFFileReader;
import picard.nio.PicardHtsPath;
import picard.vcf.ByIntervalListVariantContextIterator;
import picard.util.SequenceDictionaryUtils;

import java.io.File;
import java.nio.file.Path;
Expand Down Expand Up @@ -213,6 +214,14 @@ private static void loadVcf(final PicardHtsPath dbSnpFile,

final Optional<ProgressLogger> progress = log.map(l -> new ProgressLogger(l, (int) 1e5, "Read", "variants"));
final VCFFileReader variantReader = new VCFFileReader(dbSnpFile.toPath(), intervals != null);

SequenceDictionaryUtils.assertSequenceDictionariesEqual(
variantReader.getFileHeader().getSequenceDictionary(),
"DBSNP: " + dbSnpFile.getRawInputString(),
sequenceDictionary,
"INPUT"
);

final Iterator<VariantContext> variantIterator;
if (intervals != null) {
variantIterator = new ByIntervalListVariantContextIterator(variantReader, intervals);
Expand Down
35 changes: 34 additions & 1 deletion src/test/java/picard/util/SequenceDictionaryUtilsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

import htsjdk.samtools.SAMSequenceDictionary;
import htsjdk.samtools.SAMSequenceRecord;
import htsjdk.variant.utils.SAMSequenceDictionaryExtractor;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import picard.PicardException;

import java.io.File;
import java.util.List;

public class SequenceDictionaryUtilsTest {
Expand Down Expand Up @@ -45,4 +47,35 @@ public void testSequenceDictionaryNegative(final SAMSequenceDictionary s1, final
SequenceDictionaryUtils.assertSequenceDictionariesEqual(s1, "s1", s2, "s2");
}

}
@Test
public void testDbSnpSequenceDictionaryPositive() {
final File f1 = new File("testdata/picard/vcf", "mini.dbsnp.vcf");
final File f2 = new File("testdata/picard/vcf", "mini.vcf");

final SAMSequenceDictionary s1 = SAMSequenceDictionaryExtractor.extractDictionary(f1.toPath());
final SAMSequenceDictionary s2 = SAMSequenceDictionaryExtractor.extractDictionary(f2.toPath());

SequenceDictionaryUtils.assertSequenceDictionariesEqual(
s1,
"s1",
s2,
"s2"
);
}

@Test(expectedExceptions = PicardException.class)
public void testDbSnpSequenceDictionaryNegative() {
final File f1 = new File("testdata/picard/vcf", "mini.dbsnp.vcf");
final File f2 = new File("testdata/picard/vcf", "spanningDeletionCallset.vcf");

final SAMSequenceDictionary s1 = SAMSequenceDictionaryExtractor.extractDictionary(f1.toPath());
final SAMSequenceDictionary s2 = SAMSequenceDictionaryExtractor.extractDictionary(f2.toPath());

SequenceDictionaryUtils.assertSequenceDictionariesEqual(
s1,
"s1",
s2,
"s2"
);
}
}