Merge remote-tracking branch 'origin/develop' into bug/JAL-2282

[jalview.git] / test / jalview / datamodel / ResidueCountTest.java

diff --git a/test/jalview/analysis/ResidueCountTest.java b/test/jalview/datamodel/ResidueCountTest.java
similarity index 96%
rename from test/jalview/analysis/ResidueCountTest.java
rename to test/jalview/datamodel/ResidueCountTest.java
index 4a71f89..f98e3d3 100644 (file)
--- a/test/jalview/analysis/ResidueCountTest.java
+++ b/test/jalview/datamodel/ResidueCountTest.java
@@ -1,10 +1,10 @@
-package jalview.analysis;
+package jalview.datamodel;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-import jalview.analysis.ResidueCount.SymbolCounts;
+import jalview.datamodel.ResidueCount.SymbolCounts;
 
 import org.junit.Assert;
 import org.testng.annotations.Test;
@@ -374,11 +374,19 @@ public class ResidueCountTest
     }
     rc.add('F');
     
+    /*
+     * percentages are rounded (0.5 rounded up)
+     * 10/40 9/40 7/40 6/40 1/40
+     */
     assertEquals(rc.getTooltip(40, 0),
-            "P 25%; W 22%; C 17%; Q 17%; K 15%; F 2%");
+            "P 25%; W 23%; C 18%; Q 18%; K 15%; F 3%");
 
+    rc.add('Q');
+    /*
+     * 10/30 9/30 8/30 7/30 6/30 1/30
+     */
     assertEquals(rc.getTooltip(30, 1),
-            "P 33.3%; W 30.0%; C 23.3%; Q 23.3%; K 20.0%; F 3.3%");
+            "P 33.3%; W 30.0%; Q 26.7%; C 23.3%; K 20.0%; F 3.3%");
   }
 
   @Test(groups = "Functional")