Merge branch 'develop' into improvement/JAL-3830_install4j9_macos_setup_application

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

diff --git a/test/jalview/gui/JAL1353bugdemo.java b/test/jalview/gui/JAL1353bugdemo.java
index 710d980..25dcac1 100644 (file)
--- a/test/jalview/gui/JAL1353bugdemo.java
+++ b/test/jalview/gui/JAL1353bugdemo.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * 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.
  * 
@@ -20,8 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.bin.Cache;
-
 import java.awt.Dimension;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -35,10 +33,19 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import jalview.bin.Console;
+
 public class JAL1353bugdemo
 {
 
   @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
   }
@@ -53,7 +60,7 @@ public class JAL1353bugdemo
   @Test(groups = { "Functional" }, enabled = false)
   public void test()
   {
-    Cache.initLogger();
+    Console.initLogger();
     // final Desktop foo = new Desktop();
     final JFrame cfoo = new JFrame("Crash Java");
     final JDesktopPane foo = new JDesktopPane();
@@ -92,8 +99,7 @@ public class JAL1353bugdemo
         // oo.setVisible(true);
         // parent.setVisible(true);
         EditNameDialog end = new EditNameDialog("Sequence Name",
-                "Sequence Description", "label 1", "Label 2",
-                "Try and drag between the two text fields", foo);// );cont.getRootPane());
+                       "Try and drag between the two text fields", "label 1", "Label 2");// );cont.getRootPane());
         assert (end != null);
         finish = true;
       }