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
Merge branch 'feature/JAL-2488finalize' into develop
[jalview.git]
/
test
/
jalview
/
ws
/
rest
/
RestClientTest.java
diff --git
a/test/jalview/ws/rest/RestClientTest.java
b/test/jalview/ws/rest/RestClientTest.java
index
4c55012
..
7a9419a
100644
(file)
--- a/
test/jalview/ws/rest/RestClientTest.java
+++ b/
test/jalview/ws/rest/RestClientTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-23,13
+23,23
@@
package jalview.ws.rest;
import static org.testng.AssertJUnit.assertEquals;
import jalview.bin.Cache;
import static org.testng.AssertJUnit.assertEquals;
import jalview.bin.Cache;
+import jalview.gui.JvOptionPane;
import java.util.Vector;
import java.util.Vector;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class RestClientTest
{
import org.testng.annotations.Test;
public class RestClientTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* Refactored 'as is' from main method
*/
/**
* Refactored 'as is' from main method
*/