Skip to content

Commit

Permalink
Merge pull request #478 from nenewell/master
Browse files Browse the repository at this point in the history
#259 - replace calls to getChr() with getContig().

Closes #478
  • Loading branch information
lbergelson committed May 2, 2015
2 parents 3dba570 + e6feb6a commit 20e430d
Showing 1 changed file with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ public void testGoodNames(String goodName){
@Test
public void testChrs(){
TableCodec tc = new TableCodec();
Assert.assertEquals(tc.decode("1:1 1 2 3").getChr(), "1");
Assert.assertEquals(tc.decode("chr1:1 1 2 3").getChr(), "chr1");
Assert.assertEquals(tc.decode("1:1+ 1 2 3").getChr(), "1");
Assert.assertEquals(tc.decode("1 1 2 3").getChr(), "1");
Assert.assertEquals(tc.decode("fred 1 2 3").getChr(), "fred");
Assert.assertEquals(tc.decode("2:1,000 1 2 3").getChr(), "2");
Assert.assertEquals(tc.decode("1:1 1 2 3").getContig(), "1");
Assert.assertEquals(tc.decode("chr1:1 1 2 3").getContig(), "chr1");
Assert.assertEquals(tc.decode("1:1+ 1 2 3").getContig(), "1");
Assert.assertEquals(tc.decode("1 1 2 3").getContig(), "1");
Assert.assertEquals(tc.decode("fred 1 2 3").getContig(), "fred");
Assert.assertEquals(tc.decode("2:1,000 1 2 3").getContig(), "2");
}

@DataProvider(name = "dataLines")
Expand Down Expand Up @@ -111,7 +111,6 @@ public void testDecodeHeader2(){
Assert.assertEquals(decode.get("c"), "3");
Assert.assertEquals(decode.getLocation().getContig(), "1");
Assert.assertEquals(decode.getContig(), "1");
Assert.assertEquals(decode.getChr(), "1");
Assert.assertEquals(decode.getLocation().getStart(), 1);
Assert.assertEquals(decode.getLocation().getEnd(), 1);
}
Expand Down

0 comments on commit 20e430d

Please sign in to comment.