Merge branch 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet

[jalview.git] / test / jalview / bin / JalviewLiteTest.java

diff --git a/test/jalview/bin/JalviewLiteTest.java b/test/jalview/bin/JalviewLiteTest.java
index 8276300..4535b7e 100644 (file)
--- a/test/jalview/bin/JalviewLiteTest.java
+++ b/test/jalview/bin/JalviewLiteTest.java
@@ -23,30 +23,40 @@ package jalview.bin;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 
+import jalview.gui.JvOptionPane;
+
 import java.util.Arrays;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class JalviewLiteTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = "Functional")
   public void testSeparatorListToArray()
   {
-    assertNull(JalviewLite.separatorListToArray(null, "|"));
-    assertNull(JalviewLite.separatorListToArray("", "|"));
-    assertNull(JalviewLite.separatorListToArray("|", "|"));
-    assertNull(JalviewLite.separatorListToArray("abc", "abc"));
+    assertNull(JalviewAppLoader.separatorListToArray(null, "|"));
+    assertNull(JalviewAppLoader.separatorListToArray("", "|"));
+    assertNull(JalviewAppLoader.separatorListToArray("|", "|"));
+    assertNull(JalviewAppLoader.separatorListToArray("abc", "abc"));
 
-    String[] array = JalviewLite.separatorListToArray("abc|def|ghi|", "|");
+    String[] array = JalviewAppLoader.separatorListToArray("abc|def|ghi|", "|");
     assertEquals(3, array.length);
     assertEquals("abc", array[0]);
     assertEquals("def", array[1]);
     assertEquals("ghi", array[2]);
 
     assertEquals("[abc]",
-            Arrays.toString(JalviewLite.separatorListToArray("abc|", "|")));
-    assertEquals("[abc]", Arrays.toString(JalviewLite.separatorListToArray(
+            Arrays.toString(JalviewAppLoader.separatorListToArray("abc|", "|")));
+    assertEquals("[abc]", Arrays.toString(JalviewAppLoader.separatorListToArray(
             "abcxy", "xy")));
 
     // these fail: