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

bug fixes/enhancements

Browse Source
This commit is contained in:
Jeremy Long
2012-09-10 12:25:15 -04:00
parent dbc10e53e4
commit 4147801074
10 changed files with 216 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/java/org/codesecure/dependencycheck/data/cpe/CPEQueryTest.java
View File

@@ -6,8 +6,9 @@ package org.codesecure.dependencycheck.data.cpe;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.queryParser.ParseException;
import org.codesecure.dependencycheck.data.BaseIndexTestCase;
@@ -52,10 +53,10 @@ public class CPEQueryTest extends BaseIndexTestCase {
assertEquals(expResult, result.get(0).getName());
//TODO - yeah, not a very good test as the results are the same with or without weighting...
List<String> productWeightings = new ArrayList<String>(1);
Set<String> productWeightings = new HashSet<String>(1);
productWeightings.add("struts2");
List<String> vendorWeightings = new ArrayList<String>(1);
Set<String> vendorWeightings = new HashSet<String>(1);
vendorWeightings.add("apache");
result = instance.searchCPE(vendor, product, version,productWeightings,vendorWeightings);
@@ -82,10 +83,10 @@ public class CPEQueryTest extends BaseIndexTestCase {
@Test
public void testBuildSearch() throws IOException, CorruptIndexException, ParseException {
System.out.println("buildSearch");
List<String> productWeightings = new ArrayList<String>(1);
Set<String> productWeightings = new HashSet<String>(1);
productWeightings.add("struts2");
List<String> vendorWeightings = new ArrayList<String>(1);
Set<String> vendorWeightings = new HashSet<String>(1);
vendorWeightings.add("apache");
String vendor = "apache software foundation";
@@ -191,10 +192,10 @@ public class CPEQueryTest extends BaseIndexTestCase {
instance.open();
//TODO - yeah, not a very good test as the results are the same with or without weighting...
List<String> productWeightings = new ArrayList<String>(1);
Set<String> productWeightings = new HashSet<String>(1);
productWeightings.add("struts2");
List<String> vendorWeightings = new ArrayList<String>(1);
Set<String> vendorWeightings = new HashSet<String>(1);
vendorWeightings.add("apache");
List<Entry> result = instance.searchCPE(vendor, product, version,productWeightings,vendorWeightings);

19
src/test/java/org/codesecure/dependencycheck/scanner/ScannerTest.java
View File

@@ -50,21 +50,22 @@ public class ScannerTest extends BaseIndexTestCase{
* @throws Exception is thrown when an exception occurs.
*/
@Test
//TODO remove the throws exception, this needs to be much more grainular.
public void testScan() throws Exception {
System.out.println("scan");
String path = "./src/test/resources";
Scanner instance = new Scanner();
instance.scan(path);
assertTrue(instance.getDependencies().size()>0);
// CPEQuery query = new CPEQuery();
// query.open();
// List<Dependency> dependencies = instance.getDependencies();
// for (Dependency d : dependencies) {
// query.determineCPE(d);
// }
// query.close();
// ReportGenerator rg = new ReportGenerator();
// rg.generateReports("./target/", "DependencyCheck", instance.getDependencies());
CPEQuery query = new CPEQuery();
query.open();
List<Dependency> dependencies = instance.getDependencies();
for (Dependency d : dependencies) {
query.determineCPE(d);
}
query.close();
ReportGenerator rg = new ReportGenerator();
rg.generateReports("./target/", "DependencyCheck", instance.getDependencies());
}