github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 18:11:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

jacks suggested change

Browse Source
This commit is contained in:
Jeremy Long
2016-12-10 16:55:58 -05:00
parent 5a678d2ccb
commit 610e97ef7f
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

@@ -20,6 +20,9 @@ import java.text.SimpleDateFormat;
import java.util.Properties; import java.util.Properties;
import mockit.Mock; import mockit.Mock;
import mockit.MockUp; import mockit.MockUp;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Test; import org.junit.Test;
@@ -42,6 +45,10 @@ 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;
}
/** /**
* Test of shouldUpdate method, of class EngineVersionCheck. * Test of shouldUpdate method, of class EngineVersionCheck.
*/ */
@@ -62,12 +69,11 @@ public class EngineVersionCheckTest extends BaseTest {
}.getMockInstance(); }.getMockInstance();
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String updateToVersion = "1.2.6"; String updateToVersion = "1.2.6";
String currentVersion = "1.2.6"; String currentVersion = "1.2.6";
long lastChecked = df.parse("2014-12-01").getTime();
long now = df.parse("2014-12-01").getTime(); long lastChecked = getEpoch("2014-12-01");
long now = getEpoch("2014-12-01");
EngineVersionCheck instance = new EngineVersionCheck(); EngineVersionCheck instance = new EngineVersionCheck();
boolean expResult = false; boolean expResult = false;
@@ -77,8 +83,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.5"; updateToVersion = "1.2.5";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = df.parse("2014-10-01").getTime(); lastChecked = getEpoch("2014-10-01");
now = df.parse("2014-12-01").getTime(); now = getEpoch("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);
@@ -87,8 +93,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.5"; updateToVersion = "1.2.5";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = df.parse("2014-12-01").getTime(); lastChecked = getEpoch("2014-12-01");
now = df.parse("2014-12-03").getTime(); now = getEpoch("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);
@@ -96,8 +102,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.6"; updateToVersion = "1.2.6";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = df.parse("2014-12-01").getTime(); lastChecked = getEpoch("2014-12-01");
now = df.parse("2014-12-03").getTime(); now = getEpoch("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);
@@ -105,8 +111,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = "1.2.5"; updateToVersion = "1.2.5";
currentVersion = "1.2.6"; currentVersion = "1.2.6";
lastChecked = df.parse("2014-12-01").getTime(); lastChecked = getEpoch("2014-12-01");
now = df.parse("2014-12-08").getTime(); now = getEpoch("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);
@@ -114,8 +120,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = ""; updateToVersion = "";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = df.parse("2014-12-01").getTime(); lastChecked = getEpoch("2014-12-01");
now = df.parse("2014-12-03").getTime(); now = getEpoch("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);
@@ -123,8 +129,8 @@ public class EngineVersionCheckTest extends BaseTest {
updateToVersion = ""; updateToVersion = "";
currentVersion = "1.2.5"; currentVersion = "1.2.5";
lastChecked = df.parse("2014-12-01").getTime(); lastChecked = getEpoch("2014-12-01");
now = df.parse("2015-12-08").getTime(); now = getEpoch("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);