X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSearchResultsTest.java;fp=test%2Fjalview%2Fdatamodel%2FSearchResultsTest.java;h=ae9512f2f572ca822d6c28d873740c96a1e5a5a6;hb=f06554784411ddbf871d642e66c8dcb7f147d4a8;hp=b576569d43f38690f825ed56451b7928e8faa8e8;hpb=cf06ee5d732af6cc874115aece1138adafca8ad7;p=jalview.git

diff --git a/test/jalview/datamodel/SearchResultsTest.java b/test/jalview/datamodel/SearchResultsTest.java
index b576569..ae9512f 100644
--- a/test/jalview/datamodel/SearchResultsTest.java
+++ b/test/jalview/datamodel/SearchResultsTest.java
@@ -1,6 +1,8 @@
 package jalview.datamodel;
 
 import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
 
 import org.testng.annotations.Test;
 
@@ -13,12 +15,135 @@ public class SearchResultsTest
     SequenceI seq = new Sequence("", "abcdefghijklm");
     SearchResults sr = new SearchResults();
     sr.addResult(seq, 1, 1);
-    assertEquals("a", sr.toString());
+    assertEquals("0a", sr.toString());
     sr.addResult(seq, 3, 5);
-    assertEquals("acde", sr.toString());
+    assertEquals("0a2cde", sr.toString());
 
     seq = new Sequence("", "pqrstuvwxy");
     sr.addResult(seq, 6, 7);
-    assertEquals("acdeuv", sr.toString());
+    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());
+  }
+
+  @Test(groups = { "Functional" })
+  public void testEquals()
+  {
+    SequenceI seq1 = new Sequence("", "abcdefghijklm");
+    SearchResults sr1 = new SearchResults();
+    SearchResults sr2 = new SearchResults();
+
+    assertFalse(sr1.equals(null)); // null object
+    assertFalse(sr1.equals(seq1)); // wrong type
+    assertTrue(sr1.equals(sr1)); // self
+    assertTrue(sr1.equals(sr2)); // empty
+    assertTrue(sr2.equals(sr1)); // reflexive
+
+    /*
+     * only one result is not empty
+     */
+    sr1.addResult(seq1, 1, 1);
+    assertTrue(sr1.equals(sr1));
+    assertFalse(sr1.equals(sr2));
+    assertFalse(sr2.equals(sr1));
+
+    /*
+     * both the same
+     */
+    sr2.addResult(seq1, 1, 1);
+    assertTrue(sr1.equals(sr2));
+    assertTrue(sr2.equals(sr1));
+
+    /*
+     * both have three matches
+     */
+    sr1.addResult(seq1, 3, 4);
+    sr1.addResult(seq1, 6, 8);
+    sr2.addResult(seq1, 3, 4);
+    sr2.addResult(seq1, 6, 8);
+    assertTrue(sr1.equals(sr1));
+    assertTrue(sr2.equals(sr2));
+    assertTrue(sr1.equals(sr2));
+    assertTrue(sr2.equals(sr1));
+  }
+
+  /**
+   * Matches that are similar but for distinct sequences are not equal
+   */
+  @Test(groups = { "Functional" })
+  public void testEquals_distinctSequences()
+  {
+    SequenceI seq1 = new Sequence("", "abcdefghijklm");
+    SequenceI seq2 = new Sequence("", "abcdefghijklm");
+    SearchResults sr1 = new SearchResults();
+    SearchResults sr2 = new SearchResults();
+
+    sr1.addResult(seq1, 1, 1);
+    sr2.addResult(seq2, 1, 1);
+    assertFalse(sr1.equals(sr2));
+    assertFalse(sr2.equals(sr1));
+  }
+
+  /**
+   * Matches that are the same except for ordering are not equal
+   */
+  @Test(groups = { "Functional" })
+  public void testEquals_orderDiffers()
+  {
+    SequenceI seq1 = new Sequence("", "abcdefghijklm");
+    SearchResults sr1 = new SearchResults();
+    SearchResults sr2 = new SearchResults();
+
+    sr1.addResult(seq1, 1, 1);
+    sr1.addResult(seq1, 2, 2);
+    sr2.addResult(seq1, 2, 2);
+    sr2.addResult(seq1, 1, 1);
+    assertFalse(sr1.equals(sr2));
+    assertFalse(sr2.equals(sr1));
+  }
+
+  /**
+   * Verify that hashCode matches for equal objects
+   */
+  @Test(groups = { "Functional" })
+  public void testHashcode()
+  {
+    SequenceI seq1 = new Sequence("", "abcdefghijklm");
+    SearchResults sr1 = new SearchResults();
+    SearchResults sr2 = new SearchResults();
+
+    /*
+     * both empty
+     */
+    assertEquals(sr1.hashCode(), sr2.hashCode());
+
+    /*
+     * both one match
+     */
+    sr1.addResult(seq1, 1, 1);
+    sr2.addResult(seq1, 1, 1);
+    assertEquals(sr1.hashCode(), sr2.hashCode());
+
+    /*
+     * both three matches
+     */
+    sr1.addResult(seq1, 3, 4);
+    sr1.addResult(seq1, 6, 8);
+    sr2.addResult(seq1, 3, 4);
+    sr2.addResult(seq1, 6, 8);
+    assertEquals(sr1.hashCode(), sr2.hashCode());
   }
 }