git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a5ce61
)
JAL-98 test updated for percentage rounded
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 2 Nov 2016 11:02:57 +0000
(11:02 +0000)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 2 Nov 2016 11:02:57 +0000
(11:02 +0000)
test/jalview/datamodel/ResidueCountTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/datamodel/ResidueCountTest.java
b/test/jalview/datamodel/ResidueCountTest.java
index
e879e33
..
f98e3d3
100644
(file)
--- 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 static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import jalview.datamodel.ResidueCount;
import jalview.datamodel.ResidueCount.SymbolCounts;
import org.junit.Assert;
import jalview.datamodel.ResidueCount.SymbolCounts;
import org.junit.Assert;
@@
-375,11
+374,19
@@
public class ResidueCountTest
}
rc.add('F');
}
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),
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),
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")
}
@Test(groups = "Functional")