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
JAL-1759 merge from develop
[jalview.git]
/
test
/
jalview
/
io
/
BioJsHTMLOutputTest.java
diff --git
a/test/jalview/io/BioJsHTMLOutputTest.java
b/test/jalview/io/BioJsHTMLOutputTest.java
index
3e94aa9
..
27c8a0e
100644
(file)
--- a/
test/jalview/io/BioJsHTMLOutputTest.java
+++ b/
test/jalview/io/BioJsHTMLOutputTest.java
@@
-11,21
+11,30
@@
import java.net.URL;
import java.net.URLConnection;
import java.util.TreeMap;
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
{
public class BioJsHTMLOutputTest
{
- @Test
+ @Test(groups ={ "Functional" })
public void getJalviewAlignmentAsJsonString()
{
public void getJalviewAlignmentAsJsonString()
{
- BioJsHTMLOutput bioJsHtmlOutput = new BioJsHTMLOutput(null, null);
String bjsTemplate = null;
try
{
String bjsTemplate = null;
try
{
- bioJsHtmlOutput.updateBioJS();
+ BioJsHTMLOutput.updateBioJS();
+ try
+ {
+ // allow the update some three seconds to complete before getting latest
+ // version of BioJS template
+ Thread.sleep(1000 * 3);
+ } catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
bjsTemplate = BioJsHTMLOutput.getBioJsTemplateAsString();
// System.out.println(bjsTemplate);
} catch (IOException e)
bjsTemplate = BioJsHTMLOutput.getBioJsTemplateAsString();
// System.out.println(bjsTemplate);
} catch (IOException e)
@@
-35,36
+44,36
@@
public class BioJsHTMLOutputTest
Assert.assertNotNull(bjsTemplate);
}
Assert.assertNotNull(bjsTemplate);
}
- @Test(expected = NullPointerException.class)
+ @Test(groups =
+ { "Functional" }, expectedExceptions = NullPointerException.class)
public void expectedNullPointerException()
{
public void expectedNullPointerException()
{
- BioJsHTMLOutput bjs = new BioJsHTMLOutput(null, null);
try
{
try
{
- bjs.refreshBioJSVersionsInfo(null);
+ BioJsHTMLOutput.refreshBioJSVersionsInfo(null);
} catch (URISyntaxException e)
{
} catch (URISyntaxException e)
{
- Assert.fail("Expception occured while testing!");
+ AssertJUnit.fail("Expception occured while testing!");
e.printStackTrace();
}
}
e.printStackTrace();
}
}
- @Test
+ @Test(groups ={ "Functional" })
public void getBioJsMSAVersions()
{
public void getBioJsMSAVersions()
{
- BioJsHTMLOutput bjs = new BioJsHTMLOutput(null, null);
TreeMap<String, File> versions = null;
try
{
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)
{
versions = BioJsHTMLOutput.getBioJsMSAVersions();
} catch (URISyntaxException e)
{
- Assert.fail("Expception occured while testing!");
+ AssertJUnit.fail("Expception occured while testing!");
e.printStackTrace();
}
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());
System.out
.println("Number of discovered versions : "
+ versions.size());
@@
-76,18
+85,19
@@
public class BioJsHTMLOutputTest
System.out.println("\nCurrent latest version : "
+ BioJsHTMLOutput.getCurrentBJSTemplateFile());
System.out.println("\nCurrent latest version : "
+ BioJsHTMLOutput.getCurrentBJSTemplateFile());
- Assert.assertNotNull("Latest BioJsMSA version NOT found!",
+ AssertJUnit.assertNotNull("Latest BioJsMSA version NOT found!",
BioJsHTMLOutput.getCurrentBJSTemplateFile());
}
BioJsHTMLOutput.getCurrentBJSTemplateFile());
}
- @Test
+ @Test(groups =
+ { "Network" })
public void testBioJsUpdate()
{
String url = BioJsHTMLOutput.BJS_TEMPLATE_GIT_REPO;
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);
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
BioJSRepositoryPojo repository = new BioJSRepositoryPojo(response);
System.out.println(">>> description : " + repository.getDescription());
System.out