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

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

diff --git a/test/jalview/bin/CacheTest.java b/test/jalview/bin/CacheTest.java
index ac58aa9..e762dd5 100644 (file)
--- a/test/jalview/bin/CacheTest.java
+++ b/test/jalview/bin/CacheTest.java
@@ -1,7 +1,29 @@
+/*
+ * 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.bin;
 
 import static org.testng.AssertJUnit.assertEquals;
 
+import jalview.gui.JvOptionPane;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -12,6 +34,14 @@ import org.testng.annotations.Test;
 
 public class CacheTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   private Locale locale;
 
   @BeforeClass(alwaysRun = true)
@@ -42,7 +72,7 @@ public class CacheTest
     // currently using Locale.UK to format dates:
     assertEquals(
             formattedDate2,
-            SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG,
-                    SimpleDateFormat.LONG, Locale.UK).format(now));
+            SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM,
+                    SimpleDateFormat.MEDIUM, Locale.UK).format(now));
   }
 }