JAL-3070 jaba/slivka independent tests for disorder and AACon services

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

diff --git a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
index 3e3a06d..8454e03 100644 (file)
--- a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
+++ b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
@@ -32,9 +32,10 @@ import jalview.io.DataSourceType;
 import jalview.io.FileFormat;
 import jalview.io.FormatAdapter;
 import jalview.io.StockholmFileTest;
-import jalview.ws.jws2.AbstractJabaCalcWorker;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.jws2.SeqAnnotationServiceCalcWorker;
+import jalview.ws.slivkaws.SlivkaWSDiscoverer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,9 +64,9 @@ public class DisorderAnnotExportImport
 
   public static Jws2Discoverer disc;
 
-  public static List<Jws2Instance> iupreds;
+  public static List<ServiceWithParameters> iupreds;
 
-  jalview.ws.jws2.AbstractJabaCalcWorker disorderClient;
+  jalview.ws.jws2.SeqAnnotationServiceCalcWorker disorderClient;
 
   public static jalview.gui.AlignFrame af = null;
 
@@ -81,11 +82,12 @@ public class DisorderAnnotExportImport
       // don't get services until discoverer has finished
       Thread.sleep(100);
     }
-
+    SlivkaWSDiscoverer disc2 = SlivkaWSDiscoverer.getInstance();
+    disc2.run();
     iupreds = new ArrayList<>();
-    for (Jws2Instance svc : disc.getServices())
+    for (ServiceWithParameters svc : disc2.getServices())
     {
-      if (svc.getNameURI().toLowerCase().contains("iupredws"))
+      if (svc.getNameURI().toLowerCase().contains("iupred"))
       {
         iupreds.add(svc);
       }
@@ -114,7 +116,7 @@ public class DisorderAnnotExportImport
   @Test(groups = { "External", "Network" })
   public void testDisorderAnnotExport()
   {
-    disorderClient = new AbstractJabaCalcWorker(iupreds.get(0), af, null,
+    disorderClient = new SeqAnnotationServiceCalcWorker(iupreds.get(0), af, null,
             null);
     af.getViewport().getCalcManager().startWorker(disorderClient);
     do