X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fparadise%2FTestAnnotate3D.java;h=c6c1a29891ace0ec971596b906bec33b5f04bac7;hb=d065bc916cb63af83cdab7319f5177a855724aba;hp=c2be67ec89f89c7b83eed2d1444c7dfea7d1b0a2;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git diff --git a/test/jalview/ext/paradise/TestAnnotate3D.java b/test/jalview/ext/paradise/TestAnnotate3D.java index c2be67e..c6c1a29 100644 --- a/test/jalview/ext/paradise/TestAnnotate3D.java +++ b/test/jalview/ext/paradise/TestAnnotate3D.java @@ -24,6 +24,7 @@ import static org.testng.AssertJUnit.assertTrue; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; +import jalview.gui.JvOptionPane; import jalview.io.DataSourceType; import jalview.io.FastaFile; import jalview.io.FileFormat; @@ -36,6 +37,7 @@ import java.util.Iterator; import org.testng.Assert; import org.testng.AssertJUnit; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import MCview.PDBfile; @@ -45,6 +47,13 @@ import compbio.util.FileUtil; public class TestAnnotate3D { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + @Test(groups = { "Network" }, enabled = true) public void test1GIDbyId() throws Exception { @@ -143,10 +152,10 @@ public class TestAnnotate3D { { SequenceI struseq = null; - String sq_ = new String(sq.getSequence()).toLowerCase(); + String sq_ = sq.getSequenceAsString().toLowerCase(); for (SequenceI _struseq : pdbf.getSeqsAsArray()) { - final String lowerCase = new String(_struseq.getSequence()) + final String lowerCase = _struseq.getSequenceAsString() .toLowerCase(); if (lowerCase.equals(sq_)) { @@ -158,11 +167,11 @@ public class TestAnnotate3D { AssertJUnit .fail("Couldn't find this sequence in original input:\n" - + new FastaFile() - .print(new SequenceI[] { sq }) + + new FastaFile().print( + new SequenceI[] { sq }, true) + "\n\nOriginal input:\n" - + new FastaFile().print(pdbf.getSeqsAsArray()) - + "\n"); + + new FastaFile().print( + pdbf.getSeqsAsArray(), true) + "\n"); } } }