From 66fd250940f151ec8b2322d98d6bb9627bdc516f Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 2 Nov 2016 11:02:57 +0000 Subject: [PATCH] JAL-98 test updated for percentage rounded --- test/jalview/datamodel/ResidueCountTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/jalview/datamodel/ResidueCountTest.java b/test/jalview/datamodel/ResidueCountTest.java index e879e33..f98e3d3 100644 --- a/test/jalview/datamodel/ResidueCountTest.java +++ b/test/jalview/datamodel/ResidueCountTest.java @@ -4,7 +4,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import jalview.datamodel.ResidueCount; import jalview.datamodel.ResidueCount.SymbolCounts; import org.junit.Assert; @@ -375,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") -- 1.7.10.2