X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FDnaTest.java;h=6a31b3107c797875c859675a422170716224ba3d;hb=743af46c3c50e67706009be4360fa504bfcd4fdc;hp=1ed846a6e6e7062297ebf1c65c6fc7eecfeb566f;hpb=4c1ab51e2c08f85ba8c38486adf4a6ce0b0f25c3;p=jalview.git diff --git a/test/jalview/analysis/DnaTest.java b/test/jalview/analysis/DnaTest.java index 1ed846a..6a31b31 100644 --- a/test/jalview/analysis/DnaTest.java +++ b/test/jalview/analysis/DnaTest.java @@ -136,7 +136,8 @@ public class DnaTest FileFormat.Fasta); HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(alf, cs); - Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth()); + Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth(), + false); Dna dna = new Dna(av, contigs); AlignmentI translated = dna.translateCdna(); assertNotNull("Couldn't do a full width translation of test data.", @@ -166,7 +167,7 @@ public class DnaTest } cs.hideColumns(ipos + vwidth, alf.getWidth()); Iterator vcontigs = cs.getVisContigsIterator(0, - alf.getWidth()); + alf.getWidth(), false); AlignViewportI av = new AlignViewport(alf, cs); Dna dna = new Dna(av, vcontigs); AlignmentI transAlf = dna.translateCdna(); @@ -193,7 +194,8 @@ public class DnaTest DataSourceType.PASTE, FileFormat.Fasta); HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(alf, cs); - Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth()); + Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth(), + false); Dna dna = new Dna(av, contigs); AlignmentI translated = dna.translateCdna(); String aa = translated.getSequenceAt(0).getSequenceAsString(); @@ -217,7 +219,8 @@ public class DnaTest cs.hideColumns(24, 35); // hide codons 9-12 cs.hideColumns(177, 191); // hide codons 60-64 AlignViewportI av = new AlignViewport(alf, cs); - Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth()); + Iterator contigs = cs.getVisContigsIterator(0, alf.getWidth(), + false); Dna dna = new Dna(av, contigs); AlignmentI translated = dna.translateCdna(); String aa = translated.getSequenceAt(0).getSequenceAsString(); @@ -303,7 +306,8 @@ public class DnaTest .generate(12, 8, 97, 5, 5); HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(cdna, cs); - Iterator contigs = cs.getVisContigsIterator(0, cdna.getWidth()); + Iterator contigs = cs.getVisContigsIterator(0, cdna.getWidth(), + false); Dna dna = new Dna(av, contigs); AlignmentI translated = dna.translateCdna(); @@ -319,7 +323,7 @@ public class DnaTest } AlignmentI cdnaReordered = new Alignment(sorted); av = new AlignViewport(cdnaReordered, cs); - contigs = cs.getVisContigsIterator(0, cdna.getWidth()); + contigs = cs.getVisContigsIterator(0, cdna.getWidth(), false); dna = new Dna(av, contigs); AlignmentI translated2 = dna.translateCdna(); @@ -551,7 +555,8 @@ public class DnaTest HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(al, cs); - Iterator contigs = cs.getVisContigsIterator(0, al.getWidth()); + Iterator contigs = cs.getVisContigsIterator(0, al.getWidth(), + false); Dna testee = new Dna(av, contigs); AlignmentI reversed = testee.reverseCdna(false); assertEquals(1, reversed.getHeight());