From 40a1b6fde00ab1935630f3d9ec730aec56e7a197 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 3 Jan 2014 14:05:47 -0500 Subject: [PATCH] fixed tests based on changes to APIs and available settings Former-commit-id: 120cbabb800de8c3d385a52f3ae8bd25d9492830 --- .../owasp/dependencycheck/utils/SettingsTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java index 2fd5c39dd..967cd34cd 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java @@ -57,8 +57,8 @@ public class SettingsTest { */ @Test public void testGetString() { - String key = Settings.KEYS.CVE_DATA_DIRECTORY; - String expResult = "cve"; + String key = Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS; + String expResult = "7"; String result = Settings.getString(key); Assert.assertTrue(result.endsWith(expResult)); } @@ -68,14 +68,10 @@ public class SettingsTest { */ @Test public void testGetDataFile() throws IOException { - String key = Settings.KEYS.CVE_DATA_DIRECTORY; - String expResult = "data" + File.separator + "cve"; + String key = Settings.KEYS.DATA_DIRECTORY; + String expResult = "data"; File result = Settings.getDataFile(key); Assert.assertTrue(result.getAbsolutePath().endsWith(expResult)); - - result = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY); - String path = result.getPath(); - Assert.assertTrue(path.endsWith("data") || path.endsWith("data" + File.separator)); } /**