From d69ae60b691b0f08abe43bc4e651190594bf8237 Mon Sep 17 00:00:00 2001 From: aaron Date: Tue, 11 Aug 2009 17:57:50 +0000 Subject: [PATCH] fixed two tests affected by my previous commit git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1408 348d0f76-0448-11de-a6fe-93d51630548a --- .../shards/IntervalShardStrategyTest.java | 12 ++++++------ .../gatk/datasources/shards/IntervalShardTest.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardStrategyTest.java b/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardStrategyTest.java index 1c468ab51..cca28ad85 100755 --- a/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardStrategyTest.java +++ b/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardStrategyTest.java @@ -67,14 +67,14 @@ public class IntervalShardStrategyTest extends BaseTest { @Test(expected = StingException.class) public void testExceptionOnEmpty() { - IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet); + IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet,Shard.ShardType.LOCUS_INTERVAL); } @Test public void testSingleChromosomeFunctionality() { GenomeLoc loc = GenomeLocParser.createGenomeLoc(1, 1, 1000); mSortedSet.add(loc); - IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet); + IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet,Shard.ShardType.LOCUS_INTERVAL); int counter = 0; Shard d = null; while (strat.hasNext()) { @@ -91,7 +91,7 @@ public class IntervalShardStrategyTest extends BaseTest { GenomeLoc loc = GenomeLocParser.createGenomeLoc(x, 1, 1000); mSortedSet.add(loc); } - IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet); + IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet,Shard.ShardType.LOCUS_INTERVAL); int counter = 0; Shard d = null; while (strat.hasNext()) { @@ -108,7 +108,7 @@ public class IntervalShardStrategyTest extends BaseTest { GenomeLoc loc = GenomeLocParser.createGenomeLoc(x, 1, 1000); mSortedSet.add(loc); } - IntervalShardStrategy strat = new IntervalShardStrategy(789, mSortedSet); + IntervalShardStrategy strat = new IntervalShardStrategy(789, mSortedSet,Shard.ShardType.LOCUS_INTERVAL); int counter = 0; while (strat.hasNext()) { Shard d = strat.next(); @@ -126,7 +126,7 @@ public class IntervalShardStrategyTest extends BaseTest { GenomeLoc loc = GenomeLocParser.createGenomeLoc(x, 1, 1000); mSortedSet.add(loc); } - IntervalShardStrategy strat = new IntervalShardStrategy(Long.MAX_VALUE, mSortedSet); + IntervalShardStrategy strat = new IntervalShardStrategy(Long.MAX_VALUE, mSortedSet,Shard.ShardType.LOCUS_INTERVAL); int counter = 0; while (strat.hasNext()) { Shard d = strat.next(); @@ -140,7 +140,7 @@ public class IntervalShardStrategyTest extends BaseTest { public void testRemove() { GenomeLoc loc = GenomeLocParser.createGenomeLoc(1, 1, 1000); mSortedSet.add(loc); - IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet); + IntervalShardStrategy strat = new IntervalShardStrategy(100, mSortedSet,Shard.ShardType.LOCUS_INTERVAL); strat.remove(); } diff --git a/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardTest.java b/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardTest.java index 759436edc..d649467fc 100755 --- a/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardTest.java +++ b/java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardTest.java @@ -59,14 +59,14 @@ public class IntervalShardTest extends BaseTest { @Test public void simpleReturn() { GenomeLoc loc = GenomeLocParser.createGenomeLoc(1, 1, 100); - intervalShard = new IntervalShard(loc); + intervalShard = new IntervalShard(loc,Shard.ShardType.LOCUS_INTERVAL); assertTrue(intervalShard.getGenomeLoc().equals(loc)); } @Test public void ensureNotReference() { GenomeLoc loc = GenomeLocParser.createGenomeLoc(1, 1, 100); - intervalShard = new IntervalShard(loc); + intervalShard = new IntervalShard(loc,Shard.ShardType.LOCUS_INTERVAL); assertTrue(intervalShard.getGenomeLoc() != loc && intervalShard.getGenomeLoc().equals(loc)); }