JAL-3365 expand range of allowed DSSP secondary structure symbols in Stockholm files

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

diff --git a/test/jalview/io/RNAMLfileTest.java b/test/jalview/io/RNAMLfileTest.java
index d9d0b7f..65cea6f 100644 (file)
--- a/test/jalview/io/RNAMLfileTest.java
+++ b/test/jalview/io/RNAMLfileTest.java
@@ -20,6 +20,8 @@
  */
 package jalview.io;
 
+import jalview.gui.JvOptionPane;
+
 import java.io.File;
 
 import org.testng.annotations.AfterClass;
@@ -29,21 +31,29 @@ 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(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testRnamlToStockholmIO()
   {
-    StockholmFileTest.testFileIOwithFormat(new File(
-            "examples/testdata/rna-alignment.xml"), "STH", -1, -1);
+    StockholmFileTest.testFileIOwithFormat(
+            new File("examples/testdata/rna-alignment.xml"),
+            FileFormat.Stockholm, -1, -1, true, true, true);
 
   }