JAL-2089 patch broken merge to master for Release 2.10.0b1

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

diff --git a/test/jalview/io/RNAMLfileTest.java b/test/jalview/io/RNAMLfileTest.java
index c7e6398..c084792 100644 (file)
--- a/test/jalview/io/RNAMLfileTest.java
+++ b/test/jalview/io/RNAMLfileTest.java
@@ -22,28 +22,28 @@ package jalview.io;
 
 import java.io.File;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 public class RNAMLfileTest
 {
 
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun = true)
   public static void tearDownAfterClass() throws Exception
   {
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testRnamlToStockholmIO()
   {
     StockholmFileTest.testFileIOwithFormat(new File(
-            "examples/rna-alignment.xml"), "STH", -1, -1);
+            "examples/testdata/rna-alignment.xml"), "STH", -1, -1);
 
   }