X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fdatamodel%2FResidueCountTest.java;h=696ed767c16b6811ddc6929b8dc18249226eddda;hb=9d9ad2a9237a50e305349a63eb01bb5548d028d0;hp=e90e1a9acb0335e148a1c9226755cfc093b9de88;hpb=a718393f87a8396c8e7733f579d955126c707f4e;p=jalview.git diff --git a/test/jalview/datamodel/ResidueCountTest.java b/test/jalview/datamodel/ResidueCountTest.java index e90e1a9..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,25 +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); + + 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); + 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); + assertEquals(rc.getGapCount(), Short.MAX_VALUE + 1); } @Test(groups = "Functional") @@ -181,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); @@ -206,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); @@ -284,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'); @@ -415,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