X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignFrameTest.java;h=1d8b2404a82e7cffd250a6b912235edba33180e3;hb=613818a08b858e3fe0dd778c738a362b3a4a0882;hp=67098ae85d3fa493839b320f147eea34b66b7aa1;hpb=97f7dd4f753e4a95e4d58b2e3818004d353c02c3;p=jalview.git

diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java
index 67098ae..1d8b240 100644
--- a/test/jalview/gui/AlignFrameTest.java
+++ b/test/jalview/gui/AlignFrameTest.java
@@ -26,6 +26,7 @@ import static org.testng.Assert.assertNotSame;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
+import jalview.api.AlignCalcManagerI;
 import jalview.bin.Cache;
 import jalview.bin.Jalview;
 import jalview.datamodel.Alignment;
@@ -538,16 +539,28 @@ public class AlignFrameTest
             new String[] { "Background" }));
 
     /*
-     * make a new View, verify alignment and group colour schemes
+     * make a new View, wait for Conservation thread to complete,
+     * verify alignment and group colour schemes
      */
     af.newView_actionPerformed(null);
     assertEquals(af.alignPanel.getViewName(), "View 1");
     AlignViewport av2 = af.getViewport();
     assertNotSame(av, av2);
+    assertSame(av2, af.alignPanel.av);
+    AlignCalcManagerI calcManager = av2.getCalcManager();
+    do
+    {
+      try
+      {
+        Thread.sleep(50);
+      } catch (InterruptedException x)
+      {
+      }
+    } while (calcManager.isWorking());
     rs = av2.getResidueShading();
     assertNotSame(av.getResidueShading(), rs);
     assertEquals(rs.getThreshold(), 10);
-    assertTrue(rs.conservationApplied());
+    assertTrue(rs.conservationApplied(), rs.toString());
     assertEquals(rs.getConservationInc(), 20);
     assertEquals(av2.getAlignment().getGroups().size(), 1);
     sg = av2.getAlignment().getGroups().get(0);