/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 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.
*
*/
package jalview.ws.jabaws;
-import static org.junit.Assert.*;
+import jalview.gui.JvOptionPane;
import jalview.ws.jws2.Jws2Discoverer;
import java.util.Vector;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
public class JalviewJabawsTestUtils
{
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
}
/**
* test servers
*/
- public static String[] serviceUrls = new String[]
- { "http://localhost:8080/jabaws" };
+ private static String[] serviceUrls = new String[] {
+ "http://localhost:8080/jabaws",
+ "http://www.compbio.dundee.ac.uk/jabaws" };
- @Test
+ @Test(groups = { "Functional" }, enabled = false)
public void testAnnotExport()
{
- fail("Not yet implemented");
+ Assert.fail("Not yet implemented");
}
public static jalview.ws.jws2.Jws2Discoverer getJabawsDiscoverer()
{
return getJabawsDiscoverer(true);
}
+
+ /**
+ * Returns a service discoverer that queries localhost and compbio urls.
+ * <p>
+ * If using this method, be sure to have read-only Jalview properties, to
+ * avoid writing the test urls to .jalview_properties. This can be done by
+ * either
+ * <ul>
+ * <li>running Jalview main with arguments -props propFileName</li>
+ * <li>calling Cache.loadProperties(filename)</li>
+ * <ul>
+ *
+ * @param localhost
+ * @return
+ */
public static Jws2Discoverer getJabawsDiscoverer(boolean localhost)
{
jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
services.add(url);
}
;
- Jws2Discoverer.setServiceUrls(services);
+ Jws2Discoverer.getDiscoverer().setServiceUrls(services);
}
try
{
} catch (Exception e)
{
e.printStackTrace();
- fail("Aborting. Problem discovering services. Tried " + svcurls);
+ Assert.fail(
+ "Aborting. Problem discovering services. Tried " + svcurls);
}
- assertTrue("Failed to discover any services at ", disc.getServices()
- .size() > 0);
+ Assert.assertTrue(disc.getServices().size() > 0,
+ "Failed to discover any services at ");
return disc;
}
-
}