zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
aaron 2009-08-11 17:57:50 +00:00
parent fc1c76f1d2
commit d69ae60b69
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardStrategyTest.java
View File

@ -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();
}

4
java/test/org/broadinstitute/sting/gatk/datasources/shards/IntervalShardTest.java
View File

@ -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));
}