X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fstructures%2Fmodels%2FAAStructureBindingModelTest.java;fp=test%2Fjalview%2Fstructures%2Fmodels%2FAAStructureBindingModelTest.java;h=7871e7764217bc340d99d6404be6b19015636dc7;hb=44e5428356c618d139354d02bbfc2f9008ae50b6;hp=3db7f23004fed5bf9ec70f75df69eb54c7ea9e38;hpb=4740ac2539b6c62c36a0c79ec6880237e50ea3f4;p=jalview.git diff --git a/test/jalview/structures/models/AAStructureBindingModelTest.java b/test/jalview/structures/models/AAStructureBindingModelTest.java index 3db7f23..7871e77 100644 --- a/test/jalview/structures/models/AAStructureBindingModelTest.java +++ b/test/jalview/structures/models/AAStructureBindingModelTest.java @@ -1,14 +1,8 @@ package jalview.structures.models; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; @@ -21,6 +15,12 @@ import jalview.structure.AtomSpec; import jalview.structure.StructureSelectionManager; import jalview.structures.models.AAStructureBindingModel.SuperposeData; +import java.util.Arrays; +import java.util.List; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + /** * Unit tests for non-abstract methods of abstract base class * @@ -57,7 +57,7 @@ public class AAStructureBindingModelTest /** * Set up test conditions with three aligned sequences, */ - @Before + @BeforeMethod public void setUp() { SequenceI seq1 = new Sequence("1YCS", "-VPSQK");