X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAnnotationChooserTest.java;h=6bee4ec887b364a0848ea4aefb629a17d1847686;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=33ffd329b18635dffcc682ce981a0912e91fb126;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git diff --git a/test/jalview/gui/AnnotationChooserTest.java b/test/jalview/gui/AnnotationChooserTest.java index 33ffd32..6bee4ec 100644 --- a/test/jalview/gui/AnnotationChooserTest.java +++ b/test/jalview/gui/AnnotationChooserTest.java @@ -1,9 +1,10 @@ package jalview.gui; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; +import org.testng.annotations.Test; +import org.testng.annotations.BeforeMethod; import java.awt.BorderLayout; import java.awt.Checkbox; import java.awt.Component; @@ -16,9 +17,6 @@ import java.util.List; import javax.swing.JButton; import javax.swing.JPanel; -import org.junit.Before; -import org.junit.Test; - import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; @@ -52,7 +50,7 @@ public class AnnotationChooserTest AlignFrame af; - @Before + @BeforeMethod public void setUp() throws IOException { // pin down annotation sort order for test