X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FResidueCountTest.java;h=696ed767c16b6811ddc6929b8dc18249226eddda;hb=16b58dcceb63ffaf4a264f2f3d8bf8a406e8cb96;hp=4eb6dbf4867a61fcaf8a950e2243b813a418c680;hpb=19424d4e1623bfcdcf30567f7a233fe81c4a9e4e;p=jalview.git

diff --git a/test/jalview/datamodel/ResidueCountTest.java b/test/jalview/datamodel/ResidueCountTest.java
index 4eb6dbf..696ed76 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;
@@ -85,13 +87,25 @@ public class ResidueCountTest
     rc.add('-');
     rc.add('.');
     rc.add(' ');
-    
+
     assertEquals(rc.getGapCount(), 4);
     assertEquals(rc.getCount(' '), 4);
     assertEquals(rc.getCount('-'), 4);
     assertEquals(rc.getCount('.'), 4);
     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")
@@ -169,7 +183,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);
@@ -194,7 +208,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);
@@ -272,7 +286,7 @@ public class ResidueCountTest
     rc.add('P');
     assertEquals(rc.getResiduesForCount(Short.MAX_VALUE + 1), "P");
     assertEquals(rc.getResiduesForCount(1), "C");
-  
+
     // modal count is in the 'other data' counts
     rc = new ResidueCount();
     rc.add('Q');
@@ -403,7 +417,7 @@ public class ResidueCountTest
       rc.add('K');
     }
     rc.add('F');
-    
+
     /*
      * percentages are rounded (0.5 rounded up)
      * 10/40 9/40 7/40 6/40 1/40