X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FResidueCountTest.java;h=31a42b6cb754863cd34f4a7c67dac8a7cb9a0445;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=462104fa9f07b4dc736e8fad19067bbda3fa6766;hpb=56e8c00dcdc6aa8596830451e4419e64628c77f8;p=jalview.git

diff --git a/test/jalview/datamodel/ResidueCountTest.java b/test/jalview/datamodel/ResidueCountTest.java
index 462104f..31a42b6 100644
--- a/test/jalview/datamodel/ResidueCountTest.java
+++ b/test/jalview/datamodel/ResidueCountTest.java
@@ -20,6 +20,8 @@
  */
 package jalview.datamodel;
 
+import java.util.Locale;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -71,6 +73,7 @@ public class ResidueCountTest
     assertEquals(rc.getCount('N'), 1);
     assertEquals(rc.getCount('?'), 0);
     assertEquals(rc.getCount('-'), 0);
+    assertEquals(rc.getTotalResidueCount(), 11);
 
     assertFalse(rc.isCountingInts());
     assertFalse(rc.isUsingOtherData());
@@ -92,8 +95,21 @@ public class ResidueCountTest
     assertEquals(rc.getCount(' '), 4);
     assertEquals(rc.getCount('-'), 4);
     assertEquals(rc.getCount('.'), 4);
+    assertEquals(rc.getTotalResidueCount(), 0);
     assertFalse(rc.isUsingOtherData());
     assertFalse(rc.isCountingInts());
+    
+    rc.set(ResidueCount.GAP_COUNT, Short.MAX_VALUE-2);
+    assertEquals(rc.getGapCount(), Short.MAX_VALUE-2);
+    assertFalse(rc.isCountingInts());
+    rc.addGap();
+    assertEquals(rc.getGapCount(), Short.MAX_VALUE-1);
+    assertFalse(rc.isCountingInts());
+    rc.addGap();
+    assertEquals(rc.getGapCount(), Short.MAX_VALUE);
+    rc.addGap();
+    assertTrue(rc.isCountingInts());
+    assertEquals(rc.getGapCount(), Short.MAX_VALUE+1);
   }
 
   @Test(groups = "Functional")
@@ -160,6 +176,7 @@ public class ResidueCountTest
     assertEquals(rc.getCount('m'), 13);
     assertEquals(rc.getCount('G'), 0);
     assertEquals(rc.getCount('-'), 0);
+    assertEquals(rc.getTotalResidueCount(), 27);
 
     assertFalse(rc.isCountingInts());
     assertFalse(rc.isUsingOtherData());
@@ -171,7 +188,7 @@ public class ResidueCountTest
     ResidueCount rc = new ResidueCount(false);
     // expected characters (upper or lower case):
     String aas = "ACDEFGHIKLMNPQRSTVWXY";
-    String lower = aas.toLowerCase();
+    String lower = aas.toLowerCase(Locale.ROOT);
     for (int i = 0; i < aas.length(); i++)
     {
       rc.put(aas.charAt(i), i);
@@ -196,7 +213,7 @@ public class ResidueCountTest
     ResidueCount rc = new ResidueCount(true);
     // expected characters (upper or lower case):
     String nucs = "ACGTUN";
-    String lower = nucs.toLowerCase();
+    String lower = nucs.toLowerCase(Locale.ROOT);
     for (int i = 0; i < nucs.length(); i++)
     {
       rc.put(nucs.charAt(i), i);
@@ -450,7 +467,7 @@ public class ResidueCountTest
     ResidueCount rc = new ResidueCount(Arrays.asList(seq1, seq2));
 
     assertEquals(rc.getGapCount(), 7);
-    assertEquals(rc.getTotalCount(), 15); // excludes gaps
+    assertEquals(rc.getTotalResidueCount(), 15); // excludes gaps
     assertEquals(rc.getCount('a'), 2);
     assertEquals(rc.getCount('A'), 2);
     assertEquals(rc.getCount('B'), 3);