Merge branch 'develop' into feature/JAL-4227_Rfam2020_sslines

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

diff --git a/test/jalview/gui/AppVarnaTest.java b/test/jalview/gui/AppVarnaTest.java
index 94a3300..7936a4b 100644 (file)
--- a/test/jalview/gui/AppVarnaTest.java
+++ b/test/jalview/gui/AppVarnaTest.java
@@ -1,14 +1,43 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class AppVarnaTest
 {
-  @Test
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  @Test(groups = "Functional")
   public void testReplaceOddGaps()
   {
     String struct = "{(<]}>)";
@@ -17,8 +46,11 @@ public class AppVarnaTest
     assertSame(struct, replaced);
     assertEquals("..{.([.<.].}.>)",
             AppVarna.replaceOddGaps("..{ ([*<-]?} >)"));
-    assertEquals("....", AppVarna.replaceOddGaps("cgta"));
     assertEquals("", AppVarna.replaceOddGaps(""));
     assertNull(AppVarna.replaceOddGaps(null));
+    assertEquals("..{a([.<.].}A>)",
+            AppVarna.replaceOddGaps("  {a([*<-]?}A>)"));
+    assertEquals("..{B([.<.].}b>)",
+            AppVarna.replaceOddGaps("  {B([*<-]?}b>)"));
   }
 }