JAL-3253-applet JAL-3423

AlignFrameTest fixes for timing and lack of ResidueShading conservation
data.

diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java
index 779941b..68f0282 100644 (file)
--- a/test/jalview/gui/AlignFrameTest.java
+++ b/test/jalview/gui/AlignFrameTest.java
@@ -158,6 +158,7 @@ public class AlignFrameTest
      * use read-only test properties file
      */
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
+    Cache.setPropertyNoSave("SHOW_JWS2_SERVICES", Boolean.FALSE.toString());
     Jalview.main(new String[] { "-nonews" });
   }
 
@@ -341,6 +342,7 @@ public class AlignFrameTest
   @Test(groups = "Functional")
   public void testColourThresholdActions()
   {
+
     AlignViewport av = af.getViewport();
     AlignmentI al = av.getAlignment();
 
@@ -374,7 +376,12 @@ public class AlignFrameTest
     SliderPanel sp = SliderPanel.getSliderPanel();
     assertTrue(sp.isForConservation());
     assertEquals(sp.getValue(), 30); // initial slider setting
+
+    // BH 2019.08.28 this was necessary so that rs was updated
+    af.changeColour_actionPerformed(JalviewColourScheme.Helix.toString());
+
     sp.valueChanged(10);
+
     assertSame(rs, av.getResidueShading());
     c = rs.findColour('I', 14, ferCapan);
     Color i_faded = new Color(196, 186, 196);
@@ -499,6 +506,21 @@ public class AlignFrameTest
     assertEquals(c, s_original);
   }
 
+  private void waitSome()
+  {
+
+    // just a hack
+    synchronized (this)
+    {
+      try
+      {
+        wait(250);
+      } catch (InterruptedException e)
+      {
+      }
+    }
+  }
+
   /**
    * Verify that making a New View transfers alignment and group colour schemes,
    * including any thresholds, to the new view. Because New View is performed by

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index fd67ac4..4d1a730 100644 (file)
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -239,20 +239,41 @@ public class AlignmentPanelTest
     ViewportRanges ranges = af.getViewport().getRanges();
     int endres = ranges.getEndRes();
 
+    System.out.println("APT range end0 " + ranges.getEndRes());
     // wrap
     af.alignPanel.getAlignViewport().setWrapAlignment(true);
     af.alignPanel.updateLayout();
     af.paintImmediately(af.getBounds());
-
+    waitSome();
+    System.out.println("APT range end1 " + ranges.getEndRes());
     // endRes has changed
     assertNotEquals(ranges.getEndRes(), endres);
 
     // unwrap
     af.alignPanel.getAlignViewport().setWrapAlignment(false);
     af.alignPanel.updateLayout();
+    waitSome();
     af.paintImmediately(af.getBounds());
+
+    System.out.println("APT range end3 " + ranges.getEndRes());
+
     // endRes back to original value
     assertEquals(ranges.getEndRes(), endres);
 
   }
+
+  private void waitSome()
+  {
+
+    // just a hack
+    synchronized (this)
+    {
+      try
+      {
+        wait(250);
+      } catch (InterruptedException e)
+      {
+      }
+    }
+  }
 }