X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSearchResultsTest.java;h=5d2b8a4d324a2e450466f1cd08d0660b888f6684;hb=3659ecfe7bb17dd25a0a6b5c94a7d9dab4525136;hp=a302d6ee57f44e5d37683c204ea01c18305c42fd;hpb=c1e22e204c48fe7fc30dbb95be46e5a04808898a;p=jalview.git

diff --git a/test/jalview/datamodel/SearchResultsTest.java b/test/jalview/datamodel/SearchResultsTest.java
index a302d6e..5d2b8a4 100644
--- a/test/jalview/datamodel/SearchResultsTest.java
+++ b/test/jalview/datamodel/SearchResultsTest.java
@@ -214,15 +214,16 @@ public class SearchResultsTest
     int marked = 0;
     SequenceI seq1 = new Sequence("", "abcdefghijklm");
     SequenceI seq2 = new Sequence("", "abcdefghijklm");
-    SequenceGroup s1g=new SequenceGroup(), s2g=new SequenceGroup(), sallg=new SequenceGroup();
+    SequenceGroup s1g = new SequenceGroup(), s2g = new SequenceGroup(),
+            sallg = new SequenceGroup();
     s1g.addSequence(seq1, false);
     s2g.addSequence(seq2, false);
     sallg.addSequence(seq1, false);
     sallg.addSequence(seq2, false);
-    
+
     SearchResultsI sr = new SearchResults();
     BitSet bs = new BitSet();
-    
+
     SearchResultMatchI srm = null;
     srm = sr.addResult(seq1, 1, 1);
     Assert.assertNotNull("addResult didn't return Match", srm);
@@ -230,7 +231,7 @@ public class SearchResultsTest
     assertEquals("Sequence reference not set", seq2, srm.getSequence());
     assertEquals("match start incorrect", 1, srm.getStart());
     assertEquals("match end incorrect", 2, srm.getEnd());
-    
+
     // set start/end range for groups to cover matches
 
     s1g.setStartRes(0);
@@ -250,11 +251,10 @@ public class SearchResultsTest
     assertTrue("Didn't mark expected position", bs.get(0));
     // now check return value for marking the same again
     assertEquals(
-            "Didn't count number of bits marked for existing marked set",
-            0,
+            "Didn't count number of bits marked for existing marked set", 0,
             sr.markColumns(s1g, bs));
     bs.clear();
-    
+
     /*
      * just seq2
      */
@@ -263,7 +263,7 @@ public class SearchResultsTest
     assertEquals("Didn't return count of number of bits marked", 2, marked);
     assertTrue("Didn't mark expected position (1)", bs.get(0));
     assertTrue("Didn't mark expected position (2)", bs.get(1));
-    
+
     /*
      * both seq1 and seq2 
      * should be same as seq2
@@ -281,8 +281,10 @@ public class SearchResultsTest
     s2g.setEndRes(1);
     sallg.setEndRes(0);
     BitSet tbs = new BitSet();
-    assertEquals("Group start/end didn't select columns to mark",1, sr.markColumns(s2g, tbs));
-    assertEquals("Group start/end didn't select columns to mark", 1, sr.markColumns(sallg, tbs));
+    assertEquals("Group start/end didn't select columns to mark", 1,
+            sr.markColumns(s2g, tbs));
+    assertEquals("Group start/end didn't select columns to mark", 1,
+            sr.markColumns(sallg, tbs));
     assertEquals(
             "Didn't set expected number of columns in total for two successive marks",
             2, tbs.cardinality());
@@ -297,11 +299,11 @@ public class SearchResultsTest
     SequenceI seq1 = new Sequence("", "abcdefghijklm");
     SearchResultsI sr = new SearchResults();
     sr.addResult(seq1, 3, 5);
-    assertEquals(1, sr.getSize());
+    assertEquals(1, sr.getCount());
     sr.addResult(seq1, 3, 5);
-    assertEquals(1, sr.getSize());
+    assertEquals(1, sr.getCount());
     sr.addResult(seq1, 3, 6);
-    assertEquals(2, sr.getSize());
+    assertEquals(2, sr.getCount());
   }
 
   /**