X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FBioJsHTMLOutputTest.java;h=27c8a0e15ed165c8990d07cdb669eb604dc62456;hb=8bbcfb93404decd6d660ca32b69a29f8a1f34e82;hp=134d84fcfbbf2367e939d80bf32ee4c601157cec;hpb=bd0830d40949c8a701ef82f467e7c0e0b68aba31;p=jalview.git

diff --git a/test/jalview/io/BioJsHTMLOutputTest.java b/test/jalview/io/BioJsHTMLOutputTest.java
index 134d84f..27c8a0e 100644
--- a/test/jalview/io/BioJsHTMLOutputTest.java
+++ b/test/jalview/io/BioJsHTMLOutputTest.java
@@ -11,21 +11,21 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.TreeMap;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
 
 
 public class BioJsHTMLOutputTest
 {
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void getJalviewAlignmentAsJsonString()
   {
-    BioJsHTMLOutput bioJsHtmlOutput = new BioJsHTMLOutput(null, null);
     String bjsTemplate = null;
     try
     {
-      bioJsHtmlOutput.updateBioJS();
+      BioJsHTMLOutput.updateBioJS();
       try
       {
         // allow the update some three seconds to complete before getting latest
@@ -44,36 +44,36 @@ public class BioJsHTMLOutputTest
     Assert.assertNotNull(bjsTemplate);
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test(groups =
+  { "Functional" }, expectedExceptions = NullPointerException.class)
   public void expectedNullPointerException()
   {
-    BioJsHTMLOutput bjs = new BioJsHTMLOutput(null, null);
     try
     {
-      bjs.refreshBioJSVersionsInfo(null);
+      BioJsHTMLOutput.refreshBioJSVersionsInfo(null);
     } catch (URISyntaxException e)
     {
-      Assert.fail("Expception occured while testing!");
+      AssertJUnit.fail("Expception occured while testing!");
       e.printStackTrace();
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void getBioJsMSAVersions()
   {
-    BioJsHTMLOutput bjs = new BioJsHTMLOutput(null, null);
     TreeMap<String, File> versions = null;
     try
     {
-      bjs.refreshBioJSVersionsInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
+      BioJsHTMLOutput
+              .refreshBioJSVersionsInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
       versions = BioJsHTMLOutput.getBioJsMSAVersions();
     } catch (URISyntaxException e)
     {
-      Assert.fail("Expception occured while testing!");
+      AssertJUnit.fail("Expception occured while testing!");
       e.printStackTrace();
     }
-    Assert.assertNotNull("No versions found", versions);
-    Assert.assertTrue("One or more Templates required", versions.size() > 0);
+    AssertJUnit.assertNotNull("No versions found", versions);
+    AssertJUnit.assertTrue("One or more Templates required", versions.size() > 0);
     System.out
             .println("Number of discovered versions : "
             + versions.size());
@@ -85,18 +85,19 @@ public class BioJsHTMLOutputTest
 
     System.out.println("\nCurrent latest version : "
             + BioJsHTMLOutput.getCurrentBJSTemplateFile());
-    Assert.assertNotNull("Latest BioJsMSA version NOT found!",
+    AssertJUnit.assertNotNull("Latest BioJsMSA version NOT found!",
             BioJsHTMLOutput.getCurrentBJSTemplateFile());
 
   }
 
-  @Test
+  @Test(groups =
+  { "Network" })
   public void testBioJsUpdate()
   {
     String url = BioJsHTMLOutput.BJS_TEMPLATE_GIT_REPO;
-    Assert.assertTrue("URL not reacable : " + url, urlIsReachable(url));
+    AssertJUnit.assertTrue("URL not reacable : " + url, urlIsReachable(url));
     String response = BioJsHTMLOutput.getURLContentAsString(url);
-    Assert.assertNotNull("Null response read from url!", response);
+    AssertJUnit.assertNotNull("Null response read from url!", response);
     BioJSRepositoryPojo repository = new BioJSRepositoryPojo(response);
     System.out.println(">>> description : " + repository.getDescription());
     System.out