Merge remote-tracking branch 'origin/tasks/JAL-3070_wsinterfaces' into alpha/JAL...

[jalview.git] / test / jalview / ws / jabaws / AAConAnnotAndSettingsIO.java

diff --git a/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java b/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java
index 02d0d82..2a6c3d0 100644 (file)
--- a/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java
+++ b/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java
@@ -162,7 +162,7 @@ public class AAConAnnotAndSettingsIO
     SeqAnnotationServiceCalcWorker aaconClient = new SeqAnnotationServiceCalcWorker(
             aacon, af, null,
             null);
-    long current = System.currentTimeMillis(), limit = 5;
+    long current = System.currentTimeMillis(), limit = 15;
     af.getViewport().getCalcManager().startWorker(aaconClient);
     do
     {
@@ -180,8 +180,12 @@ public class AAConAnnotAndSettingsIO
     } while (af.getViewport().getCalcManager().isWorking());
     AlignmentI orig_alig = af.getViewport().getAlignment();
     boolean foundShenkin = false;
-    for (AlignmentAnnotation aa : orig_alig
-            .findAnnotation(aacon.getAlignAnalysisUI().getCalcId()))
+    Iterable<AlignmentAnnotation> _aa=orig_alig
+            .findAnnotation(aacon.getAlignAnalysisUI().getCalcId());
+    assertTrue("No annotation from service",
+            _aa != null && _aa.iterator().hasNext());
+
+    for (AlignmentAnnotation aa : _aa)
     {
       assertTrue("AACon annotation not marked as autocalculated!",
               aa.autoCalculated);