X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fdatamodel%2FSearchResultsTest.java;h=19e89d2d199b3129392cdbff97e4d014cef5d200;hb=7d8f40032746ee633dd980d5609c4d517a40421a;hp=65553c9bb29c3afc7a741589ba8b5357d35ef0cb;hpb=6920525a4f719039be7215449dd4e8c10615fabd;p=jalview.git diff --git a/test/jalview/datamodel/SearchResultsTest.java b/test/jalview/datamodel/SearchResultsTest.java index 65553c9..19e89d2 100644 --- a/test/jalview/datamodel/SearchResultsTest.java +++ b/test/jalview/datamodel/SearchResultsTest.java @@ -36,31 +36,16 @@ public class SearchResultsTest @Test(groups = { "Functional" }) public void testToString() { - SequenceI seq = new Sequence("", "abcdefghijklm"); + SequenceI seq = new Sequence("Seq1", "abcdefghijklm"); SearchResultsI sr = new SearchResults(); sr.addResult(seq, 1, 1); - assertEquals("0a", sr.toString()); + assertEquals("[Seq1/1-1]", sr.toString()); sr.addResult(seq, 3, 5); - assertEquals("0a2cde", sr.toString()); + assertEquals("[Seq1/1-1, Seq1/3-5]", sr.toString()); - seq = new Sequence("", "pqrstuvwxy"); + seq = new Sequence("Seq2", "pqrstuvwxy"); sr.addResult(seq, 6, 7); - assertEquals("0a2cde5uv", sr.toString()); - } - - @Test(groups = { "Functional" }) - public void testGetCharacters() - { - SequenceI seq = new Sequence("", "abcdefghijklm"); - SearchResults sr = new SearchResults(); - sr.addResult(seq, 1, 1); - assertEquals("a", sr.getCharacters()); - sr.addResult(seq, 3, 5); - assertEquals("acde", sr.getCharacters()); - - seq = new Sequence("", "pqrstuvwxy"); - sr.addResult(seq, 6, 7); - assertEquals("acdeuv", sr.getCharacters()); + assertEquals("[Seq1/1-1, Seq1/3-5, Seq2/6-7]", sr.toString()); } @Test(groups = { "Functional" }) @@ -77,7 +62,7 @@ public class SearchResultsTest assertTrue(sr2.equals(sr1)); // reflexive /* - * only one result is not empty + * if only one result is not empty */ sr1.addResult(seq1, 1, 1); assertTrue(sr1.equals(sr1));