X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FAAConAnnotAndSettingsIO.java;h=ac7b37ce49075a9dd1c144544c4bd2517d3a4254;hb=3f4b01ff53be81b3a04a9893f9bd2a93dbee0a6f;hp=02d0d8297311d03894a5885d792729979123a0dd;hpb=7ce2e1f63202ad3707219707ff4264fe7b47e40d;p=jalview.git

diff --git a/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java b/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java
index 02d0d82..ac7b37c 100644
--- a/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java
+++ b/test/jalview/ws/jabaws/AAConAnnotAndSettingsIO.java
@@ -70,7 +70,6 @@ public class AAConAnnotAndSettingsIO
   public static void setUpBeforeClass() throws Exception
   {
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
-    Cache.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
 
     while (disc.isRunning())
@@ -89,7 +88,8 @@ public class AAConAnnotAndSettingsIO
       }
     }
 
-    for (ServiceWithParameters svc : SlivkaWSDiscoverer.getServices())
+    for (ServiceWithParameters svc : SlivkaWSDiscoverer.getInstance()
+            .getServices())
     {
       if (svc.getNameURI().toLowerCase().contains("aacon"))
       {
@@ -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);