minor changes to clean up test cases

Former-commit-id: 62d409fa6f50d3bbec881277a4604acca7278faa
This commit is contained in:
Jeremy Long
2014-10-25 08:07:56 -04:00
parent 2d58cfe0ce
commit b6d6a5de2b

View File

@@ -17,7 +17,9 @@
*/ */
package org.owasp.dependencycheck; package org.owasp.dependencycheck;
import java.util.List;
import org.junit.After; import org.junit.After;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -54,8 +56,8 @@ public class EngineIntegrationTest extends BaseTest {
Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false);
Engine instance = new Engine(); Engine instance = new Engine();
Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate); Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
instance.scan(testClasses); List<Dependency> deps = instance.scan(testClasses);
assertTrue(instance.getDependencies().size() > 0); assertFalse(deps.isEmpty());
for (Dependency d : instance.getDependencies()) { for (Dependency d : instance.getDependencies()) {
assertTrue("non-zip file collected " + d.getFileName(), d.getFileName().toLowerCase().endsWith(".zip")); assertTrue("non-zip file collected " + d.getFileName(), d.getFileName().toLowerCase().endsWith(".zip"));
} }
@@ -81,8 +83,7 @@ public class EngineIntegrationTest extends BaseTest {
cveDB.open(); cveDB.open();
DatabaseProperties dbProp = cveDB.getDatabaseProperties(); DatabaseProperties dbProp = cveDB.getDatabaseProperties();
cveDB.close(); cveDB.close();
ReportGenerator rg = new ReportGenerator("DependencyCheck", ReportGenerator rg = new ReportGenerator("DependencyCheck", instance.getDependencies(), instance.getAnalyzers(), dbProp);
instance.getDependencies(), instance.getAnalyzers(), dbProp);
rg.generateReports("./target/", "ALL"); rg.generateReports("./target/", "ALL");
instance.cleanup(); instance.cleanup();
} }