X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjws2%2FParameterUtilsTest.java;h=66ce169ff1b43afd1df0682961bf78fa90dd5ecb;hb=7692386ccfe778075dd83a753d30a7a27fe507be;hp=b92f1a23af6b47c2788b4295a74fbfb998c99233;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java index b92f1a2..66ce169 100644 --- a/test/jalview/ws/jws2/ParameterUtilsTest.java +++ b/test/jalview/ws/jws2/ParameterUtilsTest.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -25,6 +25,8 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; import jalview.bin.Cache; +import jalview.gui.JvOptionPane; +import jalview.ws.api.UIinfo; import jalview.ws.jabaws.JalviewJabawsTestUtils; import jalview.ws.jws2.jabaws2.Jws2Instance; @@ -41,13 +43,26 @@ import compbio.metadata.Preset; import compbio.metadata.PresetManager; import compbio.metadata.WrongParameterException; +/* + * All methods in this class are set to the Network group because setUpBeforeClass will fail + * if there is no network. + */ +@Test(singleThreaded = true) public class ParameterUtilsTest { + + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + /* * To limit tests to specify services, add them to this list; leave list empty * to test all */ - private static List serviceTests = new ArrayList(); + private static List serviceTests = new ArrayList<>(); private static Jws2Discoverer disc = null; @@ -55,11 +70,12 @@ public class ParameterUtilsTest public static void setUpBeforeClass() throws Exception { serviceTests.add("AAConWS".toLowerCase()); + Cache.loadProperties("test/jalview/io/testProps.jvprops"); Cache.initLogger(); disc = JalviewJabawsTestUtils.getJabawsDiscoverer(); } - @Test(groups = { "Functional" }) + @Test(groups = { "Network" }) public void testWriteParameterSet() throws WrongParameterException { for (Jws2Instance service : disc.getServices()) @@ -113,13 +129,13 @@ public class ParameterUtilsTest * @param service * @return */ - public boolean isForTesting(Jws2Instance service) + public boolean isForTesting(UIinfo service) { return serviceTests.size() == 0 - || serviceTests.contains(service.serviceType.toLowerCase()); + || serviceTests.contains(service.getName().toLowerCase()); } - @Test(groups = { "Functional" }) + @Test(groups = { "Network" }) public void testCopyOption() { for (Jws2Instance service : disc.getServices()) @@ -143,7 +159,7 @@ public class ParameterUtilsTest /** */ - @Test(groups = { "Functional" }) + @Test(groups = { "Network" }) public void testCopyParameter() { for (Jws2Instance service : disc.getServices())