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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
test
/
jalview
/
ext
/
paradise
/
TestAnnotate3D.java
diff --git
a/test/jalview/ext/paradise/TestAnnotate3D.java
b/test/jalview/ext/paradise/TestAnnotate3D.java
index
3365c52
..
4110863
100644
(file)
--- a/
test/jalview/ext/paradise/TestAnnotate3D.java
+++ b/
test/jalview/ext/paradise/TestAnnotate3D.java
@@
-20,28
+20,30
@@
*/
package jalview.ext.paradise;
*/
package jalview.ext.paradise;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertTrue;
+
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SequenceI;
+import jalview.io.FastaFile;
+import jalview.io.FormatAdapter;
import java.io.BufferedReader;
import java.io.File;
import java.io.Reader;
import java.util.Iterator;
import java.io.BufferedReader;
import java.io.File;
import java.io.Reader;
import java.util.Iterator;
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
import MCview.PDBfile;
import MCview.PDBfile;
-import compbio.util.FileUtil;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.SequenceI;
-import jalview.io.FastaFile;
-import jalview.io.FormatAdapter;
+import compbio.util.FileUtil;
public class TestAnnotate3D
{
public class TestAnnotate3D
{
- @Test
+ @Test(groups = { "Network" }, enabled = true)
public void test1GIDbyId() throws Exception
{
// use same ID as standard tests given at
public void test1GIDbyId() throws Exception
{
// use same ID as standard tests given at
@@
-51,7
+53,7
@@
public class TestAnnotate3D
testRNAMLcontent(ids, null);
}
testRNAMLcontent(ids, null);
}
- @Test
+ @Test(groups = { "Network" }, enabled = true)
public void testIdVsContent2GIS() throws Exception
{
Iterator<Reader> ids = Annotate3D.getRNAMLForPDBId("2GIS");
public void testIdVsContent2GIS() throws Exception
{
Iterator<Reader> ids = Annotate3D.getRNAMLForPDBId("2GIS");
@@
-95,7
+97,7
@@
public class TestAnnotate3D
*
* @throws Exception
*/
*
* @throws Exception
*/
- @Test
+ @Test(groups = { "Network" }, enabled = true)
public void testPDBfileVsRNAML() throws Exception
{
PDBfile pdbf = new PDBfile(true, false, true, "examples/2GIS.pdb",
public void testPDBfileVsRNAML() throws Exception
{
PDBfile pdbf = new PDBfile(true, false, true, "examples/2GIS.pdb",
@@
-142,9
+144,9
@@
public class TestAnnotate3D
String sq_ = new String(sq.getSequence()).toLowerCase();
for (SequenceI _struseq : pdbf.getSeqsAsArray())
{
String sq_ = new String(sq.getSequence()).toLowerCase();
for (SequenceI _struseq : pdbf.getSeqsAsArray())
{
- final String lowerCase = new String(_struseq.getSequence()).toLowerCase();
- if (lowerCase.equals(
- sq_))
+ final String lowerCase = new String(_struseq.getSequence())
+ .toLowerCase();
+ if (lowerCase.equals(sq_))
{
struseq = _struseq;
break;
{
struseq = _struseq;
break;
@@
-152,11
+154,13
@@
public class TestAnnotate3D
}
if (struseq == null)
{
}
if (struseq == null)
{
- Assert.fail("Couldn't find this sequence in original input:\n"
- + new FastaFile().print(new SequenceI[]
- { sq })
- + "\n\nOriginal input:\n"
- + new FastaFile().print(pdbf.getSeqsAsArray()) + "\n");
+ AssertJUnit
+ .fail("Couldn't find this sequence in original input:\n"
+ + new FastaFile()
+ .print(new SequenceI[] { sq })
+ + "\n\nOriginal input:\n"
+ + new FastaFile().print(pdbf.getSeqsAsArray())
+ + "\n");
}
}
}
}
}
}