X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FJalviewLiteTest.java;h=4535b7e868483efa25c0ca2ac8069d62ac6a88f6;hb=418006c3714eb8da78234660698231597eb90fb1;hp=79310a0122cd5d00daabd1fca508ec3e04fc045a;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git

diff --git a/test/jalview/bin/JalviewLiteTest.java b/test/jalview/bin/JalviewLiteTest.java
index 79310a0..4535b7e 100644
--- a/test/jalview/bin/JalviewLiteTest.java
+++ b/test/jalview/bin/JalviewLiteTest.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
- * Jalview - A Sequence Alignment Editor and Viewer (2.9.0b1)
- * Copyright (C) 2015 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.
  * 
@@ -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: