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 'releases/Release_2_10_4_Branch' into develop
[jalview.git]
/
test
/
jalview
/
io
/
BioJsHTMLOutputTest.java
diff --git
a/test/jalview/io/BioJsHTMLOutputTest.java
b/test/jalview/io/BioJsHTMLOutputTest.java
index
ddf9a15
..
24e6cf7
100644
(file)
--- a/
test/jalview/io/BioJsHTMLOutputTest.java
+++ b/
test/jalview/io/BioJsHTMLOutputTest.java
@@
-20,6
+20,7
@@
*/
package jalview.io;
*/
package jalview.io;
+import jalview.gui.JvOptionPane;
import jalview.json.binding.biojs.BioJSReleasePojo;
import jalview.json.binding.biojs.BioJSRepositoryPojo;
import jalview.json.binding.biojs.BioJSReleasePojo;
import jalview.json.binding.biojs.BioJSRepositoryPojo;
@@
-33,11
+34,19
@@
import java.util.TreeMap;
import org.testng.Assert;
import org.testng.AssertJUnit;
import org.testng.Assert;
import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class BioJsHTMLOutputTest
{
import org.testng.annotations.Test;
public class BioJsHTMLOutputTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void getJalviewAlignmentAsJsonString()
{
@Test(groups = { "Functional" })
public void getJalviewAlignmentAsJsonString()
{
@@
-54,7
+63,8
@@
public class BioJsHTMLOutputTest
{
e.printStackTrace();
}
{
e.printStackTrace();
}
- bjsTemplate = BioJsHTMLOutput.getBioJsTemplateAsString();
+ bjsTemplate = HTMLOutput.readFileAsString(BioJsHTMLOutput
+ .getCurrentBJSTemplateFile());
// System.out.println(bjsTemplate);
} catch (IOException e)
{
// System.out.println(bjsTemplate);
} catch (IOException e)
{
@@
-70,7
+80,7
@@
public class BioJsHTMLOutputTest
{
try
{
{
try
{
- BioJsHTMLOutput.refreshBioJSVersionsInfo(null);
+ BioJsHTMLOutput.refreshVersionInfo(null);
} catch (URISyntaxException e)
{
AssertJUnit.fail("Expception occured while testing!");
} catch (URISyntaxException e)
{
AssertJUnit.fail("Expception occured while testing!");
@@
-85,7
+95,7
@@
public class BioJsHTMLOutputTest
try
{
BioJsHTMLOutput
try
{
BioJsHTMLOutput
- .refreshBioJSVersionsInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
+ .refreshVersionInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
versions = BioJsHTMLOutput.getBioJsMSAVersions();
} catch (URISyntaxException e)
{
versions = BioJsHTMLOutput.getBioJsMSAVersions();
} catch (URISyntaxException e)
{