Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112

[jalview.git] / test / jalview / schemes / PIDColourSchemeTest.java

diff --git a/test/jalview/schemes/PIDColourSchemeTest.java b/test/jalview/schemes/PIDColourSchemeTest.java
index fa4b5d9..4117b23 100644 (file)
--- a/test/jalview/schemes/PIDColourSchemeTest.java
+++ b/test/jalview/schemes/PIDColourSchemeTest.java
@@ -2,15 +2,15 @@ package jalview.schemes;
 
 import static org.testng.Assert.assertEquals;
 
+import java.awt.Color;
+
+import org.testng.annotations.Test;
+
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
-import jalview.gui.AlignViewport;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
-
-import java.awt.Color;
-
-import org.testng.annotations.Test;
+import jalview.viewmodel.AlignmentViewport;
 
 public class PIDColourSchemeTest
 {
@@ -83,20 +83,17 @@ public class PIDColourSchemeTest
      */
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(seqs,
             DataSourceType.PASTE);
-    AlignViewport viewport = af.getViewport();
+    AlignmentViewport viewport = af.getViewport();
     viewport.setIgnoreGapsConsensus(false, af.alignPanel);
-    while (viewport.getConsensusSeq() == null)
+    do
     {
-      synchronized (this)
+      try
+      {
+        Thread.sleep(50);
+      } catch (InterruptedException x)
       {
-        try
-        {
-          wait(50);
-        } catch (InterruptedException e)
-        {
-        }
       }
-    }
+    } while (af.getViewport().getCalcManager().isWorking());
     af.changeColour_actionPerformed(JalviewColourScheme.PID.toString());
 
     SequenceI seq = viewport.getAlignment().getSequenceAt(0);