From 1e1e0ca0093114157b5ca45efda5c0fb24ead6bd Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 21 Sep 2015 10:05:39 +0100 Subject: [PATCH] JAL-1152 small change to match revised annotation sorting logic --- test/jalview/gui/AnnotationChooserTest.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/test/jalview/gui/AnnotationChooserTest.java b/test/jalview/gui/AnnotationChooserTest.java index 4be4759..f08fa8d 100644 --- a/test/jalview/gui/AnnotationChooserTest.java +++ b/test/jalview/gui/AnnotationChooserTest.java @@ -78,12 +78,12 @@ public class AnnotationChooserTest // pin down annotation sort order for test Cache.applicationProperties.setProperty(Preferences.SORT_ANNOTATIONS, SequenceAnnotationOrder.NONE.name()); - final String True = Boolean.TRUE.toString(); + final String TRUE = Boolean.TRUE.toString(); Cache.applicationProperties.setProperty( - Preferences.SHOW_AUTOCALC_ABOVE, True); - Cache.applicationProperties.setProperty("SHOW_QUALITY", True); - Cache.applicationProperties.setProperty("SHOW_CONSERVATION", True); - Cache.applicationProperties.setProperty("SHOW_IDENTITY", True); + Preferences.SHOW_AUTOCALC_ABOVE, TRUE); + Cache.applicationProperties.setProperty("SHOW_QUALITY", TRUE); + Cache.applicationProperties.setProperty("SHOW_CONSERVATION", TRUE); + Cache.applicationProperties.setProperty("SHOW_IDENTITY", TRUE); AlignmentI al = new jalview.io.FormatAdapter().readFile(TEST_DATA, AppletFormatAdapter.PASTE, "FASTA"); @@ -759,6 +759,9 @@ public class AnnotationChooserTest assertTrue(i + "'th sequence not visible", anns[i].visible); } + /* + * check options to hide JMol and IUPRED annotations for all sequences + */ final Checkbox hideCheckbox = (Checkbox) getComponent(testee, 1, 0, 1); setSelected(hideCheckbox, true); @@ -772,8 +775,8 @@ public class AnnotationChooserTest assertTrue(anns[0].visible); // Conservation assertTrue(anns[1].visible); // Quality assertTrue(anns[2].visible); // Consensus - assertTrue(anns[3].visible); // Beauty (not seq-related) - assertFalse(anns[4].visible); // IUPRED + assertFalse(anns[3].visible); // IUPRED + assertTrue(anns[4].visible); // Beauty (not seq-related) assertFalse(anns[5].visible); // JMol assertFalse(anns[6].visible); // IUPRED assertFalse(anns[7].visible); // JMol -- 1.7.10.2