X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fparadise%2FTestAnnotate3D.java;h=3365c52ffcf80ec33406dfde87dbdfe54cf670fe;hb=de75573aa38c4b40686256d4332c3a069b6a98ca;hp=9212f1a72a3596d70f4392d984322b7dcb7dba96;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/test/jalview/ext/paradise/TestAnnotate3D.java b/test/jalview/ext/paradise/TestAnnotate3D.java index 9212f1a..3365c52 100644 --- a/test/jalview/ext/paradise/TestAnnotate3D.java +++ b/test/jalview/ext/paradise/TestAnnotate3D.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -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;