X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FAlignmentTest.java;h=06be9827351abb9fa78eb8db379551f2d2f1bbbd;hp=266b90a781ecb8858710292efe91996bbd9c7011;hb=391467e57959e2c71a5051de06da2028dc07f2ba;hpb=aad3640b07f836362df7ea025fa09127a0a06145 diff --git a/test/jalview/datamodel/AlignmentTest.java b/test/jalview/datamodel/AlignmentTest.java index 266b90a..06be982 100644 --- a/test/jalview/datamodel/AlignmentTest.java +++ b/test/jalview/datamodel/AlignmentTest.java @@ -27,16 +27,6 @@ import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; -import jalview.analysis.AlignmentGenerator; -import jalview.datamodel.AlignedCodonFrame.SequenceToSequenceMapping; -import jalview.gui.JvOptionPane; -import jalview.io.DataSourceType; -import jalview.io.FileFormat; -import jalview.io.FileFormatI; -import jalview.io.FormatAdapter; -import jalview.util.Comparison; -import jalview.util.MapList; - import java.io.IOException; import java.util.Arrays; import java.util.Iterator; @@ -47,6 +37,16 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import jalview.analysis.AlignmentGenerator; +import jalview.datamodel.AlignedCodonFrame.SequenceToSequenceMapping; +import jalview.gui.JvOptionPane; +import jalview.io.DataSourceType; +import jalview.io.FileFormat; +import jalview.io.FileFormatI; +import jalview.io.FormatAdapter; +import jalview.util.Comparison; +import jalview.util.MapList; + /** * Unit tests for Alignment datamodel. * @@ -193,8 +193,8 @@ public class AlignmentTest return false; } } - return verifyAlignmentDatasetRefs(alignment.getDataset(), - raiseAssert, message); + return verifyAlignmentDatasetRefs(alignment.getDataset(), raiseAssert, + message); } else { @@ -247,8 +247,9 @@ public class AlignmentTest { if (raiseAssert) { - Assert.fail(message - + " DBRefEntry for sequence in alignment had map to sequence not in dataset"); + Assert.fail(message + " DBRefEntry " + dbr + + " for sequence " + seqds + + " in alignment has map to sequence not in dataset"); } return false; } @@ -333,7 +334,8 @@ public class AlignmentTest ae.printStackTrace(); Assert.fail( "Valid test alignment raised assertion errors when raiseAsserts enabled: " - + msg, ae); + + msg, + ae); } // also check validation passes with asserts disabled Assert.assertTrue(verifyAlignmentDatasetRefs(al, false, null), @@ -353,8 +355,9 @@ public class AlignmentTest } if (!assertRaised) { - Assert.fail("Invalid test alignment passed when raiseAsserts enabled:" - + msg); + Assert.fail( + "Invalid test alignment passed when raiseAsserts enabled:" + + msg); } // also check validation passes with asserts disabled Assert.assertFalse(verifyAlignmentDatasetRefs(al, false, null), @@ -366,8 +369,8 @@ public class AlignmentTest @Test(groups = { "Functional" }) public void testVerifyAlignmentDatasetRefs() { - SequenceI sq1 = new Sequence("sq1", "ASFDD"), sq2 = new Sequence("sq2", - "TTTTTT"); + SequenceI sq1 = new Sequence("sq1", "ASFDD"), + sq2 = new Sequence("sq2", "TTTTTT"); // construct simple valid alignment dataset Alignment al = new Alignment(new SequenceI[] { sq1, sq2 }); @@ -380,9 +383,7 @@ public class AlignmentTest "didn't detect dataset sequence with a dataset sequence reference."); sq1.setDatasetSequence(null); - assertVerifyAlignment( - al, - true, + assertVerifyAlignment(al, true, "didn't reinstate validity after nulling dataset sequence dataset reference"); // now create dataset and check again @@ -394,27 +395,27 @@ public class AlignmentTest // create a dbref on sq1 with a sequence ref to sq2 DBRefEntry dbrs1tos2 = new DBRefEntry("UNIPROT", "1", "Q111111"); - dbrs1tos2.setMap(new Mapping(sq2.getDatasetSequence(), - new int[] { 1, 5 }, new int[] { 2, 6 }, 1, 1)); + dbrs1tos2 + .setMap(new Mapping(sq2.getDatasetSequence(), new int[] + { 1, 5 }, new int[] { 2, 6 }, 1, 1)); sq1.getDatasetSequence().addDBRef(dbrs1tos2); assertVerifyAlignment(al, true, "verify failed after addition of valid DBRefEntry/map"); // now create a dbref on a new sequence which maps to another sequence // outside of the dataset - SequenceI sqout = new Sequence("sqout", "ututututucagcagcag"), sqnew = new Sequence( - "sqnew", "EEERRR"); + SequenceI sqout = new Sequence("sqout", "ututututucagcagcag"), + sqnew = new Sequence("sqnew", "EEERRR"); DBRefEntry sqnewsqout = new DBRefEntry("ENAFOO", "1", "R000001"); - sqnewsqout.setMap(new Mapping(sqout, new int[] { 1, 6 }, new int[] { 1, - 18 }, 1, 3)); + sqnewsqout + .setMap(new Mapping(sqout, new int[] + { 1, 6 }, new int[] { 1, 18 }, 1, 3)); al.getDataset().addSequence(sqnew); assertVerifyAlignment(al, true, "verify failed after addition of new sequence to dataset"); // now start checking exception conditions sqnew.addDBRef(sqnewsqout); - assertVerifyAlignment( - al, - false, + assertVerifyAlignment(al, false, "verify passed when a dbref with map to sequence outside of dataset was added"); // make the verify pass by adding the outsider back in al.getDataset().addSequence(sqout); @@ -425,21 +426,18 @@ public class AlignmentTest "aggtutaggcagcagcag"); AlignedCodonFrame alc = new AlignedCodonFrame(); - alc.addMap(sqanotherout, sqnew, new MapList(new int[] { 1, 6 }, - new int[] { 1, 18 }, 3, 1)); + alc.addMap(sqanotherout, sqnew, + new MapList(new int[] + { 1, 6 }, new int[] { 1, 18 }, 3, 1)); al.addCodonFrame(alc); Assert.assertEquals(al.getDataset().getCodonFrames().size(), 1); - assertVerifyAlignment( - al, - false, + assertVerifyAlignment(al, false, "verify passed when alCodonFrame mapping to sequence outside of dataset was added"); // make the verify pass by adding the outsider back in al.getDataset().addSequence(sqanotherout); - assertVerifyAlignment( - al, - true, + assertVerifyAlignment(al, true, "verify should have passed once all sequences involved in alCodonFrame were added to dataset"); al.getDataset().addSequence(sqanotherout); assertVerifyAlignment(al, false, @@ -468,7 +466,8 @@ public class AlignmentTest * @param message * - null or message prepended to exception message. */ - public static void assertDatasetIsNormalised(AlignmentI al, String message) + public static void assertDatasetIsNormalised(AlignmentI al, + String message) { if (al.getDataset() != null) { @@ -533,7 +532,8 @@ public class AlignmentTest assertDatasetIsNormalised(al); } catch (AssertionError ae) { - Assert.fail("Two different sequences should be valid normalised dataset."); + Assert.fail( + "Two different sequences should be valid normalised dataset."); } /* * now change sq2's name in the alignment. should still be valid @@ -544,7 +544,8 @@ public class AlignmentTest assertDatasetIsNormalised(al); } catch (AssertionError ae) { - Assert.fail("Two different sequences in dataset, but same name in alignment, should be valid normalised dataset."); + Assert.fail( + "Two different sequences in dataset, but same name in alignment, should be valid normalised dataset."); } al.addSequence(sq1seqd); @@ -553,7 +554,8 @@ public class AlignmentTest assertDatasetIsNormalised(al); } catch (AssertionError ae) { - Assert.fail("sq1 and sq1 with different sequence should be distinct."); + Assert.fail( + "sq1 and sq1 with different sequence should be distinct."); } al.addSequence(sq1shift); @@ -562,7 +564,8 @@ public class AlignmentTest assertDatasetIsNormalised(al); } catch (AssertionError ae) { - Assert.fail("sq1 and sq1 with different start/end should be distinct."); + Assert.fail( + "sq1 and sq1 with different start/end should be distinct."); } /* * finally, the failure case @@ -745,10 +748,10 @@ public class AlignmentTest makeMappings(al1, al2); ((Alignment) al2).alignAs(al1, false, true); - assertEquals("GC-TC--GUC-GTACT", al2.getSequenceAt(0) - .getSequenceAsString()); - assertEquals("-GG-GTC--AGG--CAGT", al2.getSequenceAt(1) - .getSequenceAsString()); + assertEquals("GC-TC--GUC-GTACT", + al2.getSequenceAt(0).getSequenceAsString()); + assertEquals("-GG-GTC--AGG--CAGT", + al2.getSequenceAt(1).getSequenceAsString()); } /** @@ -792,10 +795,10 @@ public class AlignmentTest * Realign DNA; currently keeping existing gaps in introns only */ ((Alignment) al1).alignAs(al2, false, true); - assertEquals("ACG---GCUCCA------ACT---", al1.getSequenceAt(0) - .getSequenceAsString()); - assertEquals("---CGT---TAACGA---AGT---", al1.getSequenceAt(1) - .getSequenceAsString()); + assertEquals("ACG---GCUCCA------ACT---", + al1.getSequenceAt(0).getSequenceAsString()); + assertEquals("---CGT---TAACGA---AGT---", + al1.getSequenceAt(1).getSequenceAsString()); } /** @@ -869,9 +872,11 @@ public class AlignmentTest { SequenceI seqFrom = alFrom.getSequenceAt(i); SequenceI seqTo = alTo.getSequenceAt(i); - MapList ml = new MapList(new int[] { seqFrom.getStart(), - seqFrom.getEnd() }, - new int[] { seqTo.getStart(), seqTo.getEnd() }, ratio, 1); + MapList ml = new MapList( + new int[] + { seqFrom.getStart(), seqFrom.getEnd() }, + new int[] + { seqTo.getStart(), seqTo.getEnd() }, ratio, 1); acf.addMap(seqFrom, seqTo, ml); } @@ -898,18 +903,21 @@ public class AlignmentTest */ String dna1 = "A-Aa-gG-GCC-cT-TT"; String dna2 = "c--CCGgg-TT--T-AA-A"; - AlignmentI al1 = loadAlignment(">Dna1/6-17\n" + dna1 - + "\n>Dna2/20-31\n" + dna2 + "\n", FileFormat.Fasta); + AlignmentI al1 = loadAlignment( + ">Dna1/6-17\n" + dna1 + "\n>Dna2/20-31\n" + dna2 + "\n", + FileFormat.Fasta); AlignmentI al2 = loadAlignment( ">Pep1/7-9\n-P--YK\n>Pep2/11-13\nG-T--F\n", FileFormat.Fasta); AlignedCodonFrame acf = new AlignedCodonFrame(); // Seq1 has intron at dna positions 3,4,9 so splice is AAG GCC TTT // Seq2 has intron at dna positions 1,5,6 so splice is CCG TTT AAA - MapList ml1 = new MapList(new int[] { 6, 7, 10, 13, 15, 17 }, new int[] - { 7, 9 }, 3, 1); + MapList ml1 = new MapList(new int[] { 6, 7, 10, 13, 15, 17 }, + new int[] + { 7, 9 }, 3, 1); acf.addMap(al1.getSequenceAt(0), al2.getSequenceAt(0), ml1); - MapList ml2 = new MapList(new int[] { 21, 23, 26, 31 }, new int[] { 11, - 13 }, 3, 1); + MapList ml2 = new MapList(new int[] { 21, 23, 26, 31 }, + new int[] + { 11, 13 }, 3, 1); acf.addMap(al1.getSequenceAt(1), al2.getSequenceAt(1), ml2); al2.addCodonFrame(acf); @@ -917,11 +925,11 @@ public class AlignmentTest * Align ignoring gaps in dna introns and exons */ ((Alignment) al1).alignAs(al2, false, false); - assertEquals("---AAagG------GCCcTTT", al1.getSequenceAt(0) - .getSequenceAsString()); + assertEquals("---AAagG------GCCcTTT", + al1.getSequenceAt(0).getSequenceAsString()); // note 1 gap in protein corresponds to 'gg-' in DNA (3 positions) - assertEquals("cCCGgg-TTT------AAA", al1.getSequenceAt(1) - .getSequenceAsString()); + assertEquals("cCCGgg-TTT------AAA", + al1.getSequenceAt(1).getSequenceAsString()); /* * Reset and realign, preserving gaps in dna introns and exons @@ -932,10 +940,10 @@ public class AlignmentTest // String dna1 = "A-Aa-gG-GCC-cT-TT"; // String dna2 = "c--CCGgg-TT--T-AA-A"; // assumption: we include 'the greater of' protein/dna gap lengths, not both - assertEquals("---A-Aa-gG------GCC-cT-TT", al1.getSequenceAt(0) - .getSequenceAsString()); - assertEquals("c--CCGgg-TT--T------AA-A", al1.getSequenceAt(1) - .getSequenceAsString()); + assertEquals("---A-Aa-gG------GCC-cT-TT", + al1.getSequenceAt(0).getSequenceAsString()); + assertEquals("c--CCGgg-TT--T------AA-A", + al1.getSequenceAt(1).getSequenceAsString()); } @Test(groups = "Functional") @@ -945,8 +953,9 @@ public class AlignmentTest // create sequence and alignment datasets protein.setDataset(null); AlignedCodonFrame acf = new AlignedCodonFrame(); - List acfList = Arrays.asList(new AlignedCodonFrame[] - { acf }); + List acfList = Arrays + .asList(new AlignedCodonFrame[] + { acf }); protein.getDataset().setCodonFrames(acfList); AlignmentI copy = new Alignment(protein); @@ -955,10 +964,10 @@ public class AlignmentTest */ assertFalse(copy.getSequenceAt(0) == protein.getSequenceAt(0)); assertFalse(copy.getSequenceAt(1) == protein.getSequenceAt(1)); - assertSame(copy.getSequenceAt(0).getDatasetSequence(), protein - .getSequenceAt(0).getDatasetSequence()); - assertSame(copy.getSequenceAt(1).getDatasetSequence(), protein - .getSequenceAt(1).getDatasetSequence()); + assertSame(copy.getSequenceAt(0).getDatasetSequence(), + protein.getSequenceAt(0).getDatasetSequence()); + assertSame(copy.getSequenceAt(1).getDatasetSequence(), + protein.getSequenceAt(1).getDatasetSequence()); // TODO should the copy constructor copy the dataset? // or make a new one referring to the same dataset sequences?? @@ -1008,10 +1017,10 @@ public class AlignmentTest // side-effect: dataset created on second sequence assertNotNull(protein.getSequenceAt(1).getDatasetSequence()); // dataset alignment has references to dataset sequences - assertEquals(ds.getSequenceAt(0), protein.getSequenceAt(0) - .getDatasetSequence()); - assertEquals(ds.getSequenceAt(1), protein.getSequenceAt(1) - .getDatasetSequence()); + assertEquals(ds.getSequenceAt(0), + protein.getSequenceAt(0).getDatasetSequence()); + assertEquals(ds.getSequenceAt(1), + protein.getSequenceAt(1).getDatasetSequence()); // codon frames should have been moved to the dataset // getCodonFrames() should delegate to the dataset: @@ -1034,19 +1043,22 @@ public class AlignmentTest // cross-references to two more sequences. DBRefEntry dbr = new DBRefEntry("SQ1", "", "sq3"); SequenceI sq3 = new Sequence("sq3", "VWANG"); - dbr.setMap(new Mapping(sq3, new MapList(new int[] { 1, 4 }, new int[] { - 2, 5 }, 1, 1))); + dbr.setMap( + new Mapping(sq3, new MapList(new int[] + { 1, 4 }, new int[] { 2, 5 }, 1, 1))); sq1.addDBRef(dbr); SequenceI sq4 = new Sequence("sq4", "ERKWI"); DBRefEntry dbr2 = new DBRefEntry("SQ2", "", "sq4"); - dbr2.setMap(new Mapping(sq4, new MapList(new int[] { 1, 4 }, new int[] { - 2, 5 }, 1, 1))); + dbr2.setMap( + new Mapping(sq4, new MapList(new int[] + { 1, 4 }, new int[] { 2, 5 }, 1, 1))); sq2.addDBRef(dbr2); // and a 1:1 codonframe mapping between them. AlignedCodonFrame alc = new AlignedCodonFrame(); - alc.addMap(sq1, sq2, new MapList(new int[] { 1, 4 }, - new int[] { 1, 4 }, 1, 1)); + alc.addMap(sq1, sq2, + new MapList(new int[] + { 1, 4 }, new int[] { 1, 4 }, 1, 1)); AlignmentI protein = new Alignment(new SequenceI[] { sq1, sq2 }); @@ -1109,7 +1121,8 @@ public class AlignmentTest Assert.assertEquals(align.getDataset().getHeight(), 1, "Dataset shouldn't have more than one sequence."); - Sequence seq2 = new Sequence("newtestSeq", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + Sequence seq2 = new Sequence("newtestSeq", + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); align.addSequence(seq2); Assert.assertEquals(align.getDataset().getHeight(), 2, "Dataset should now have two sequences."); @@ -1131,26 +1144,30 @@ public class AlignmentTest // add dbref from dna to peptide DBRefEntry dbr = new DBRefEntry("UNIPROT", "", "pep"); - dbr.setMap(new Mapping(pep, new MapList(new int[] { 4, 15 }, new int[] { - 1, 4 }, 3, 1))); + dbr.setMap( + new Mapping(pep, new MapList(new int[] + { 4, 15 }, new int[] { 1, 4 }, 3, 1))); dna.addDBRef(dbr); // add dbref from dna to peptide DBRefEntry dbr2 = new DBRefEntry("UNIPROT", "", "pep"); - dbr2.setMap(new Mapping(pep, new MapList(new int[] { 1, 12 }, new int[] - { 1, 4 }, 3, 1))); + dbr2.setMap( + new Mapping(pep, new MapList(new int[] + { 1, 12 }, new int[] { 1, 4 }, 3, 1))); cds.addDBRef(dbr2); // add dbref from peptide to dna DBRefEntry dbr3 = new DBRefEntry("EMBL", "", "dna"); - dbr3.setMap(new Mapping(dna, new MapList(new int[] { 1, 4 }, new int[] { - 4, 15 }, 1, 3))); + dbr3.setMap( + new Mapping(dna, new MapList(new int[] + { 1, 4 }, new int[] { 4, 15 }, 1, 3))); pep.addDBRef(dbr3); // add dbref from peptide to cds DBRefEntry dbr4 = new DBRefEntry("EMBLCDS", "", "cds"); - dbr4.setMap(new Mapping(cds, new MapList(new int[] { 1, 4 }, new int[] { - 1, 12 }, 1, 3))); + dbr4.setMap( + new Mapping(cds, new MapList(new int[] + { 1, 4 }, new int[] { 1, 12 }, 1, 3))); pep.addDBRef(dbr4); AlignmentI protein = new Alignment(new SequenceI[] { pep }); @@ -1171,14 +1188,14 @@ public class AlignmentTest /* * verify peptide.cdsdbref.peptidedbref is now mapped to peptide dataset */ - DBRefEntry[] dbRefs = pep.getDBRefs(); - assertEquals(2, dbRefs.length); - assertSame(dna, dbRefs[0].map.to); - assertSame(cds, dbRefs[1].map.to); - assertEquals(1, dna.getDBRefs().length); - assertSame(pep.getDatasetSequence(), dna.getDBRefs()[0].map.to); - assertEquals(1, cds.getDBRefs().length); - assertSame(pep.getDatasetSequence(), cds.getDBRefs()[0].map.to); + List dbRefs = pep.getDBRefs(); + assertEquals(2, dbRefs.size()); + assertSame(dna, dbRefs.get(0).map.to); + assertSame(cds, dbRefs.get(1).map.to); + assertEquals(1, dna.getDBRefs().size()); + assertSame(pep.getDatasetSequence(), dna.getDBRefs().get(0).map.to); + assertEquals(1, cds.getDBRefs().size()); + assertSame(pep.getDatasetSequence(), cds.getDBRefs().get(0).map.to); } @Test(groups = { "Functional" }) @@ -1305,7 +1322,8 @@ public class AlignmentTest @Test( groups = "Functional", - expectedExceptions = { IllegalArgumentException.class }) + expectedExceptions = + { IllegalArgumentException.class }) public void testSetDataset_selfReference() { SequenceI seq = new Sequence("a", "a"); @@ -1327,8 +1345,8 @@ public class AlignmentTest assertEquals('-', alignment.getGapCharacter()); assertSame(seq, alignment.getSequenceAt(0)); - assertEquals("KP--L-FQII-", alignment.getSequenceAt(1) - .getSequenceAsString()); + assertEquals("KP--L-FQII-", + alignment.getSequenceAt(1).getSequenceAsString()); // todo test coverage for annotations, mappings, groups, // hidden sequences, properties @@ -1482,4 +1500,95 @@ public class AlignmentTest assertEquals(".JKLMNO", seq2.getSequenceAsString()); assertEquals(".PQR...", seq3.getSequenceAsString()); } + + /** + * Test for setHiddenColumns, to check it returns true if the hidden columns + * have changed, else false + */ + @Test(groups = { "Functional" }) + public void testSetHiddenColumns() + { + AlignmentI al = new Alignment(new SequenceI[] {}); + assertFalse(al.getHiddenColumns().hasHiddenColumns()); + + HiddenColumns hc = new HiddenColumns(); + assertFalse(al.setHiddenColumns(hc)); // no change + assertSame(hc, al.getHiddenColumns()); + + hc.hideColumns(2, 4); + assertTrue(al.getHiddenColumns().hasHiddenColumns()); + + /* + * set a different object but with the same columns hidden + */ + HiddenColumns hc2 = new HiddenColumns(); + hc2.hideColumns(2, 4); + assertFalse(al.setHiddenColumns(hc2)); // no change + assertSame(hc2, al.getHiddenColumns()); + + assertTrue(al.setHiddenColumns(null)); + assertNull(al.getHiddenColumns()); + assertTrue(al.setHiddenColumns(hc)); + assertSame(hc, al.getHiddenColumns()); + + al.getHiddenColumns().hideColumns(10, 12); + hc2.hideColumns(10, 12); + assertFalse(al.setHiddenColumns(hc2)); // no change + + /* + * hide columns 15-16 then 17-18 in hc + * hide columns 15-18 in hc2 + * these are not now 'equal' objects even though they + * represent the same set of columns + */ + assertSame(hc2, al.getHiddenColumns()); + hc.hideColumns(15, 16); + hc.hideColumns(17, 18); + hc2.hideColumns(15, 18); + assertFalse(hc.equals(hc2)); + assertTrue(al.setHiddenColumns(hc)); // 'changed' + } + + @Test(groups = { "Functional" }) + public void testGetWidth() + { + SequenceI seq1 = new Sequence("seq1", "ABCDEF--"); + SequenceI seq2 = new Sequence("seq2", "-JKLMNO--"); + SequenceI seq3 = new Sequence("seq2", "-PQR"); + AlignmentI a = new Alignment(new SequenceI[] { seq1, seq2, seq3 }); + + assertEquals(9, a.getWidth()); + + // width includes hidden columns + a.getHiddenColumns().hideColumns(2, 5); + assertEquals(9, a.getWidth()); + } + + @Test(groups = { "Functional" }) + public void testGetVisibleWidth() + { + SequenceI seq1 = new Sequence("seq1", "ABCDEF--"); + SequenceI seq2 = new Sequence("seq2", "-JKLMNO--"); + SequenceI seq3 = new Sequence("seq2", "-PQR"); + AlignmentI a = new Alignment(new SequenceI[] { seq1, seq2, seq3 }); + + assertEquals(9, a.getVisibleWidth()); + + // width excludes hidden columns + a.getHiddenColumns().hideColumns(2, 5); + assertEquals(5, a.getVisibleWidth()); + } + + @Test(groups = { "Functional" }) + public void testGetContactMap() + { + // TODO + // 1. test adding/removing/manipulating contact maps with/without associated + // sequence(s) or groups + // 2. For sequence associated - ensure that inserting a gap in sequence + // results in the contact map being relocated accordingly + // 3. RENDERER QUESTION - should contact maps reflect gaps in the alignment + // ? + + } }