From d96786f52f7ef3ae7d6645b63d3958b9c0fe4848 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Tue, 31 Mar 2020 14:41:15 +0100 Subject: [PATCH] JAL-1889 better (?) wait for Conservation thread --- test/jalview/gui/AlignViewportTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java index 959abb0..4e15dba 100644 --- a/test/jalview/gui/AlignViewportTest.java +++ b/test/jalview/gui/AlignViewportTest.java @@ -27,6 +27,14 @@ import static org.testng.AssertJUnit.assertNotSame; import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; +import java.util.ArrayList; +import java.util.List; + +import org.testng.Assert; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + import jalview.bin.Cache; import jalview.bin.Jalview; import jalview.datamodel.AlignedCodonFrame; @@ -48,14 +56,6 @@ import jalview.structure.StructureSelectionManager; import jalview.util.MapList; import jalview.viewmodel.ViewportRanges; -import java.util.ArrayList; -import java.util.List; - -import org.testng.Assert; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - public class AlignViewportTest { @@ -299,7 +299,7 @@ public class AlignViewportTest AlignViewport viewport = af.getViewport(); synchronized (this) { - while (viewport.getAlignmentConservationAnnotation() != null) + while (viewport.getCalcManager().isWorking()) { try { -- 1.7.10.2