X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=test%2Fjalview%2Fio%2FBioJsHTMLOutputTest.java;h=63485a64208b4b6df99ff8cfb0fea12ecd6ae971;hb=0ccaf35f7e6a5cc62d4f433b39d574d0aa4b2d26;hp=4372f3083f14cf8f51ccb5a98daabe3d9c293cf3;hpb=52288466dd1e71946a06fd1e6ea15fa8e652c693;p=jalview.git
diff --git a/test/jalview/io/BioJsHTMLOutputTest.java b/test/jalview/io/BioJsHTMLOutputTest.java
index 4372f30..63485a6 100644
--- a/test/jalview/io/BioJsHTMLOutputTest.java
+++ b/test/jalview/io/BioJsHTMLOutputTest.java
@@ -1,5 +1,26 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.io;
+import jalview.gui.JvOptionPane;
import jalview.json.binding.biojs.BioJSReleasePojo;
import jalview.json.binding.biojs.BioJSRepositoryPojo;
@@ -13,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()
{
@@ -34,7 +63,8 @@ public class BioJsHTMLOutputTest
{
e.printStackTrace();
}
- bjsTemplate = BioJsHTMLOutput.getBioJsTemplateAsString();
+ bjsTemplate = HTMLOutput.readFileAsString(
+ BioJsHTMLOutput.getCurrentBJSTemplateFile());
// System.out.println(bjsTemplate);
} catch (IOException e)
{
@@ -44,13 +74,14 @@ public class BioJsHTMLOutputTest
}
@Test(
- groups = { "Functional" },
+ groups =
+ { "Functional" },
expectedExceptions = NullPointerException.class)
public void expectedNullPointerException()
{
try
{
- BioJsHTMLOutput.refreshBioJSVersionsInfo(null);
+ BioJsHTMLOutput.refreshVersionInfo(null);
} catch (URISyntaxException e)
{
AssertJUnit.fail("Expception occured while testing!");
@@ -64,8 +95,8 @@ public class BioJsHTMLOutputTest
TreeMap versions = null;
try
{
- BioJsHTMLOutput
- .refreshBioJSVersionsInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
+ BioJsHTMLOutput.refreshVersionInfo(
+ BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
versions = BioJsHTMLOutput.getBioJsMSAVersions();
} catch (URISyntaxException e)
{
@@ -94,16 +125,16 @@ public class BioJsHTMLOutputTest
public void testBioJsUpdate()
{
String url = BioJsHTMLOutput.BJS_TEMPLATE_GIT_REPO;
- AssertJUnit
- .assertTrue("URL not reacable : " + url, urlIsReachable(url));
+ AssertJUnit.assertTrue("URL not reacable : " + url,
+ urlIsReachable(url));
String response = BioJsHTMLOutput.getURLContentAsString(url);
AssertJUnit.assertNotNull("Null response read from url!", response);
BioJSRepositoryPojo repository = new BioJSRepositoryPojo(response);
System.out.println(">>> description : " + repository.getDescription());
- System.out.println(">>> latest version : "
- + repository.getLatestReleaseVersion());
- System.out.println(">>> repo count : "
- + repository.getReleases().size());
+ System.out.println(
+ ">>> latest version : " + repository.getLatestReleaseVersion());
+ System.out
+ .println(">>> repo count : " + repository.getReleases().size());
for (BioJSReleasePojo release : repository.getReleases())
{
System.out.println("repo type : " + release.getType());