X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FAlignmentTest.java;fp=test%2Fjalview%2Fdatamodel%2FAlignmentTest.java;h=df98af9ff3a308f36b8ff0c2f353729407df55df;hb=bfb4b56a77352694f4bc445ec31851bbdcdce140;hp=3b3d9267b77ad239498aea6ac28bb5a8e1eb8b84;hpb=286715d8408510556366a454a748daf8f60444f1;p=jalview.git diff --git a/test/jalview/datamodel/AlignmentTest.java b/test/jalview/datamodel/AlignmentTest.java index 3b3d926..df98af9 100644 --- a/test/jalview/datamodel/AlignmentTest.java +++ b/test/jalview/datamodel/AlignmentTest.java @@ -171,21 +171,27 @@ public class AlignmentTest } /** - * Aligning protein from cDNA yet to be implemented, does nothing. + * Aligning protein from cDNA. * * @throws IOException */ @Test public void testAlignAs_proteinAsCdna() throws IOException { + // see also AlignmentUtilsTests AlignmentI al1 = loadAlignment(CDNA_SEQS_1, "FASTA"); AlignmentI al2 = loadAlignment(AA_SEQS_1, "FASTA"); - String before0 = al2.getSequenceAt(0).getSequenceAsString(); - String before1 = al2.getSequenceAt(1).getSequenceAsString(); + AlignedCodonFrame acf = new AlignedCodonFrame(); + MapList ml = new MapList(new int[] + { 1, 12 }, new int[] + { 1, 4 }, 3, 1); + acf.addMap(al1.getSequenceAt(0), al2.getSequenceAt(0), ml); + acf.addMap(al1.getSequenceAt(1), al2.getSequenceAt(1), ml); + al2.addCodonFrame(acf); ((Alignment) al2).alignAs(al1, false, true); - assertEquals(before0, al2.getSequenceAt(0).getSequenceAsString()); - assertEquals(before1, al2.getSequenceAt(1).getSequenceAsString()); + assertEquals("K-Q-Y-L-", al2.getSequenceAt(0).getSequenceAsString()); + assertEquals("-R-F-P-W", al2.getSequenceAt(1).getSequenceAsString()); } /**