git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge
[jalview.git]
/
test
/
jalview
/
commands
/
EditCommandTest.java
diff --git
a/test/jalview/commands/EditCommandTest.java
b/test/jalview/commands/EditCommandTest.java
index
6c570d5
..
6fa7c22
100644
(file)
--- a/
test/jalview/commands/EditCommandTest.java
+++ b/
test/jalview/commands/EditCommandTest.java
@@
-30,8
+30,8
@@
public class EditCommandTest
private Alignment al;
private Alignment al;
- @BeforeMethod
- public void setUp()
+ @BeforeMethod(alwaysRun = true)
+ public void setUp()
{
testee = new EditCommand();
seqs = new SequenceI[4];
{
testee = new EditCommand();
seqs = new SequenceI[4];
@@
-50,7
+50,7
@@
public class EditCommandTest
/**
* Test inserting gap characters
*/
/**
* Test inserting gap characters
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testAppendEdit_insertGap()
{
// set a non-standard gap character to prove it is actually used
public void testAppendEdit_insertGap()
{
// set a non-standard gap character to prove it is actually used
@@
-67,7
+67,7
@@
public class EditCommandTest
* Test deleting characters from sequences. Note the deleteGap() action does
* not check that only gap characters are being removed.
*/
* Test deleting characters from sequences. Note the deleteGap() action does
* not check that only gap characters are being removed.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testAppendEdit_deleteGap()
{
testee.appendEdit(Action.DELETE_GAP, seqs, 4, 3, al, true);
public void testAppendEdit_deleteGap()
{
testee.appendEdit(Action.DELETE_GAP, seqs, 4, 3, al, true);
@@
-81,7
+81,7
@@
public class EditCommandTest
* Test a cut action. The command should store the cut characters to support
* undo.
*/
* Test a cut action. The command should store the cut characters to support
* undo.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testCut()
{
Edit ec = testee.new Edit(Action.CUT, seqs, 4, 3, al);
public void testCut()
{
Edit ec = testee.new Edit(Action.CUT, seqs, 4, 3, al);
@@
-102,7
+102,8
@@
public class EditCommandTest
/**
* Test a Paste action, where this adds sequences to an alignment.
*/
/**
* Test a Paste action, where this adds sequences to an alignment.
*/
- @Test(enabled = false)
+ @Test(groups =
+ { "Functional" }, enabled = false)
// TODO fix so it works
public void testPaste_addToAlignment()
{
// TODO fix so it works
public void testPaste_addToAlignment()
{
@@
-122,7
+123,7
@@
public class EditCommandTest
/**
* Test insertGap followed by undo command
*/
/**
* Test insertGap followed by undo command
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testUndo_insertGap()
{
// Edit ec = testee.new Edit(Action.INSERT_GAP, seqs, 4, 3, '?');
public void testUndo_insertGap()
{
// Edit ec = testee.new Edit(Action.INSERT_GAP, seqs, 4, 3, '?');
@@
-140,7
+141,7
@@
public class EditCommandTest
/**
* Test deleteGap followed by undo command
*/
/**
* Test deleteGap followed by undo command
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testUndo_deleteGap()
{
testee.appendEdit(Action.DELETE_GAP, seqs, 4, 3, al, true);
public void testUndo_deleteGap()
{
testee.appendEdit(Action.DELETE_GAP, seqs, 4, 3, al, true);
@@
-158,7
+159,7
@@
public class EditCommandTest
/**
* Test several commands followed by an undo command
*/
/**
* Test several commands followed by an undo command
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testUndo_multipleCommands()
{
// delete positions 3/4/5 (counting from 1)
public void testUndo_multipleCommands()
{
// delete positions 3/4/5 (counting from 1)
@@
-187,7
+188,7
@@
public class EditCommandTest
* Unit test for JAL-1594 bug: click and drag sequence right to insert gaps -
* undo did not remove them all.
*/
* Unit test for JAL-1594 bug: click and drag sequence right to insert gaps -
* undo did not remove them all.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testUndo_multipleInsertGaps()
{
testee.appendEdit(Action.INSERT_GAP, seqs, 4, 1, al, true);
public void testUndo_multipleInsertGaps()
{
testee.appendEdit(Action.INSERT_GAP, seqs, 4, 1, al, true);
@@
-205,7
+206,7
@@
public class EditCommandTest
/**
* Test cut followed by undo command
*/
/**
* Test cut followed by undo command
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testUndo_cut()
{
testee.appendEdit(Action.CUT, seqs, 4, 3, al, true);
public void testUndo_cut()
{
testee.appendEdit(Action.CUT, seqs, 4, 3, al, true);
@@
-222,7
+223,7
@@
public class EditCommandTest
/**
* Test the replace command (used to manually edit a sequence)
*/
/**
* Test the replace command (used to manually edit a sequence)
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testReplace()
{
// seem to need a dataset sequence on the edited sequence here
public void testReplace()
{
// seem to need a dataset sequence on the edited sequence here
@@
-239,7
+240,7
@@
public class EditCommandTest
* Test that the addEdit command correctly merges insert gap commands when
* possible.
*/
* Test that the addEdit command correctly merges insert gap commands when
* possible.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testAddEdit_multipleInsertGap()
{
/*
public void testAddEdit_multipleInsertGap()
{
/*
@@
-289,7
+290,7
@@
public class EditCommandTest
* Test that the addEdit command correctly merges delete gap commands when
* possible.
*/
* Test that the addEdit command correctly merges delete gap commands when
* possible.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testAddEdit_multipleDeleteGap()
{
/*
public void testAddEdit_multipleDeleteGap()
{
/*
@@
-346,7
+347,7
@@
public class EditCommandTest
* case when they appear contiguous but are acting on different sequences.
* They should not be merged.
*/
* case when they appear contiguous but are acting on different sequences.
* They should not be merged.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testAddEdit_removeAllGaps()
{
seqs[0].setSequence("a???bcdefghjk");
public void testAddEdit_removeAllGaps()
{
seqs[0].setSequence("a???bcdefghjk");
@@
-367,7
+368,7
@@
public class EditCommandTest
* Test that the addEdit command correctly merges insert gap commands acting
* on a multi-sequence selection.
*/
* Test that the addEdit command correctly merges insert gap commands acting
* on a multi-sequence selection.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testAddEdit_groupInsertGaps()
{
/*
public void testAddEdit_groupInsertGaps()
{
/*
@@
-403,7
+404,7
@@
public class EditCommandTest
* <li>last: --A--B-CDEF</li>
* </ul>
*/
* <li>last: --A--B-CDEF</li>
* </ul>
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testPriorState_multipleInserts()
{
EditCommand command = new EditCommand();
public void testPriorState_multipleInserts()
{
EditCommand command = new EditCommand();
@@
-431,7
+432,7
@@
public class EditCommandTest
* <li>End: ABC</li>
* </ul>
*/
* <li>End: ABC</li>
* </ul>
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testPriorState_removeAllGaps()
{
EditCommand command = new EditCommand();
public void testPriorState_removeAllGaps()
{
EditCommand command = new EditCommand();
@@
-452,7
+453,7
@@
public class EditCommandTest
/**
* Test for 'undoing' a single delete edit.
*/
/**
* Test for 'undoing' a single delete edit.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testPriorState_singleDelete()
{
EditCommand command = new EditCommand();
public void testPriorState_singleDelete()
{
EditCommand command = new EditCommand();
@@
-471,7
+472,7
@@
public class EditCommandTest
/**
* Test 'undoing' a single gap insertion edit command.
*/
/**
* Test 'undoing' a single gap insertion edit command.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testPriorState_singleInsert()
{
EditCommand command = new EditCommand();
public void testPriorState_singleInsert()
{
EditCommand command = new EditCommand();
@@
-491,7
+492,7
@@
public class EditCommandTest
* Test that mimics 'remove all gaps' action. This generates delete gap edits
* for contiguous gaps in each sequence separately.
*/
* Test that mimics 'remove all gaps' action. This generates delete gap edits
* for contiguous gaps in each sequence separately.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testPriorState_removeGapsMultipleSeqs()
{
EditCommand command = new EditCommand();
public void testPriorState_removeGapsMultipleSeqs()
{
EditCommand command = new EditCommand();
@@
-555,7
+556,7
@@
public class EditCommandTest
* series Delete Gap edits that each act on all sequences that share a gapped
* column region.
*/
* series Delete Gap edits that each act on all sequences that share a gapped
* column region.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testPriorState_removeGappedCols()
{
EditCommand command = new EditCommand();
public void testPriorState_removeGappedCols()
{
EditCommand command = new EditCommand();