JAL-1805 modified test setup's so the are ran for groups which requires them

[jalview.git] / test / jalview / structures / models / AAStructureBindingModelTest.java

diff --git a/test/jalview/structures/models/AAStructureBindingModelTest.java b/test/jalview/structures/models/AAStructureBindingModelTest.java
index 4209577..3354e38 100644 (file)
--- a/test/jalview/structures/models/AAStructureBindingModelTest.java
+++ b/test/jalview/structures/models/AAStructureBindingModelTest.java
@@ -3,10 +3,6 @@ package jalview.structures.models;
 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.util.Arrays;
-import java.util.List;
 
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
@@ -19,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
  * 
@@ -55,7 +57,7 @@ public class AAStructureBindingModelTest
   /**
    * Set up test conditions with three aligned sequences,
    */
-  @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
   public void setUp()
   {
     SequenceI seq1 = new Sequence("1YCS", "-VPSQK");
@@ -117,7 +119,7 @@ public class AAStructureBindingModelTest
    * Verify that the method determines that columns 2, 5 and 6 of the aligment
    * are alignable in structure
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testFindSuperposableResidues()
   {
     SuperposeData[] structs = new SuperposeData[al.getHeight()];
@@ -148,7 +150,7 @@ public class AAStructureBindingModelTest
     assertTrue(matched[5]);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testFindSuperposableResidues_hiddenColumn()
   {
     SuperposeData[] structs = new SuperposeData[al.getHeight()];