git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-966 JAL-1738 JAL-345 interfaces for SearchResults and SearchResults.Match
[jalview.git]
/
test
/
jalview
/
datamodel
/
SearchResultsTest.java
diff --git
a/test/jalview/datamodel/SearchResultsTest.java
b/test/jalview/datamodel/SearchResultsTest.java
index
f9a0a4f
..
e3cbb00
100644
(file)
--- a/
test/jalview/datamodel/SearchResultsTest.java
+++ b/
test/jalview/datamodel/SearchResultsTest.java
@@
-36,7
+36,7
@@
public class SearchResultsTest
public void testToString()
{
SequenceI seq = new Sequence("", "abcdefghijklm");
public void testToString()
{
SequenceI seq = new Sequence("", "abcdefghijklm");
- SearchResults sr = new SearchResults();
+ SearchResultsI sr = new SearchResults();
sr.addResult(seq, 1, 1);
assertEquals("0a", sr.toString());
sr.addResult(seq, 3, 5);
sr.addResult(seq, 1, 1);
assertEquals("0a", sr.toString());
sr.addResult(seq, 3, 5);
@@
-66,8
+66,8
@@
public class SearchResultsTest
public void testEquals()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
public void testEquals()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
- SearchResults sr1 = new SearchResults();
- SearchResults sr2 = new SearchResults();
+ SearchResultsI sr1 = new SearchResults();
+ SearchResultsI sr2 = new SearchResults();
assertFalse(sr1.equals(null)); // null object
assertFalse(sr1.equals(seq1)); // wrong type
assertFalse(sr1.equals(null)); // null object
assertFalse(sr1.equals(seq1)); // wrong type
@@
-111,8
+111,8
@@
public class SearchResultsTest
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
SequenceI seq2 = new Sequence("", "abcdefghijklm");
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
SequenceI seq2 = new Sequence("", "abcdefghijklm");
- SearchResults sr1 = new SearchResults();
- SearchResults sr2 = new SearchResults();
+ SearchResultsI sr1 = new SearchResults();
+ SearchResultsI sr2 = new SearchResults();
sr1.addResult(seq1, 1, 1);
sr2.addResult(seq2, 1, 1);
sr1.addResult(seq1, 1, 1);
sr2.addResult(seq2, 1, 1);
@@
-127,8
+127,8
@@
public class SearchResultsTest
public void testEquals_orderDiffers()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
public void testEquals_orderDiffers()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
- SearchResults sr1 = new SearchResults();
- SearchResults sr2 = new SearchResults();
+ SearchResultsI sr1 = new SearchResults();
+ SearchResultsI sr2 = new SearchResults();
sr1.addResult(seq1, 1, 1);
sr1.addResult(seq1, 2, 2);
sr1.addResult(seq1, 1, 1);
sr1.addResult(seq1, 2, 2);
@@
-145,8
+145,8
@@
public class SearchResultsTest
public void testHashcode()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
public void testHashcode()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
- SearchResults sr1 = new SearchResults();
- SearchResults sr2 = new SearchResults();
+ SearchResultsI sr1 = new SearchResults();
+ SearchResultsI sr2 = new SearchResults();
/*
* both empty
/*
* both empty
@@
-178,7
+178,7
@@
public class SearchResultsTest
public void testMatchConstructor()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
public void testMatchConstructor()
{
SequenceI seq1 = new Sequence("", "abcdefghijklm");
- Match m = new SearchResults().new Match(seq1, 2, 5);
+ SearchResultMatchI m = new SearchResults().new Match(seq1, 2, 5);
assertSame(seq1, m.getSequence());
assertEquals(2, m.getStart());
assertEquals(5, m.getEnd());
assertSame(seq1, m.getSequence());
assertEquals(2, m.getStart());
assertEquals(5, m.getEnd());