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
/
analysis
/
TestAlignSeq.java
diff --git
a/test/jalview/analysis/TestAlignSeq.java
b/test/jalview/analysis/TestAlignSeq.java
index
4956bd8
..
2845d91
100644
(file)
--- a/
test/jalview/analysis/TestAlignSeq.java
+++ b/
test/jalview/analysis/TestAlignSeq.java
@@
-20,14
+20,12
@@
*/
package jalview.analysis;
*/
package jalview.analysis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeMethod;
import java.io.PrintStream;
import java.io.PrintStream;
-import org.junit.Before;
-import org.junit.Test;
-
import jalview.datamodel.Mapping;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Mapping;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
@@
-46,7
+44,7
@@
public class TestAlignSeq
/**
* @throws java.lang.Exception
*/
/**
* @throws java.lang.Exception
*/
- @Before
+ @BeforeMethod
public void setUp() throws Exception
{
s1 = new Sequence("Seq1", "ASDFAQQQRRRSSS");
public void setUp() throws Exception
{
s1 = new Sequence("Seq1", "ASDFAQQQRRRSSS");