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-3070 make AlignCalcUI service code work only with instances of ServiceWithParameters
[jalview.git]
/
test
/
jalview
/
ws
/
jabaws
/
MinJabawsClientTests.java
diff --git
a/test/jalview/ws/jabaws/MinJabawsClientTests.java
b/test/jalview/ws/jabaws/MinJabawsClientTests.java
index
53ab8d9
..
6af831f
100644
(file)
--- a/
test/jalview/ws/jabaws/MinJabawsClientTests.java
+++ b/
test/jalview/ws/jabaws/MinJabawsClientTests.java
@@
-22,10
+22,13
@@
package jalview.ws.jabaws;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertEquals;
+import jalview.gui.JvOptionPane;
+
import java.util.ArrayList;
import java.util.List;
import org.testng.Assert;
import java.util.ArrayList;
import java.util.List;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import compbio.data.msa.MsaWS;
import org.testng.annotations.Test;
import compbio.data.msa.MsaWS;
@@
-38,6
+41,13
@@
import compbio.ws.client.Services;
public class MinJabawsClientTests
{
public class MinJabawsClientTests
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* simple test for the benefit of JAL-1338
*
/**
* simple test for the benefit of JAL-1338
*
@@
-56,6
+66,11
@@
public class MinJabawsClientTests
MsaWS msaservice = null;
for (Services service : registry.getSupportedServices())
{
MsaWS msaservice = null;
for (Services service : registry.getSupportedServices())
{
+ if (service == null)
+ {
+ // the 'unsupported service'
+ continue;
+ }
if (service.equals(Services.ClustalOWS))
{
msaservice = (MsaWS) Jws2Client.connect(url, service);
if (service.equals(Services.ClustalOWS))
{
msaservice = (MsaWS) Jws2Client.connect(url, service);