From b6d6a5de2b356aa94a276988e63ce290feb9f920 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 25 Oct 2014 08:07:56 -0400 Subject: [PATCH] minor changes to clean up test cases Former-commit-id: 62d409fa6f50d3bbec881277a4604acca7278faa --- .../org/owasp/dependencycheck/EngineIntegrationTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java index c986ae487..9d660d43e 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java @@ -17,7 +17,9 @@ */ package org.owasp.dependencycheck; +import java.util.List; import org.junit.After; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; @@ -54,8 +56,8 @@ public class EngineIntegrationTest extends BaseTest { Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); Engine instance = new Engine(); Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate); - instance.scan(testClasses); - assertTrue(instance.getDependencies().size() > 0); + List deps = instance.scan(testClasses); + assertFalse(deps.isEmpty()); for (Dependency d : instance.getDependencies()) { assertTrue("non-zip file collected " + d.getFileName(), d.getFileName().toLowerCase().endsWith(".zip")); } @@ -81,8 +83,7 @@ public class EngineIntegrationTest extends BaseTest { cveDB.open(); DatabaseProperties dbProp = cveDB.getDatabaseProperties(); cveDB.close(); - ReportGenerator rg = new ReportGenerator("DependencyCheck", - instance.getDependencies(), instance.getAnalyzers(), dbProp); + ReportGenerator rg = new ReportGenerator("DependencyCheck", instance.getDependencies(), instance.getAnalyzers(), dbProp); rg.generateReports("./target/", "ALL"); instance.cleanup(); }