diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java index 599ded307..73e23294d 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java @@ -61,19 +61,22 @@ public class VulnerabilitySuppressionAnalyzerIntegrationTest extends AbstractDat @Test public void testAnalyze() throws Exception { - File file = new File(this.getClass().getClassLoader().getResource("FileHelpers.2.0.0.0.nupkg").getPath()); - File suppression = new File(this.getClass().getClassLoader().getResource("FileHelpers.2.0.0.0.suppression.xml").getPath()); + File file = new File(this.getClass().getClassLoader().getResource("commons-fileupload-1.2.1.jar").getPath()); + File suppression = new File(this.getClass().getClassLoader().getResource("commons-fileupload-1.2.1.suppression.xml").getPath()); Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); + Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, false); Engine engine = new Engine(); engine.scan(file); engine.analyzeDependencies(); Dependency dependency = getDependency(engine, file); assertTrue(dependency.getVulnerabilities().size() > 0); + assertTrue(dependency.getIdentifiers().size() > 0); Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppression.getAbsolutePath()); VulnerabilitySuppressionAnalyzer instance = new VulnerabilitySuppressionAnalyzer(); instance.initialize(); instance.analyze(dependency, engine); assertTrue(dependency.getVulnerabilities().size() == 0); + assertTrue(dependency.getIdentifiers().isEmpty()); engine.cleanup(); } diff --git a/dependency-check-core/src/test/resources/FileHelpers.2.0.0.0.suppression.xml b/dependency-check-core/src/test/resources/FileHelpers.2.0.0.0.suppression.xml deleted file mode 100644 index c59a8cc67..000000000 --- a/dependency-check-core/src/test/resources/FileHelpers.2.0.0.0.suppression.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - 30FB37D6163CF16E3BA740343BECDD14D5457619 - CVE-2007-1536 - - \ No newline at end of file diff --git a/dependency-check-core/src/test/resources/commons-fileupload-1.2.1.suppression.xml b/dependency-check-core/src/test/resources/commons-fileupload-1.2.1.suppression.xml new file mode 100644 index 000000000..84e93daff --- /dev/null +++ b/dependency-check-core/src/test/resources/commons-fileupload-1.2.1.suppression.xml @@ -0,0 +1,24 @@ + + + + + 384FAA82E193D4E4B0546059CA09572654BC3970 + cpe:/a:apache:commons_fileupload:1.2.1 + + + + 384FAA82E193D4E4B0546059CA09572654BC3970 + CVE-2014-0050 + + + + 384FAA82E193D4E4B0546059CA09572654BC3970 + CVE-2013-0248 + + \ No newline at end of file