JAL-1759 reinstate changes from bdfde6ef989da0702cef90f03858f0f30e0bc83a

[jalview.git] / test / jalview / structure / StructureSelectionManagerTest.java

diff --git a/test/jalview/structure/StructureSelectionManagerTest.java b/test/jalview/structure/StructureSelectionManagerTest.java
index 487ef2c..1e4a866 100644 (file)
--- a/test/jalview/structure/StructureSelectionManagerTest.java
+++ b/test/jalview/structure/StructureSelectionManagerTest.java
@@ -1,26 +1,27 @@
 package jalview.structure;
 
-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 jalview.datamodel.AlignedCodonFrame;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class StructureSelectionManagerTest
 {
   private StructureSelectionManager ssm;
 
-  @Before
+  @BeforeMethod
   public void setUp()
   {
     ssm = new StructureSelectionManager();
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testAddMapping()
   {
     AlignedCodonFrame acf1 = new AlignedCodonFrame();
@@ -58,7 +59,7 @@ public class StructureSelectionManagerTest
     assertEquals(1, ssm.seqMappingRefCounts.get(acf2).intValue());
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testAddMappings()
   {
     AlignedCodonFrame acf1 = new AlignedCodonFrame();
@@ -88,7 +89,7 @@ public class StructureSelectionManagerTest
     assertEquals(1, ssm.seqMappingRefCounts.get(acf3).intValue());
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testRemoveMapping()
   {
     AlignedCodonFrame acf1 = new AlignedCodonFrame();
@@ -126,7 +127,7 @@ public class StructureSelectionManagerTest
     assertEquals(0, ssm.seqMappingRefCounts.size());
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testRemoveMappings()
   {
     AlignedCodonFrame acf1 = new AlignedCodonFrame();