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
Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
[jalview.git]
/
test
/
jalview
/
io
/
BioJsHTMLOutputTest.java
diff --git
a/test/jalview/io/BioJsHTMLOutputTest.java
b/test/jalview/io/BioJsHTMLOutputTest.java
index
619a4e0
..
27c8a0e
100644
(file)
--- a/
test/jalview/io/BioJsHTMLOutputTest.java
+++ b/
test/jalview/io/BioJsHTMLOutputTest.java
@@
-1,5
+1,8
@@
package jalview.io;
package jalview.io;
+import jalview.json.binding.v1.BioJSReleasePojo;
+import jalview.json.binding.v1.BioJSRepositoryPojo;
+
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
@@
-12,14
+15,11
@@
import org.testng.Assert;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
-import jalview.json.binding.v1.BioJSReleasePojo;
-import jalview.json.binding.v1.BioJSRepositoryPojo;
-
public class BioJsHTMLOutputTest
{
public class BioJsHTMLOutputTest
{
- @Test
+ @Test(groups ={ "Functional" })
public void getJalviewAlignmentAsJsonString()
{
String bjsTemplate = null;
public void getJalviewAlignmentAsJsonString()
{
String bjsTemplate = null;
@@
-44,7
+44,8
@@
public class BioJsHTMLOutputTest
Assert.assertNotNull(bjsTemplate);
}
Assert.assertNotNull(bjsTemplate);
}
- @Test(expectedExceptions = NullPointerException.class)
+ @Test(groups =
+ { "Functional" }, expectedExceptions = NullPointerException.class)
public void expectedNullPointerException()
{
try
public void expectedNullPointerException()
{
try
@@
-57,7
+58,7
@@
public class BioJsHTMLOutputTest
}
}
}
}
- @Test
+ @Test(groups ={ "Functional" })
public void getBioJsMSAVersions()
{
TreeMap<String, File> versions = null;
public void getBioJsMSAVersions()
{
TreeMap<String, File> versions = null;
@@
-89,7
+90,8
@@
public class BioJsHTMLOutputTest
}
}
- @Test
+ @Test(groups =
+ { "Network" })
public void testBioJsUpdate()
{
String url = BioJsHTMLOutput.BJS_TEMPLATE_GIT_REPO;
public void testBioJsUpdate()
{
String url = BioJsHTMLOutput.BJS_TEMPLATE_GIT_REPO;