X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fcommands%2FEditCommandTest.java;h=91f844e2e755cc65c94e1c4520c1b1d8bacca584;hb=e5c29155a0ac8f9a03b3a7302576dc4223066a65;hp=7f0986bcc7d4ed75234da1a53090766dc7d915a6;hpb=8f9b006036d180d25060c3846cc768f2ade195b6;p=jalview.git diff --git a/test/jalview/commands/EditCommandTest.java b/test/jalview/commands/EditCommandTest.java index 7f0986b..91f844e 100644 --- a/test/jalview/commands/EditCommandTest.java +++ b/test/jalview/commands/EditCommandTest.java @@ -20,6 +20,8 @@ */ package jalview.commands; +import java.util.Locale; + import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; @@ -90,11 +92,11 @@ public class EditCommandTest testee = new EditCommand(); seqs = new SequenceI[4]; seqs[0] = new Sequence("seq0", "abcdefghjk"); - seqs[0].setDatasetSequence(new Sequence("seq0ds", "abcdefghjk")); + seqs[0].setDatasetSequence(new Sequence("seq0ds", "ABCDEFGHJK")); seqs[1] = new Sequence("seq1", "fghjklmnopq"); - seqs[1].setDatasetSequence(new Sequence("seq1ds", "fghjklmnopq")); + seqs[1].setDatasetSequence(new Sequence("seq1ds", "FGHJKLMNOPQ")); seqs[2] = new Sequence("seq2", "qrstuvwxyz"); - seqs[2].setDatasetSequence(new Sequence("seq2ds", "qrstuvwxyz")); + seqs[2].setDatasetSequence(new Sequence("seq2ds", "QRSTUVWXYZ")); seqs[3] = new Sequence("seq3", "1234567890"); seqs[3].setDatasetSequence(new Sequence("seq3ds", "1234567890")); al = new Alignment(seqs); @@ -153,18 +155,23 @@ public class EditCommandTest } /** - * Test a Paste action, where this adds sequences to an alignment. + * Test a Paste action, followed by Undo and Redo */ - @Test(groups = { "Functional" }, enabled = true) - // TODO fix so it works - public void testPaste_addToAlignment() + @Test(groups = { "Functional" }, enabled = false) + public void testPaste_undo_redo() { + // TODO code this test properly, bearing in mind that: + // Paste action requires something on the clipboard (Cut/Copy) + // - EditCommand.paste doesn't add sequences to the alignment + // ... that is done in AlignFrame.paste() + // ... unless as a Redo + // ... + SequenceI[] newSeqs = new SequenceI[2]; newSeqs[0] = new Sequence("newseq0", "ACEFKL"); newSeqs[1] = new Sequence("newseq1", "JWMPDH"); - Edit ec = testee.new Edit(Action.PASTE, newSeqs, 0, al.getWidth(), al); - EditCommand.paste(ec, new AlignmentI[] { al }); + new EditCommand("Paste", Action.PASTE, newSeqs, 0, al.getWidth(), al); assertEquals(6, al.getSequences().size()); assertEquals("1234567890", seqs[3].getSequenceAsString()); assertEquals("ACEFKL", seqs[4].getSequenceAsString()); @@ -274,9 +281,15 @@ public class EditCommandTest { // seem to need a dataset sequence on the edited sequence here seqs[1].createDatasetSequence(); - new EditCommand("", Action.REPLACE, "ZXY", new SequenceI[] { seqs[1] }, + assertEquals("fghjklmnopq", seqs[1].getSequenceAsString()); + // NB command.number holds end position for a Replace command + new EditCommand("", Action.REPLACE, "Z-xY", new SequenceI[] { seqs[1] }, 4, 8, al); assertEquals("abcdefghjk", seqs[0].getSequenceAsString()); + assertEquals("fghjZ-xYopq", seqs[1].getSequenceAsString()); + // Dataset Sequence should always be uppercase + assertEquals("fghjZxYopq".toUpperCase(Locale.ROOT), + seqs[1].getDatasetSequence().getSequenceAsString()); assertEquals("qrstuvwxyz", seqs[2].getSequenceAsString()); assertEquals("1234567890", seqs[3].getSequenceAsString()); } @@ -298,19 +311,24 @@ public class EditCommandTest * NB arg4 = start column of selection for edit (base 0) * arg5 = column after end of selection for edit */ - EditCommand edit = new EditCommand("", Action.REPLACE, "XYZ", + EditCommand edit = new EditCommand("", Action.REPLACE, "xyZ", new SequenceI[] { seq }, 2, 4, al); - assertEquals("ABXYZ-DEF", seq.getSequenceAsString()); + assertEquals("ABxyZ-DEF", seq.getSequenceAsString()); assertEquals(1, seq.getStart()); - assertEquals(7, seq.getEnd()); - assertEquals("ABXYZDEF", seq.getDatasetSequence().getSequenceAsString()); - assertEquals(7, seq.getDatasetSequence().getEnd()); + assertEquals(8, seq.getEnd()); + // Dataset sequence always uppercase + assertEquals("ABxyZDEF".toUpperCase(Locale.ROOT), + seq.getDatasetSequence().getSequenceAsString()); + assertEquals(8, seq.getDatasetSequence().getEnd()); - edit.undoCommand( - new AlignmentI[] - { new Alignment(new SequenceI[] { seq }) }); + /* + * undo the edit + */ + AlignmentI[] views = new AlignmentI[] + { new Alignment(new SequenceI[] { seq }) }; + edit.undoCommand(views); assertEquals("ABC--DEF", seq.getSequenceAsString()); assertEquals("ABCDEF", seq.getDatasetSequence().getSequenceAsString()); @@ -318,16 +336,18 @@ public class EditCommandTest assertEquals(6, seq.getEnd()); assertEquals(6, seq.getDatasetSequence().getEnd()); - edit.undoCommand( - new AlignmentI[] - { new Alignment(new SequenceI[] { seq }) }); + /* + * redo the edit + */ + edit.doCommand(views); - assertEquals("ABXYZ-DEF", seq.getSequenceAsString()); + assertEquals("ABxyZ-DEF", seq.getSequenceAsString()); assertEquals(1, seq.getStart()); - assertEquals(7, seq.getEnd()); - assertEquals("ABXYZDEF", + assertEquals(8, seq.getEnd()); + // dataset sequence should be Uppercase + assertEquals("ABxyZDEF".toUpperCase(Locale.ROOT), seq.getDatasetSequence().getSequenceAsString()); - assertEquals(7, seq.getDatasetSequence().getEnd()); + assertEquals(8, seq.getDatasetSequence().getEnd()); } @@ -348,8 +368,8 @@ public class EditCommandTest assertEquals("----klmnopq", seqs[1].getSequenceAsString()); // and ds is preserved assertTrue(dsseq == seqs[1].getDatasetSequence()); - // and it is unchanged - assertEquals("fghjklmnopq", dsseq.getSequenceAsString()); + // and it is unchanged and UPPERCASE ! + assertEquals("fghjklmnopq".toUpperCase(Locale.ROOT), dsseq.getSequenceAsString()); // and that alignment sequence start has been adjusted assertEquals(5, seqs[1].getStart()); assertEquals(11, seqs[1].getEnd()); @@ -375,8 +395,8 @@ public class EditCommandTest assertEquals("----klmnopq", seqs[1].getSequenceAsString()); // and ds is preserved assertTrue(dsseq == seqs[1].getDatasetSequence()); - // and it is unchanged - assertEquals("fghjklmnopq", dsseq.getSequenceAsString()); + // and it is unchanged AND UPPERCASE ! + assertEquals("fghjklmnopq".toUpperCase(Locale.ROOT), dsseq.getSequenceAsString()); // and that alignment sequence start has been adjusted assertEquals(5, seqs[1].getStart()); assertEquals(11, seqs[1].getEnd()); @@ -885,7 +905,6 @@ public class EditCommandTest * and validate the resulting remaining sequence features! */ SequenceI[] sqs = new SequenceI[] { seq0 }; - boolean checkDsSize = true; for (int from = 0; from < seq0.getLength(); from++) { @@ -906,15 +925,14 @@ public class EditCommandTest copySequenceFeatures, copySeq0.getSequenceFeatures().toString()); - if (checkDsSize) - { - /* - * verify a new dataset sequence has appeared - */ - assertEquals("Wrong Dataset size after cut", - newDatasetSequence ? 2 : 1, alignment.getDataset() - .getHeight()); - } + /* + * verify any new dataset sequence was added to the + * alignment dataset + */ + assertEquals("Wrong Dataset size after " + msg, + newDatasetSequence ? 2 : 1, + alignment.getDataset().getHeight()); + /* * undo and verify all restored */ @@ -926,19 +944,13 @@ public class EditCommandTest /* * verify copy alignment dataset sequence still unaffected + * and alignment dataset has shrunk (if it was added to) */ assertEquals("Original dataset sequence was modified", copySequenceFeatures, copySeq0.getSequenceFeatures().toString()); - - if (checkDsSize) - { - /* - * verify dataset sequence has shrunk - */ - assertEquals("Wrong Dataset size after cut", 1, - alignment.getDataset().getHeight()); - } + assertEquals("Wrong Dataset size after Undo of " + msg, 1, + alignment.getDataset().getHeight()); /* * redo and verify @@ -948,20 +960,14 @@ public class EditCommandTest /* * verify copy alignment dataset sequence unaffected + * and any new dataset sequence readded to alignment dataset */ assertEquals("Original dataset sequence was modified", copySequenceFeatures, copySeq0.getSequenceFeatures().toString()); - - if (checkDsSize) - { - /* - * verify a new dataset sequence has appeared again - */ - assertEquals("Wrong Dataset size after cut", - newDatasetSequence ? 2 : 1, alignment.getDataset() - .getHeight()); - } + assertEquals("Wrong Dataset size after Redo of " + msg, + newDatasetSequence ? 2 : 1, + alignment.getDataset().getHeight()); /* * undo ready for next cut @@ -970,18 +976,13 @@ public class EditCommandTest /* * final verify that copy alignment dataset sequence is still unaffected + * and that alignment dataset has shrunk */ assertEquals("Original dataset sequence was modified", copySequenceFeatures, copySeq0.getSequenceFeatures().toString()); - if (checkDsSize) - { - /* - * and that dataset sequence has shrunk - */ - assertEquals("Wrong Dataset size after cut", 1, - alignment.getDataset().getHeight()); - } + assertEquals("Wrong Dataset size after final Undo of " + msg, 1, + alignment.getDataset().getHeight()); } } }