fixed date format for test case

Author: jeremylong

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java

@@ -45,8 +45,14 @@ public class EngineVersionCheckTest extends BaseTest {
 //        EngineVersionCheck instance = new EngineVersionCheck();
 //        instance.update();
 //    }
-    private long getEpoch(String date) {
-        return DateTime.parse(date).toInstant().getMillis() / 1000;
+    /**
+     * Converts a date in the form of yyyy-MM-dd into the epoch milliseconds.
+     * @param date a date in the format of yyyy-MM-dd
+     * @return milliseconds
+     */
+    private long dateToMilliseconds(String date) {
+        DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-dd");
+        return DateTime.parse(date, dtf).toInstant().getMillis();
     }
 
     /**
@@ -72,8 +78,8 @@ public String getProperty(String key) {
         String updateToVersion = "1.2.6";
         String currentVersion = "1.2.6";
 
-        long lastChecked = getEpoch("2014-12-01");
-        long now = getEpoch("2014-12-01");
+        long lastChecked = dateToMilliseconds("2014-12-01");
+        long now = dateToMilliseconds("2014-12-01");
 
         EngineVersionCheck instance = new EngineVersionCheck();
         boolean expResult = false;
@@ -83,8 +89,8 @@ public String getProperty(String key) {
 
         updateToVersion = "1.2.5";
         currentVersion = "1.2.5";
-        lastChecked = getEpoch("2014-10-01");
-        now = getEpoch("2014-12-01");
+        lastChecked = dateToMilliseconds("2014-10-01");
+        now = dateToMilliseconds("2014-12-01");
         expResult = true;
         instance.setUpdateToVersion(updateToVersion);
         result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
@@ -93,44 +99,44 @@ public String getProperty(String key) {
 
         updateToVersion = "1.2.5";
         currentVersion = "1.2.5";
-        lastChecked = getEpoch("2014-12-01");
-        now = getEpoch("2014-12-03");
+        lastChecked = dateToMilliseconds("2014-12-01");
+        now = dateToMilliseconds("2014-12-03");
         expResult = false;
         instance.setUpdateToVersion(updateToVersion);
         result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
         assertEquals(expResult, result);
 
         updateToVersion = "1.2.6";
         currentVersion = "1.2.5";
-        lastChecked = getEpoch("2014-12-01");
-        now = getEpoch("2014-12-03");
+        lastChecked = dateToMilliseconds("2014-12-01");
+        now = dateToMilliseconds("2014-12-03");
         expResult = true;
         instance.setUpdateToVersion(updateToVersion);
         result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
         assertEquals(expResult, result);
 
         updateToVersion = "1.2.5";
         currentVersion = "1.2.6";
-        lastChecked = getEpoch("2014-12-01");
-        now = getEpoch("2014-12-08");
+        lastChecked = dateToMilliseconds("2014-12-01");
+        now = dateToMilliseconds("2014-12-08");
         expResult = false;
         instance.setUpdateToVersion(updateToVersion);
         result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
         assertEquals(expResult, result);
 
         updateToVersion = "";
         currentVersion = "1.2.5";
-        lastChecked = getEpoch("2014-12-01");
-        now = getEpoch("2014-12-03");
+        lastChecked = dateToMilliseconds("2014-12-01");
+        now = dateToMilliseconds("2014-12-03");
         expResult = false;
         instance.setUpdateToVersion(updateToVersion);
         result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
         assertEquals(expResult, result);
 
         updateToVersion = "";
         currentVersion = "1.2.5";
-        lastChecked = getEpoch("2014-12-01");
-        now = getEpoch("2015-12-08");
+        lastChecked = dateToMilliseconds("2014-12-01");
+        now = dateToMilliseconds("2015-12-08");
         expResult = true;
         instance.setUpdateToVersion(updateToVersion);
         result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);