git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
116ac80
)
JAL-1889 better (?) wait for Conservation thread
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Tue, 31 Mar 2020 13:41:15 +0000
(14:41 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Tue, 31 Mar 2020 13:41:15 +0000
(14:41 +0100)
test/jalview/gui/AlignViewportTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/gui/AlignViewportTest.java
b/test/jalview/gui/AlignViewportTest.java
index
959abb0
..
4e15dba
100644
(file)
--- 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 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;
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 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
{
public class AlignViewportTest
{
@@
-299,7
+299,7
@@
public class AlignViewportTest
AlignViewport viewport = af.getViewport();
synchronized (this)
{
AlignViewport viewport = af.getViewport();
synchronized (this)
{
- while (viewport.getAlignmentConservationAnnotation() != null)
+ while (viewport.getCalcManager().isWorking())
{
try
{
{
try
{