github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-25 02:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed date format for test case

Browse Source
This commit is contained in:
Jeremy Long
2016-12-10 19:50:09 -05:00
parent 610e97ef7f
commit 1c053469e9
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,8 +45,14 @@ public class EngineVersionCheckTest extends BaseTest {
// EngineVersionCheck instance = new EngineVersionCheck(); // EngineVersionCheck instance = new EngineVersionCheck();
// instance.update(); // 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 class EngineVersionCheckTest extends BaseTest {
String updateToVersion = "1.2.6"; String updateToVersion = "1.2.6";
String currentVersion = "1.2.6"; String currentVersion = "1.2.6";
long lastChecked = getEpoch("2014-12-01"); long lastChecked = dateToMilliseconds("2014-12-01");
long now = getEpoch("2014-12-01"); long now = dateToMilliseconds("2014-12-01");
EngineVersionCheck instance = new EngineVersionCheck(); EngineVersionCheck instance = new EngineVersionCheck();
boolean expResult = false; boolean expResult = false;
@@ -83,8 +89,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.5"; updateToVersion = "1.2.5";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = getEpoch("2014-10-01"); lastChecked = dateToMilliseconds("2014-10-01");
now = getEpoch("2014-12-01"); now = dateToMilliseconds("2014-12-01");
expResult = true; expResult = true;
instance.setUpdateToVersion(updateToVersion); instance.setUpdateToVersion(updateToVersion);
result = instance.shouldUpdate(lastChecked, now, properties, currentVersion); result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
@@ -93,8 +99,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.5"; updateToVersion = "1.2.5";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = getEpoch("2014-12-01"); lastChecked = dateToMilliseconds("2014-12-01");
now = getEpoch("2014-12-03"); now = dateToMilliseconds("2014-12-03");
expResult = false; expResult = false;
instance.setUpdateToVersion(updateToVersion); instance.setUpdateToVersion(updateToVersion);
result = instance.shouldUpdate(lastChecked, now, properties, currentVersion); result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
@@ -102,8 +108,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.6"; updateToVersion = "1.2.6";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = getEpoch("2014-12-01"); lastChecked = dateToMilliseconds("2014-12-01");
now = getEpoch("2014-12-03"); now = dateToMilliseconds("2014-12-03");
expResult = true; expResult = true;
instance.setUpdateToVersion(updateToVersion); instance.setUpdateToVersion(updateToVersion);
result = instance.shouldUpdate(lastChecked, now, properties, currentVersion); result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
@@ -111,8 +117,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.5"; updateToVersion = "1.2.5";
currentVersion = "1.2.6"; currentVersion = "1.2.6";
lastChecked = getEpoch("2014-12-01"); lastChecked = dateToMilliseconds("2014-12-01");
now = getEpoch("2014-12-08"); now = dateToMilliseconds("2014-12-08");
expResult = false; expResult = false;
instance.setUpdateToVersion(updateToVersion); instance.setUpdateToVersion(updateToVersion);
result = instance.shouldUpdate(lastChecked, now, properties, currentVersion); result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
@@ -120,8 +126,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = ""; updateToVersion = "";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = getEpoch("2014-12-01"); lastChecked = dateToMilliseconds("2014-12-01");
now = getEpoch("2014-12-03"); now = dateToMilliseconds("2014-12-03");
expResult = false; expResult = false;
instance.setUpdateToVersion(updateToVersion); instance.setUpdateToVersion(updateToVersion);
result = instance.shouldUpdate(lastChecked, now, properties, currentVersion); result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);
@@ -129,8 +135,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = ""; updateToVersion = "";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = getEpoch("2014-12-01"); lastChecked = dateToMilliseconds("2014-12-01");
now = getEpoch("2015-12-08"); now = dateToMilliseconds("2015-12-08");
expResult = true; expResult = true;
instance.setUpdateToVersion(updateToVersion); instance.setUpdateToVersion(updateToVersion);
result = instance.shouldUpdate(lastChecked, now, properties, currentVersion); result = instance.shouldUpdate(lastChecked, now, properties, currentVersion);