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
JAL-1270 JUnit to TestNG refactoring
[jalview.git]
/
test
/
jalview
/
commands
/
EditCommandTest.java
diff --git
a/test/jalview/commands/EditCommandTest.java
b/test/jalview/commands/EditCommandTest.java
index
6ea05e6
..
df5e796
100644
(file)
--- a/
test/jalview/commands/EditCommandTest.java
+++ b/
test/jalview/commands/EditCommandTest.java
@@
-1,7
+1,13
@@
package jalview.commands;
package jalview.commands;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
+import java.util.Map;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import jalview.commands.EditCommand.Action;
import jalview.commands.EditCommand.Edit;
import jalview.datamodel.Alignment;
import jalview.commands.EditCommand.Action;
import jalview.commands.EditCommand.Edit;
import jalview.datamodel.Alignment;
@@
-9,12
+15,6
@@
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
/**
* Unit tests for EditCommand
*
/**
* Unit tests for EditCommand
*
@@
-30,7
+30,7
@@
public class EditCommandTest
private Alignment al;
private Alignment al;
- @Before
+ @BeforeMethod
public void setUp()
{
testee = new EditCommand();
public void setUp()
{
testee = new EditCommand();
@@
-102,8
+102,7
@@
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
- @Ignore
+ @Test(enabled = false)
// TODO fix so it works
public void testPaste_addToAlignment()
{
// TODO fix so it works
public void testPaste_addToAlignment()
{