X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FBioJsHTMLOutputTest.java;h=24e6cf7b2155d0d78173d33eff83eeb4f3837e7f;hb=1fcc59559aec3e57268d4175f9ff3dbf9a3e16e5;hp=09ce54c7be64e764eb3f3dcb04e01d694a3917e1;hpb=a8362b85de4f21440433bc9385bd9b3a24354532;p=jalview.git diff --git a/test/jalview/io/BioJsHTMLOutputTest.java b/test/jalview/io/BioJsHTMLOutputTest.java index 09ce54c..24e6cf7 100644 --- a/test/jalview/io/BioJsHTMLOutputTest.java +++ b/test/jalview/io/BioJsHTMLOutputTest.java @@ -20,6 +20,7 @@ */ package jalview.io; +import jalview.gui.JvOptionPane; 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.annotations.BeforeClass; 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() { @@ -54,7 +63,7 @@ public class BioJsHTMLOutputTest { e.printStackTrace(); } - bjsTemplate = HtmlFile.readFileAsString(BioJsHTMLOutput + bjsTemplate = HTMLOutput.readFileAsString(BioJsHTMLOutput .getCurrentBJSTemplateFile()); // System.out.println(bjsTemplate); } catch (IOException e) @@ -71,7 +80,7 @@ public class BioJsHTMLOutputTest { try { - BioJsHTMLOutput.refreshBioJSVersionsInfo(null); + BioJsHTMLOutput.refreshVersionInfo(null); } catch (URISyntaxException e) { AssertJUnit.fail("Expception occured while testing!"); @@ -86,7 +95,7 @@ public class BioJsHTMLOutputTest try { BioJsHTMLOutput - .refreshBioJSVersionsInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY); + .refreshVersionInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY); versions = BioJsHTMLOutput.getBioJsMSAVersions(); } catch (URISyntaxException e) {