X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FBioJsHTMLOutputTest.java;h=24e6cf7b2155d0d78173d33eff83eeb4f3837e7f;hb=77b160b053c41a5d5c95bf1bbc0fbd066435f70d;hp=2d49bf7464629225b9a61cd48995a61fc4a830cc;hpb=c7d9dbc9b92889077b91bcdb052032fe33fb269e;p=jalview.git
diff --git a/test/jalview/io/BioJsHTMLOutputTest.java b/test/jalview/io/BioJsHTMLOutputTest.java
index 2d49bf7..24e6cf7 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,13 +34,20 @@ 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
{
- @Test(groups ={ "Functional" })
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @Test(groups = { "Functional" })
public void getJalviewAlignmentAsJsonString()
{
String bjsTemplate = null;
@@ -35,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 +73,14 @@ public class BioJsHTMLOutputTest
Assert.assertNotNull(bjsTemplate);
}
- @Test(groups =
- { "Functional" }, expectedExceptions = NullPointerException.class)
+ @Test(
+ groups = { "Functional" },
+ expectedExceptions = NullPointerException.class)
public void expectedNullPointerException()
{
try
{
- BioJsHTMLOutput.refreshBioJSVersionsInfo(null);
+ BioJsHTMLOutput.refreshVersionInfo(null);
} catch (URISyntaxException e)
{
AssertJUnit.fail("Expception occured while testing!");
@@ -58,14 +88,14 @@ public class BioJsHTMLOutputTest
}
}
- @Test(groups ={ "Functional" })
+ @Test(groups = { "Functional" })
public void getBioJsMSAVersions()
{
TreeMap versions = null;
try
{
BioJsHTMLOutput
- .refreshBioJSVersionsInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
+ .refreshVersionInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
versions = BioJsHTMLOutput.getBioJsMSAVersions();
} catch (URISyntaxException e)
{
@@ -73,10 +103,10 @@ public class BioJsHTMLOutputTest
e.printStackTrace();
}
AssertJUnit.assertNotNull("No versions found", versions);
- AssertJUnit.assertTrue("One or more Templates required", versions.size() > 0);
+ AssertJUnit.assertTrue("One or more Templates required",
+ versions.size() > 0);
System.out
- .println("Number of discovered versions : "
- + versions.size());
+ .println("Number of discovered versions : " + versions.size());
for (String v : versions.keySet())
{
System.out.println("version : " + v);
@@ -90,18 +120,17 @@ public class BioJsHTMLOutputTest
}
- @Test(groups =
- { "Network" })
+ @Test(groups = { "Network" })
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 : "
+ System.out.println(">>> latest version : "
+ repository.getLatestReleaseVersion());
System.out.println(">>> repo count : "
+ repository.getReleases().size());