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
/
ext
/
jmol
/
PDBFileWithJmolTest.java
diff --git
a/test/jalview/ext/jmol/PDBFileWithJmolTest.java
b/test/jalview/ext/jmol/PDBFileWithJmolTest.java
index
ae50bdf
..
87078a9
100644
(file)
--- a/
test/jalview/ext/jmol/PDBFileWithJmolTest.java
+++ b/
test/jalview/ext/jmol/PDBFileWithJmolTest.java
@@
-20,14
+20,12
@@
*/
package jalview.ext.jmol;
*/
package jalview.ext.jmol;
-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.Test;
+import org.testng.annotations.BeforeMethod;
import java.util.Vector;
import java.util.Vector;
-import org.junit.Before;
-import org.junit.Test;
-
import MCview.PDBfile;
import jalview.bin.Cache;
import MCview.PDBfile;
import jalview.bin.Cache;
@@
-50,7
+48,7
@@
public class PDBFileWithJmolTest
// "./examples/DNMT1_MOUSE.pdb"
// };
// "./examples/DNMT1_MOUSE.pdb"
// };
- @Before
+ @BeforeMethod
public void setUp()
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
public void setUp()
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",