X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignViewportTest.java;fp=test%2Fjalview%2Fgui%2FAlignViewportTest.java;h=bd36a08d276e62d65d68a76df28cf56904f42569;hb=3609d4b908fa64cab35f2348401baab3347188fc;hp=977e90169567c13c1bb60695b7af28805b2366f2;hpb=2eea4e73351d902cd88923d863e9780fa57a0ee7;p=jalview.git diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java index 977e901..bd36a08 100644 --- a/test/jalview/gui/AlignViewportTest.java +++ b/test/jalview/gui/AlignViewportTest.java @@ -28,6 +28,14 @@ import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; import jalview.api.AlignViewportI; +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; @@ -50,14 +58,6 @@ import jalview.util.MapList; import jalview.viewmodel.AlignmentViewport; 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 { @@ -301,7 +301,7 @@ public class AlignViewportTest AlignViewport viewport = af.getViewport(); synchronized (this) { - while (viewport.getAlignmentConservationAnnotation() != null) + while (viewport.getCalcManager().isWorking()) { try {