From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 4 Aug 2016 14:35:18 +0000 (+0100)
Subject: JAL-2164 changed to be Java 1.7 compliant
X-Git-Tag: Release_2_10_0~116
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f7d983a5b086e6363a446524c5c3d11f03f2f0a6;p=jalview.git

JAL-2164 changed to be Java 1.7 compliant
---

diff --git a/test/jalview/io/Jalview2xmlTests.java b/test/jalview/io/Jalview2xmlTests.java
index e1bc3ae..e01e785 100644
--- a/test/jalview/io/Jalview2xmlTests.java
+++ b/test/jalview/io/Jalview2xmlTests.java
@@ -30,6 +30,7 @@ import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.ViewStyleI;
 import jalview.bin.Cache;
+import jalview.bin.Jalview;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.HiddenSequences;
@@ -45,9 +46,7 @@ import jalview.structure.StructureImportSettings;
 import jalview.viewmodel.AlignmentViewport;
 
 import java.io.File;
-import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -68,11 +67,20 @@ public class Jalview2xmlTests
   @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
-    jalview.bin.Jalview.main(new String[] { "-props",
-        "test/jalview/io/testProps.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
+     */
+    String oneHourFromNow = Cache.date_format
+            .format(System.currentTimeMillis() + 3600 * 1000);
+    Cache.setProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow);
+
+    Jalview.main(new String[] {});
   }
 
   /**