From 35402c7bd3fbf059c6a8190790060d5229c92107 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 17 May 2014 08:04:20 -0400 Subject: [PATCH] fixed test cases Former-commit-id: d76e5ba0431fdfc80847e7adbff9f0216ee7a191 --- .../analyzer/CPEAnalyzerIntegrationTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java index 8e07b4aa6..2c173cce0 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java @@ -115,16 +115,13 @@ public class CPEAnalyzerIntegrationTest extends AbstractDatabaseTestCase { FalsePositiveAnalyzer fp = new FalsePositiveAnalyzer(); fp.analyze(dep, null); -// for (Identifier i : dep.getIdentifiers()) { -// System.out.println(i.getValue()); -// } if (expResult != null) { Identifier expIdentifier = new Identifier("cpe", expResult, expResult); Assert.assertTrue("Incorrect match: { dep:'" + dep.getFileName() + "' }", dep.getIdentifiers().contains(expIdentifier)); - } else if (dep.getIdentifiers().isEmpty()) { - Assert.assertTrue("Match found when an Identifier should not have been found: { dep:'" + dep.getFileName() + "' }", dep.getIdentifiers().isEmpty()); } else { - Assert.assertTrue("Match found when an Identifier should not have been found: { dep:'" + dep.getFileName() + "', identifier:'" + dep.getIdentifiers().iterator().next().getValue() + "' }", dep.getIdentifiers().isEmpty()); + for (Identifier i : dep.getIdentifiers()) { + Assert.assertFalse(String.format("%s - found a CPE identifier when should have been none (found '%s')", dep.getFileName(), i.getValue()), "cpe".equals(i.getType())); + } } } @@ -170,7 +167,10 @@ public class CPEAnalyzerIntegrationTest extends AbstractDatabaseTestCase { String expResultSpring = "cpe:/a:springsource:spring_framework:2.5.5"; String expResultSpring3 = "cpe:/a:vmware:springsource_spring_framework:3.0.0"; - Assert.assertTrue("Apache Common Validator - found an identifier?", commonValidator.getIdentifiers().isEmpty()); + for (Identifier i : commonValidator.getIdentifiers()) { + Assert.assertFalse("Apache Common Validator - found a CPE identifier?", "cpe".equals(i.getType())); + } + Assert.assertTrue("Incorrect match size - struts", struts.getIdentifiers().size() >= 1); Assert.assertTrue("Incorrect match - struts", struts.getIdentifiers().contains(expIdentifier)); Assert.assertTrue("Incorrect match size - spring3 - " + spring3.getIdentifiers().size(), spring3.getIdentifiers().size() >= 1);