From d93853ac01781d719baad0b13bacb65a6e3b8f71 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 22 Jul 2021 18:00:55 +0100 Subject: [PATCH] JAL-3848 - actually test the Slivka and JABAWS disorder services - nb still need asserts to verify the disorder annotation from Slivka looks like Jabaws --- .../ws/jabaws/DisorderAnnotExportImport.java | 21 +++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java index 372dcb2..8c4816f 100644 --- a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java +++ b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java @@ -43,6 +43,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; /* @@ -113,14 +114,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 -- 1.7.10.2