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

[jalview.git] / test / jalview / io / AnnotatedPDBFileInputTest.java

diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java
index ef88ca5..31bfd9d 100644 (file)
--- a/test/jalview/io/AnnotatedPDBFileInputTest.java
+++ b/test/jalview/io/AnnotatedPDBFileInputTest.java
@@ -1,16 +1,8 @@
 package jalview.io;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentAnnotation;
@@ -23,6 +15,14 @@ import jalview.gui.Desktop;
 import jalview.structure.StructureMapping;
 import jalview.structure.StructureSelectionManager;
 
+import java.io.File;
+
+import org.junit.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 public class AnnotatedPDBFileInputTest
 {
 
@@ -32,7 +32,7 @@ public class AnnotatedPDBFileInputTest
 
   String pdbId;
 
-  @Before
+ @BeforeMethod(alwaysRun = true)
   public void setup() throws Exception
   {
     Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
@@ -47,7 +47,7 @@ public class AnnotatedPDBFileInputTest
             .get(0).getId();
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void checkNoDuplicates()
   {
     // not strictly a requirement, but strange things may happen if multiple
@@ -60,14 +60,14 @@ public class AnnotatedPDBFileInputTest
     {
       for (int q = p + 1; q < avec.length; q++)
       {
-        assertNotEquals(
+        Assert.assertNotEquals(
                 "Found a duplicate annotation row " + avec[p].label,
                 avec[p], avec[q]);
       }
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void checkPDBannotationSource()
   {
 
@@ -85,7 +85,7 @@ public class AnnotatedPDBFileInputTest
   /**
    * Check sequence features have been added
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void checkPDBSequenceFeatures()
   {
     StructureSelectionManager ssm = StructureSelectionManager
@@ -124,7 +124,7 @@ public class AnnotatedPDBFileInputTest
     assertEquals("TYR:314 1gaqC", sf[295].getDescription());
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void checkAnnotationWiring()
   {
     assertTrue(al.getAlignmentAnnotation() != null);
@@ -156,7 +156,7 @@ public class AnnotatedPDBFileInputTest
   /**
    * @throws java.lang.Exception
    */
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
     jalview.bin.Jalview.main(new String[]
@@ -173,7 +173,7 @@ public class AnnotatedPDBFileInputTest
 
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testJalviewProjectRelocationAnnotation() throws Exception
   {