X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FRNAMLfileTest.java;h=65cea6f40d127e02e09489367aaa7d0ca1344d4b;hb=4d5f77436c8d77a776ca7c042611f36238c97057;hp=f5b02583f38ce56febdc0dceaf25a0b4571b0a86;hpb=2273eba5668e5340354da60fed329c6c716cc439;p=jalview.git

diff --git a/test/jalview/io/RNAMLfileTest.java b/test/jalview/io/RNAMLfileTest.java
index f5b0258..65cea6f 100644
--- a/test/jalview/io/RNAMLfileTest.java
+++ b/test/jalview/io/RNAMLfileTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,30 +20,40 @@
  */
 package jalview.io;
 
+import jalview.gui.JvOptionPane;
+
 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 void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  @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);
+    StockholmFileTest.testFileIOwithFormat(
+            new File("examples/testdata/rna-alignment.xml"),
+            FileFormat.Stockholm, -1, -1, true, true, true);
 
   }