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
/
gui
/
StructureChooserTest.java
diff --git
a/test/jalview/gui/StructureChooserTest.java
b/test/jalview/gui/StructureChooserTest.java
index
1e73d3e
..
6d5af25
100644
(file)
--- a/
test/jalview/gui/StructureChooserTest.java
+++ b/
test/jalview/gui/StructureChooserTest.java
@@
-1,7
+1,10
@@
package jalview.gui;
package jalview.gui;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeMethod;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.Sequence;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.Sequence;
@@
-9,15
+12,11
@@
import jalview.datamodel.SequenceI;
import java.util.Vector;
import java.util.Vector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
public class StructureChooserTest
{
Sequence seq;
public class StructureChooserTest
{
Sequence seq;
- @Before
+ @BeforeMethod
public void setUp() throws Exception
{
seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
public void setUp() throws Exception
{
seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
@@
-39,7
+38,7
@@
public class StructureChooserTest
seq.setPDBId(pdbIds);
}
seq.setPDBId(pdbIds);
}
- @After
+ @AfterMethod
public void tearDown() throws Exception
{
seq = null;
public void tearDown() throws Exception
{
seq = null;