X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FAAConAnnotAndSettingsIO.java;fp=test%2Fjalview%2Fws%2Fjabaws%2FAAConAnnotAndSettingsIO.java;h=2a6c3d0b1691a1bab967d858f350946bf37a967d;hb=ef2b8e4a4d6db3bb95506b523c27dfd3231b12f3;hp=02d0d8297311d03894a5885d792729979123a0dd;hpb=98f7eeb363adb07cc607192989e8fb42aae498e0;p=jalview.git

diff --git a/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java b/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java
index 02d0d82..2a6c3d0 100644
--- 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);