git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3438 spotless for 2.11.2.0
[jalview.git]
/
test
/
jalview
/
ws
/
rest
/
ShmmrRSBSService.java
diff --git
a/test/jalview/ws/rest/ShmmrRSBSService.java
b/test/jalview/ws/rest/ShmmrRSBSService.java
index
1f807b3
..
cd17a63
100644
(file)
--- a/
test/jalview/ws/rest/ShmmrRSBSService.java
+++ b/
test/jalview/ws/rest/ShmmrRSBSService.java
@@
-24,9
+24,11
@@
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
import jalview.gui.AlignFrame;
import static org.testng.AssertJUnit.assertTrue;
import jalview.gui.AlignFrame;
+import jalview.gui.JvOptionPane;
import java.util.Map;
import java.util.Map;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
import org.testng.annotations.Test;
/**
@@
-36,7
+38,14
@@
import org.testng.annotations.Test;
public class ShmmrRSBSService
{
public class ShmmrRSBSService
{
- @Test(groups ={ "Functional" })
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @Test(groups = { "Functional" })
public void testShmmrService()
{
public void testShmmrService()
{
@@
-46,27
+55,27
@@
public class ShmmrRSBSService
RestClient.makeShmmrRestClient().service));
}
RestClient.makeShmmrRestClient().service));
}
- @Test(groups ={ "Functional" })
+ @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",
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",
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()
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);
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(),
RestJob rjb = new RestJob(0, new RestJobThread(rc),
rc.av.getAlignment(), null);
rjb.setAlignmentForInputs(rc.service.getInputParams().values(),
@@
-93,8
+102,8
@@
public class ShmmrRSBSService
return testRsdExchange(desc, newService);
} catch (Throwable x)
{
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;
}
x.printStackTrace();
return false;
}
@@
-110,9
+119,9
@@
public class ShmmrRSBSService
fromservicetostring);
if (!newService.isValid())
{
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))
}
if (!service.equals(newService))
@@
-125,8
+134,8
@@
public class ShmmrRSBSService
}
} catch (Throwable x)
{
}
} 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;
}
x.printStackTrace();
return false;
}