Merge branch 'alpha/origin_2022_JAL-3066_Jalview_212_slivka-integration' into spike...

[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 025c913..7bbd072 100644 (file)
--- a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
+++ b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
@@ -20,6 +20,7 @@
  */
 package jalview.ws.jabaws;
 
+import java.util.Locale;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
 
@@ -35,6 +36,7 @@ import jalview.io.StockholmFileTest;
 import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.Jws2Discoverer;
 import jalview.ws.jws2.SeqAnnotationServiceCalcWorker;
+import jalview.ws.slivkaws.SlivkaWSDiscoverer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +44,7 @@ import java.util.List;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 /*
@@ -82,10 +85,11 @@ public class DisorderAnnotExportImport
       Thread.sleep(100);
     }
 
-    iupreds = new ArrayList<>();
-    for (ServiceWithParameters svc : disc.getServices())
+    SlivkaWSDiscoverer disc2 = SlivkaWSDiscoverer.getInstance();
+    disc2.startDiscoverer();
+    while (disc2.isRunning())
     {
-      if (svc.getNameURI().toLowerCase().contains("iupredws"))
+      if (svc.getServiceTypeURI().toLowerCase(Locale.ROOT).contains("iupredws"))
       {
         iupreds.add(svc);
       }
@@ -107,14 +111,28 @@ public class DisorderAnnotExportImport
       af = null;
     }
   }
+  
+  @DataProvider(name="getIuPreds",parallel = false)
+  public static ServiceWithParameters[][] getIuPreds()
+  {
+    ServiceWithParameters[][] services = new ServiceWithParameters[iupreds
+            .size()][1];
+
+    int i = 0;
+    for (ServiceWithParameters iupred : iupreds)
+    {
+      services[i++][0] = iupred;
+    }
+    return services;
+  }
 
   /**
    * test for patches to JAL-1294
    */
-  @Test(groups = { "External", "Network" })
-  public void testDisorderAnnotExport()
+  @Test(groups = { "External", "Network" },dataProvider = "getIuPreds")
+  public void testDisorderAnnotExport(ServiceWithParameters iuPred)
   {
-    disorderClient = new SeqAnnotationServiceCalcWorker(iupreds.get(0), af, null,
+    disorderClient = new SeqAnnotationServiceCalcWorker(iuPred, af, null,
             null);
     af.getViewport().getCalcManager().startWorker(disorderClient);
     do