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

[jalview.git] / test / jalview / gui / PaintRefresherTest.java

diff --git a/test/jalview/gui/PaintRefresherTest.java b/test/jalview/gui/PaintRefresherTest.java
index 1da7c8c..1705e90 100644 (file)
--- a/test/jalview/gui/PaintRefresherTest.java
+++ b/test/jalview/gui/PaintRefresherTest.java
@@ -1,8 +1,9 @@
 package jalview.gui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
 import jalview.datamodel.Alignment;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
@@ -14,26 +15,26 @@ import java.util.Map;
 
 import javax.swing.JPanel;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class PaintRefresherTest
 {
   // TODO would prefer PaintRefresher to be a single rather than static
-  @Before
+ @BeforeMethod(alwaysRun = true)
   public void setUp()
   {
     PaintRefresher.components.clear();
   }
 
-  @After
+  @AfterMethod
   public void tearDown()
   {
     PaintRefresher.components.clear();
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testRegister()
   {
     JPanel jp = new JPanel();
@@ -59,7 +60,7 @@ public class PaintRefresherTest
     assertTrue(registered.get("44").contains(jp4));
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testRemoveComponent()
   {
     Map<String, List<Component>> registered = PaintRefresher.components;
@@ -91,7 +92,7 @@ public class PaintRefresherTest
     assertTrue(registered.get("22").contains(jp2));
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGetAssociatedPanels()
   {
     SequenceI [] seqs = new SequenceI[]{new Sequence("", "ABC")};