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-1270 test suits import order refactor
[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
6085e03
..
d8582af
100644
(file)
--- a/
test/jalview/ext/paradise/TestAnnotate3D.java
+++ b/
test/jalview/ext/paradise/TestAnnotate3D.java
@@
-20,7
+20,8
@@
*/
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.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
import jalview.io.FastaFile;
@@
-31,8
+32,9
@@
import java.io.File;
import java.io.Reader;
import java.util.Iterator;
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;
@@
-41,7
+43,7
@@
import compbio.util.FileUtil;
public class TestAnnotate3D
{
public class TestAnnotate3D
{
- @Test
+ @Test(enabled = false)
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(enabled = false)
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(enabled = false)
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",
@@
-109,6
+111,7
@@
public class TestAnnotate3D
testRNAMLcontent(readers, pdbf);
}
testRNAMLcontent(readers, pdbf);
}
+ @Test(enabled = false)
private void testRNAMLcontent(Iterator<Reader> readers, PDBfile pdbf)
throws Exception
{
private void testRNAMLcontent(Iterator<Reader> readers, PDBfile pdbf)
throws Exception
{
@@
-124,11
+127,12
@@
public class TestAnnotate3D
sb.append(line + "\n");
}
assertTrue("No data returned by Annotate3D", sb.length() > 0);
sb.append(line + "\n");
}
assertTrue("No data returned by Annotate3D", sb.length() > 0);
- AlignmentI al = new FormatAdapter().readFile(sb.toString(),
+ final String lines = sb.toString();
+ AlignmentI al = new FormatAdapter().readFile(lines,
FormatAdapter.PASTE, "RNAML");
if (al == null || al.getHeight() == 0)
{
FormatAdapter.PASTE, "RNAML");
if (al == null || al.getHeight() == 0)
{
- System.out.println(sb.toString());
+ System.out.println(lines);
}
assertTrue("No alignment returned.", al != null);
assertTrue("No sequences in returned alignment.", al.getHeight() > 0);
}
assertTrue("No alignment returned.", al != null);
assertTrue("No sequences in returned alignment.", al.getHeight() > 0);
@@
-141,7
+145,8
@@
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())
{
- if (new String(_struseq.getSequence()).toLowerCase().equals(
+ final String lowerCase = new String(_struseq.getSequence()).toLowerCase();
+ if (lowerCase.equals(
sq_))
{
struseq = _struseq;
sq_))
{
struseq = _struseq;
@@
-150,7
+155,7
@@
public class TestAnnotate3D
}
if (struseq == null)
{
}
if (struseq == null)
{
- Assert.fail("Couldn't find this sequence in original input:\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(new SequenceI[]
{ sq })
+ "\n\nOriginal input:\n"