X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FConservationTest.java;fp=test%2Fjalview%2Fanalysis%2FConservationTest.java;h=e1fdf51109ed3402ca251448179c5b0c24969e22;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=fb58655be2316b2dd4c39b6c93fde563494dd435;hpb=e7338a61f3ce96dadf44ac80b2b32cc5ba4b94c8;p=jalview.git diff --git a/test/jalview/analysis/ConservationTest.java b/test/jalview/analysis/ConservationTest.java index fb58655..e1fdf51 100644 --- a/test/jalview/analysis/ConservationTest.java +++ b/test/jalview/analysis/ConservationTest.java @@ -211,7 +211,7 @@ public class ConservationTest seqs.add(new Sequence("seq3", "V-IW-")); seqs.add(new Sequence("seq4", "VGLH-")); seqs.add(new Sequence("seq5", "VGLH-")); - + /* * threshold 50% means a residue has to occur 3 or more times * in a column to be counted for conservation @@ -221,7 +221,7 @@ public class ConservationTest // but it is treated as percentage threshold in calculate() ? Conservation cons = new Conservation("", 50, seqs, 0, 4); cons.calculate(); - + /* * column 0: all V (hydrophobic/aliphatic/small) */ @@ -236,7 +236,7 @@ public class ConservationTest assertEquals(colCons.get("polar").intValue(), 0); assertEquals(colCons.get("positive").intValue(), 0); assertEquals(colCons.get("aromatic").intValue(), 0); - + /* * column 1: all G (hydrophobic/small/tiny) * gaps are ignored as not above threshold @@ -252,7 +252,7 @@ public class ConservationTest assertEquals(colCons.get("polar").intValue(), 0); assertEquals(colCons.get("positive").intValue(), 0); assertEquals(colCons.get("aromatic").intValue(), 0); - + /* * column 2: I/L (aliphatic/hydrophobic), all others negatively conserved */ @@ -267,13 +267,13 @@ public class ConservationTest assertEquals(colCons.get("polar").intValue(), 0); assertEquals(colCons.get("positive").intValue(), 0); assertEquals(colCons.get("aromatic").intValue(), 0); - + /* * column 3: nothing above threshold */ colCons = cons.total[3]; assertTrue(colCons.isEmpty()); - + /* * column 4: all gaps - counted as having all properties */ @@ -329,16 +329,14 @@ public class ConservationTest * verify tooltips; conserved properties are sorted alphabetically within * positive followed by negative */ - assertEquals( - cons.getTooltip(0), + assertEquals(cons.getTooltip(0), "aliphatic hydrophobic small !aromatic !charged !negative !polar !positive !proline !tiny"); - assertEquals( - cons.getTooltip(1), + assertEquals(cons.getTooltip(1), "hydrophobic small tiny !aliphatic !aromatic !charged !negative !polar !positive !proline"); - assertEquals( - cons.getTooltip(2), + assertEquals(cons.getTooltip(2), "aliphatic hydrophobic !aromatic !charged !negative !polar !positive !proline !small !tiny"); - assertEquals(cons.getTooltip(3), "hydrophobic !negative !proline !tiny"); + assertEquals(cons.getTooltip(3), + "hydrophobic !negative !proline !tiny"); assertEquals(cons.getTooltip(4), "hydrophobic"); assertEquals(cons.getTooltip(5), ""); assertEquals(cons.getTooltip(6), "");