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 branch 'develop' into features/JAL-892varnaToProject
[jalview.git]
/
test
/
jalview
/
gui
/
AlignViewportTest.java
diff --git
a/test/jalview/gui/AlignViewportTest.java
b/test/jalview/gui/AlignViewportTest.java
index
ac7d84d
..
a6e7ea0
100644
(file)
--- a/
test/jalview/gui/AlignViewportTest.java
+++ b/
test/jalview/gui/AlignViewportTest.java
@@
-1,10
+1,7
@@
package jalview.gui;
package jalview.gui;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import org.junit.Before;
-import org.junit.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
@@
-13,13
+10,16
@@
import jalview.datamodel.PDBEntry.Type;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
public class AlignViewportTest
{
AlignmentI al;
AlignViewport testee;
public class AlignViewportTest
{
AlignmentI al;
AlignViewport testee;
- @Before
+ @BeforeMethod
public void setUp()
{
SequenceI seq1 = new Sequence("Seq1", "ABC");
public void setUp()
{
SequenceI seq1 = new Sequence("Seq1", "ABC");