*/
package jalview.ws.jabaws;
+import java.util.Locale;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
/*
// don't get services until discoverer has finished
Thread.sleep(100);
}
+
SlivkaWSDiscoverer disc2 = SlivkaWSDiscoverer.getInstance();
disc2.startDiscoverer();
while (disc2.isRunning())
{
- Thread.sleep(100);
- }
- iupreds = new ArrayList<>();
- for (ServiceWithParameters svc : disc2.getServices())
- {
- if (svc.getNameURI().toLowerCase().contains("iupred"))
+ if (svc.getServiceTypeURI().toLowerCase(Locale.ROOT).contains("iupredws"))
{
iupreds.add(svc);
}
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