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

cleaned up test cases to properly close the DB

Browse Source 
Former-commit-id: 7333e882aebfe54b94a4d70cdb55ca2fbd3f3c51
This commit is contained in:
Jeremy Long
2015-07-17 15:31:00 -04:00
parent 7ac71a7b2a
commit dacb91b9a8
1 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java
View File

@@ -39,10 +39,16 @@ public class CveDBIntegrationTest extends BaseDBTestCase {
*/ */
@Test @Test
public void testOpen() throws Exception { public void testOpen() throws Exception {
CveDB instance = new CveDB(); CveDB instance = null;
instance.open(); try {
instance.commit(); instance = new CveDB();
instance.close(); instance.open();
instance.commit();
} finally {
if (instance != null) {
instance.close();
}
}
} }
/** /**
@@ -50,15 +56,18 @@ public class CveDBIntegrationTest extends BaseDBTestCase {
*/ */
@Test @Test
public void testGetCPEs() throws Exception { public void testGetCPEs() throws Exception {
CveDB instance = new CveDB(); CveDB instance = null;
try { try {
instance = new CveDB();
String vendor = "apache"; String vendor = "apache";
String product = "struts"; String product = "struts";
instance.open(); instance.open();
Set<VulnerableSoftware> result = instance.getCPEs(vendor, product); Set<VulnerableSoftware> result = instance.getCPEs(vendor, product);
assertTrue(result.size() > 5); assertTrue(result.size() > 5);
} finally { } finally {
instance.close(); if (instance != null) {
instance.close();
}
} }
} }
@@ -68,9 +77,10 @@ public class CveDBIntegrationTest extends BaseDBTestCase {
@Test @Test
public void testGetVulnerabilities() throws Exception { public void testGetVulnerabilities() throws Exception {
String cpeStr = "cpe:/a:apache:struts:2.1.2"; String cpeStr = "cpe:/a:apache:struts:2.1.2";
CveDB instance = new CveDB(); CveDB instance = null;
List<Vulnerability> results; List<Vulnerability> results;
try { try {
instance = new CveDB();
instance.open(); instance.open();
results = instance.getVulnerabilities(cpeStr); results = instance.getVulnerabilities(cpeStr);
assertTrue(results.size() > 5); assertTrue(results.size() > 5);
@@ -99,7 +109,9 @@ public class CveDBIntegrationTest extends BaseDBTestCase {
assertTrue("Expected " + expected + ", but was not identified", found); assertTrue("Expected " + expected + ", but was not identified", found);
} finally { } finally {
instance.close(); if (instance != null) {
instance.close();
}
} }
} }
@@ -108,56 +120,61 @@ public class CveDBIntegrationTest extends BaseDBTestCase {
*/ */
@Test @Test
public void testGetMatchingSoftware() throws Exception { public void testGetMatchingSoftware() throws Exception {
CveDB instance = null;
HashMap<String, Boolean> versions = new HashMap<String, Boolean>(); HashMap<String, Boolean> versions = new HashMap<String, Boolean>();
DependencyVersion identifiedVersion = new DependencyVersion("1.0.1o"); DependencyVersion identifiedVersion = new DependencyVersion("1.0.1o");
versions.put("cpe:/a:openssl:openssl:1.0.1e", Boolean.FALSE); versions.put("cpe:/a:openssl:openssl:1.0.1e", Boolean.FALSE);
try {
instance = new CveDB();
Entry<String, Boolean> results = instance.getMatchingSoftware(versions, "openssl", "openssl", identifiedVersion);
Assert.assertNull(results);
versions.put("cpe:/a:openssl:openssl:1.0.1p", Boolean.FALSE);
results = instance.getMatchingSoftware(versions, "openssl", "openssl", identifiedVersion);
Assert.assertNull(results);
CveDB instance = new CveDB(); versions.put("cpe:/a:openssl:openssl:1.0.1q", Boolean.TRUE);
Entry<String, Boolean> results = instance.getMatchingSoftware(versions, "openssl", "openssl", identifiedVersion); results = instance.getMatchingSoftware(versions, "openssl", "openssl", identifiedVersion);
Assert.assertNull(results); Assert.assertNotNull(results);
versions.put("cpe:/a:openssl:openssl:1.0.1p", Boolean.FALSE); Assert.assertEquals("cpe:/a:openssl:openssl:1.0.1q", results.getKey());
results = instance.getMatchingSoftware(versions, "openssl", "openssl", identifiedVersion);
Assert.assertNull(results);
versions.put("cpe:/a:openssl:openssl:1.0.1q", Boolean.TRUE); versions.clear();
results = instance.getMatchingSoftware(versions, "openssl", "openssl", identifiedVersion);
Assert.assertNotNull(results);
Assert.assertEquals("cpe:/a:openssl:openssl:1.0.1q", results.getKey());
versions.clear(); versions.put("cpe:/a:springsource:spring_framework:3.2.5", Boolean.FALSE);
versions.put("cpe:/a:springsource:spring_framework:3.2.6", Boolean.FALSE);
versions.put("cpe:/a:springsource:spring_framework:3.2.7", Boolean.TRUE);
versions.put("cpe:/a:springsource:spring_framework:3.2.5", Boolean.FALSE); versions.put("cpe:/a:springsource:spring_framework:4.0.1", Boolean.TRUE);
versions.put("cpe:/a:springsource:spring_framework:3.2.6", Boolean.FALSE); versions.put("cpe:/a:springsource:spring_framework:4.0.0:m1", Boolean.FALSE);
versions.put("cpe:/a:springsource:spring_framework:3.2.7", Boolean.TRUE); versions.put("cpe:/a:springsource:spring_framework:4.0.0:m2", Boolean.FALSE);
versions.put("cpe:/a:springsource:spring_framework:4.0.0:rc1", Boolean.FALSE);
versions.put("cpe:/a:springsource:spring_framework:4.0.1", Boolean.TRUE); identifiedVersion = new DependencyVersion("3.2.2");
versions.put("cpe:/a:springsource:spring_framework:4.0.0:m1", Boolean.FALSE); results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
versions.put("cpe:/a:springsource:spring_framework:4.0.0:m2", Boolean.FALSE); Assert.assertEquals("cpe:/a:springsource:spring_framework:3.2.7", results.getKey());
versions.put("cpe:/a:springsource:spring_framework:4.0.0:rc1", Boolean.FALSE); Assert.assertTrue(results.getValue());
identifiedVersion = new DependencyVersion("3.2.12");
results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
Assert.assertNull(results);
identifiedVersion = new DependencyVersion("3.2.2"); identifiedVersion = new DependencyVersion("4.0.0");
results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion); results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
Assert.assertEquals("cpe:/a:springsource:spring_framework:3.2.7", results.getKey()); Assert.assertEquals("cpe:/a:springsource:spring_framework:4.0.1", results.getKey());
Assert.assertTrue(results.getValue()); Assert.assertTrue(results.getValue());
identifiedVersion = new DependencyVersion("3.2.12"); identifiedVersion = new DependencyVersion("4.1.0");
results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion); results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
Assert.assertNull(results); Assert.assertNull(results);
identifiedVersion = new DependencyVersion("4.0.0"); versions.clear();
results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
Assert.assertEquals("cpe:/a:springsource:spring_framework:4.0.1", results.getKey());
Assert.assertTrue(results.getValue());
identifiedVersion = new DependencyVersion("4.1.0");
results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
Assert.assertNull(results);
versions.clear();
versions.put("cpe:/a:jruby:jruby:-", Boolean.FALSE);
identifiedVersion = new DependencyVersion("1.6.3");
results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
Assert.assertNotNull(results);
versions.put("cpe:/a:jruby:jruby:-", Boolean.FALSE);
identifiedVersion = new DependencyVersion("1.6.3");
results = instance.getMatchingSoftware(versions, "springsource", "spring_framework", identifiedVersion);
Assert.assertNotNull(results);
} finally {
if (instance != null) {
instance.close();
}
}
} }
} }