mirror of
https://github.com/ysoftdevs/DependencyCheck.git
synced 2026-01-15 08:13:43 +01:00
prepared for CVE data by refactoring CPE code
This commit is contained in:
@@ -56,13 +56,7 @@ public class IndexTest extends BaseIndexTestCase {
|
||||
} catch (IOException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
try {
|
||||
instance.close();
|
||||
} catch (CorruptIndexException ex) {
|
||||
fail(ex.getMessage());
|
||||
} catch (IOException ex) {
|
||||
fail(ex.getMessage());
|
||||
}
|
||||
instance.close();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -71,7 +65,8 @@ public class IndexTest extends BaseIndexTestCase {
|
||||
@Test
|
||||
public void testGetDirectory() throws Exception {
|
||||
System.out.println("getDirectory");
|
||||
Directory result = Index.getDirectory();
|
||||
Index index = new Index();
|
||||
Directory result = index.getDirectory();
|
||||
String exp = "\\target\\store\\cpe";
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
assertTrue(result.toString().contains(exp));
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
/*
|
||||
* To change this template, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
package org.codesecure.dependencycheck.data.cpe;
|
||||
|
||||
import org.codesecure.dependencycheck.data.BaseIndexTestCase;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author jeremy
|
||||
*/
|
||||
public class IndexTestCase extends BaseIndexTestCase {
|
||||
|
||||
public IndexTestCase(String testName) {
|
||||
super(testName);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void tearDown() throws Exception {
|
||||
super.tearDown();
|
||||
}
|
||||
|
||||
public void testIgnoreThisClass() throws Exception {
|
||||
assertTrue(true);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -68,10 +68,10 @@ public class ReportGeneratorTest extends BaseIndexTestCase {
|
||||
d.addCPEentry("cpe://a:/some:cpe:1.0");
|
||||
|
||||
List<Dependency> dependencies = new ArrayList<Dependency>();
|
||||
d.getTitleEvidence().addEvidence("jar","filename","<test>test", Confidence.HIGH);
|
||||
d.getTitleEvidence().addEvidence("manifest","vendor","<test>test", Confidence.HIGH);
|
||||
d.getProductEvidence().addEvidence("jar","filename","<test>test", Confidence.HIGH);
|
||||
d.getProductEvidence().addEvidence("manifest","vendor","<test>test", Confidence.HIGH);
|
||||
|
||||
for (Evidence e : d.getTitleEvidence().iterator(Confidence.HIGH)) {
|
||||
for (Evidence e : d.getProductEvidence().iterator(Confidence.HIGH)) {
|
||||
String t = e.getValue();
|
||||
}
|
||||
dependencies.add(d);
|
||||
@@ -82,10 +82,10 @@ public class ReportGeneratorTest extends BaseIndexTestCase {
|
||||
d2.addCPEentry("cpe://a:/another:cpe:1.0");
|
||||
d2.addCPEentry("cpe://a:/another:cpe:1.1");
|
||||
d2.addCPEentry("cpe://a:/another:cpe:1.2");
|
||||
d2.getTitleEvidence().addEvidence("jar","filename","another.jar", Confidence.HIGH);
|
||||
d2.getTitleEvidence().addEvidence("manifest","vendor","Company A", Confidence.MEDIUM);
|
||||
d2.getProductEvidence().addEvidence("jar","filename","another.jar", Confidence.HIGH);
|
||||
d2.getProductEvidence().addEvidence("manifest","vendor","Company A", Confidence.MEDIUM);
|
||||
|
||||
for (Evidence e : d2.getTitleEvidence().iterator(Confidence.HIGH)) {
|
||||
for (Evidence e : d2.getProductEvidence().iterator(Confidence.HIGH)) {
|
||||
String t = e.getValue();
|
||||
}
|
||||
|
||||
@@ -94,9 +94,9 @@ public class ReportGeneratorTest extends BaseIndexTestCase {
|
||||
Dependency d3 = new Dependency();
|
||||
d3.setFileName("Third.jar");
|
||||
d3.setFilePath("lib/Third.jar");
|
||||
d3.getTitleEvidence().addEvidence("jar","filename","third.jar", Confidence.HIGH);
|
||||
d3.getProductEvidence().addEvidence("jar","filename","third.jar", Confidence.HIGH);
|
||||
|
||||
for (Evidence e : d3.getTitleEvidence().iterator(Confidence.HIGH)) {
|
||||
for (Evidence e : d3.getProductEvidence().iterator(Confidence.HIGH)) {
|
||||
String t = e.getValue();
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ public class JarAnalyzerTest {
|
||||
|
||||
result = instance.insepct(file);
|
||||
boolean found = false;
|
||||
for (Evidence e : result.getTitleEvidence()) {
|
||||
for (Evidence e : result.getProductEvidence()) {
|
||||
if (e.getName().equals("package-title") && e.getValue().equals("org.mortbay.http")) {
|
||||
found = true;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user