*/
package jalview.ws.rest;
-import static org.junit.Assert.*;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.AlignmentView;
import jalview.gui.AlignFrame;
-import jalview.io.FileParse;
-import jalview.ws.rest.InputType;
-import jalview.ws.rest.params.SeqGroupIndexVector;
+import jalview.gui.JvOptionPane;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.Map;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
/**
* @author jimp
public class ShmmrRSBSService
{
- @Test
- public void testSeparatorListToArrayForRestServiceDescriptions()
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
{
- assertTrue(
- "separatorListToArray is faulty.",
- RestServiceDescription.separatorListToArray(
- "foo=',',min='foo',max='1,2,3',fa=','", ",").length == 4);
- assertTrue("separatorListToArray is faulty.",
- RestServiceDescription.separatorListToArray(
- "minsize='2', sep=','", ",").length != 2); // probably
- // should come as
- // 2
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
}
- @Test
+ @Test(groups = { "Functional" })
public void testShmmrService()
{
RestClient.makeShmmrRestClient().service));
}
- @Test
+ @Test(groups = { "Functional" })
public void testShmmrServiceDataprep() throws Exception
{
RestClient _rc = RestClient.makeShmmrRestClient();
assertNotNull(_rc);
AlignFrame alf = new jalview.io.FileLoader(false)
.LoadFileWaitTillLoaded("examples/testdata/smad.fa",
- jalview.io.FormatAdapter.FILE);
+ jalview.io.DataSourceType.FILE);
assertNotNull("Couldn't find test data.", alf);
alf.loadJalviewDataFile("examples/testdata/smad_groups.jva",
- jalview.io.FormatAdapter.FILE, null, null);
+ jalview.io.DataSourceType.FILE, null, null);
assertTrue(
"Couldn't load the test data's annotation file (should be 5 groups but found "
+ alf.getViewport().getAlignment().getGroups().size()
- + ").", alf.getViewport().getAlignment().getGroups()
- .size() == 5);
+ + ").",
+ alf.getViewport().getAlignment().getGroups().size() == 5);
RestClient rc = new RestClient(_rc.service, alf, true);
assertNotNull("Couldn't creat RestClient job.", rc);
- jalview.bin.Cache.initLogger();
+ jalview.bin.Console.initLogger();
RestJob rjb = new RestJob(0, new RestJobThread(rc),
rc.av.getAlignment(), null);
rjb.setAlignmentForInputs(rc.service.getInputParams().values(),
return testRsdExchange(desc, newService);
} catch (Throwable x)
{
- System.err.println("Failed for service (" + desc + "): "
- + servicestring);
+ System.err.println(
+ "Failed for service (" + desc + "): " + servicestring);
x.printStackTrace();
return false;
}
fromservicetostring);
if (!newService.isValid())
{
- throw new Error("Failed to create service from '"
- + fromservicetostring + "'.\n"
- + newService.getInvalidMessage());
+ throw new Error(
+ "Failed to create service from '" + fromservicetostring
+ + "'.\n" + newService.getInvalidMessage());
}
if (!service.equals(newService))
}
} catch (Throwable x)
{
- System.err.println("Failed for service (" + desc + "): "
- + service.toString());
+ System.err.println(
+ "Failed for service (" + desc + "): " + service.toString());
x.printStackTrace();
return false;
}