X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fparadise%2FTestAnnotate3D.java;h=3365c52ffcf80ec33406dfde87dbdfe54cf670fe;hb=1ae9824ef37ce4ed36d1da986003474b47d1ab11;hp=6085e03f400ad03a4f52542814bdaff26353609b;hpb=af28532d835bbef7d85bde74696a1ef751d7ff5c;p=jalview.git diff --git a/test/jalview/ext/paradise/TestAnnotate3D.java b/test/jalview/ext/paradise/TestAnnotate3D.java index 6085e03..3365c52 100644 --- a/test/jalview/ext/paradise/TestAnnotate3D.java +++ b/test/jalview/ext/paradise/TestAnnotate3D.java @@ -21,10 +21,6 @@ package jalview.ext.paradise; import static org.junit.Assert.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; @@ -35,9 +31,13 @@ import org.junit.Assert; import org.junit.Test; import MCview.PDBfile; - import compbio.util.FileUtil; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.SequenceI; +import jalview.io.FastaFile; +import jalview.io.FormatAdapter; + public class TestAnnotate3D { @@ -124,11 +124,12 @@ public class TestAnnotate3D 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) { - System.out.println(sb.toString()); + System.out.println(lines); } assertTrue("No alignment returned.", al != null); assertTrue("No sequences in returned alignment.", al.getHeight() > 0); @@ -141,7 +142,8 @@ public class TestAnnotate3D 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;