X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignmentPanelTest.java;h=80dc939bcc2b4214333c63026fd7ff1fdae00323;hb=55ebdfcc6bd979605c9bb2b4092a422b035bc27e;hp=1b0ec356b0d531a1f72acf05a91c2782772f4cc2;hpb=5721b73c6d5de84b21a989a8734e4c161f5dc630;p=jalview.git

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index 1b0ec35..80dc939 100644
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -33,8 +33,6 @@ import jalview.viewmodel.ViewportRanges;
 
 import java.lang.reflect.InvocationTargetException;
 
-import javax.swing.SwingUtilities;
-
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -145,14 +143,7 @@ public class AlignmentPanelTest
     af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa",
             DataSourceType.FILE);
     
-    /*
-     * ensure the panel has been repainted and so ViewportRanges set
-     */
-    SwingUtilities.invokeAndWait(new Runnable() {
-		@Override
-		public void run() {
-		    af.repaint();
-		}});
+    af.paintImmediately(af.getBounds());
 
     /*
      * wait for Consensus thread to complete
@@ -163,7 +154,7 @@ public class AlignmentPanelTest
       {
         try
         {
-          wait(50);
+          wait(250); // BH was 50
         } catch (InterruptedException e)
         {
         }
@@ -177,7 +168,7 @@ public class AlignmentPanelTest
    * or without hidden columns
    */
   @Test(groups = "Functional")
-  public void TestSetScrollValues()
+  public void testSetScrollValues()
   {
     ViewportRanges ranges = af.getViewport().getRanges();
     af.alignPanel.setScrollValues(0, 0);
@@ -202,6 +193,8 @@ public class AlignmentPanelTest
     int scrollpos = 60;
     af.getViewport().hideColumns(30, 50);
     af.alignPanel.setScrollValues(scrollpos, 5);
+
+    af.paintImmediately(af.getBounds());
     assertEquals(ranges.getEndRes(), oldres + scrollpos);
 
     // scroll to position within hidden columns, still sets endres to oldres +
@@ -219,6 +212,7 @@ public class AlignmentPanelTest
     scrollpos = 130;
     af.getViewport().showAllHiddenColumns();
     af.alignPanel.setScrollValues(scrollpos, 5);
+    af.paintImmediately(af.getBounds());
     assertEquals(ranges.getEndRes(), af.getViewport()
             .getAlignment().getWidth() - 1);
 
@@ -227,6 +221,7 @@ public class AlignmentPanelTest
     // endRes should be set to width of alignment - 1 - the number of hidden
     // columns
     af.getViewport().hideColumns(30, 50);
+    af.paintImmediately(af.getBounds());
     af.alignPanel.setScrollValues(scrollpos, 5);
     assertEquals(ranges.getEndRes(), af.getViewport()
             .getAlignment().getWidth() - 1 - 21); // 21 is the number of hidden
@@ -238,25 +233,47 @@ public class AlignmentPanelTest
    * when switching from wrapped back to unwrapped mode (JAL-2739)
    */
   @Test(groups = "Functional")
-  public void TestUpdateLayout_endRes()
+  public void testUpdateLayout_endRes()
   {
     // get details of original alignment dimensions
     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)
+      {
+      }
+    }
+  }
 }