Merge branch 'develop' into bug/JAL-2154projectMappings

[jalview.git] / test / jalview / io / Jalview2xmlBase.java

diff --git a/test/jalview/io/Jalview2xmlBase.java b/test/jalview/io/Jalview2xmlBase.java
index 3ce5c4f..379fd68 100644 (file)
--- a/test/jalview/io/Jalview2xmlBase.java
+++ b/test/jalview/io/Jalview2xmlBase.java
@@ -1,11 +1,11 @@
 package jalview.io;
 
 import jalview.bin.Cache;
+import jalview.bin.Jalview;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.SequenceI;
 import jalview.gui.Desktop;
 
-import java.time.Instant;
 import java.util.Date;
 
 import org.testng.annotations.AfterClass;
@@ -21,12 +21,19 @@ public class Jalview2xmlBase
   @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
-    jalview.bin.Jalview.main(new String[] { "-props",
-        "test/jalview/io/testProps_nodas.jvprops" });
-    jalview.bin.Cache.setProperty(
-            "JALVIEW_NEWS_RSS_LASTMODIFIED",
-            Cache.date_format.format(Date.from(Instant.now().plusSeconds(
-                    3600))));
+    /*
+     * use read-only test properties file
+     */
+    Cache.loadProperties("test/jalview/io/testProps.jvprops");
+
+    /*
+     * set news feed last read to a future time to ensure no
+     * 'unread' news item is displayed
+     */
+    Date oneHourFromNow = new Date(System.currentTimeMillis() + 3600 * 1000);
+    Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow);
+
+    Jalview.main(new String[] {});
   }
 
   /**