From 857b993d51f039785d68ffbf97b58c170a60c7ca Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Mon, 4 Jul 2016 07:55:53 -0400
Subject: [PATCH] ensured analyzers were correctly initialized and closed

---
 .../analyzer/CPEAnalyzerIntegrationTest.java  | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 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 7eb339eff..a400bc861 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
@@ -82,23 +82,28 @@ public class CPEAnalyzerIntegrationTest extends BaseDBTestCase {
      */
     @Test
     public void testDetermineCPE_full() throws Exception {
-        CPEAnalyzer instance = new CPEAnalyzer();
-        instance.open();
-        FileNameAnalyzer fnAnalyzer = new FileNameAnalyzer();
-        JarAnalyzer jarAnalyzer = new JarAnalyzer();
-        HintAnalyzer hAnalyzer = new HintAnalyzer();
-        FalsePositiveAnalyzer fp = new FalsePositiveAnalyzer();
-
+        CPEAnalyzer cpeAnalyzer = new CPEAnalyzer();
         try {
+            cpeAnalyzer.initialize();
+            FileNameAnalyzer fnAnalyzer = new FileNameAnalyzer();
+            fnAnalyzer.initialize();
+            JarAnalyzer jarAnalyzer = new JarAnalyzer();
+            jarAnalyzer.accept(new File("test.jar"));//trick analyzer into "thinking it is active"
+            jarAnalyzer.initialize();
+            HintAnalyzer hAnalyzer = new HintAnalyzer();
+            hAnalyzer.initialize();
+            FalsePositiveAnalyzer fp = new FalsePositiveAnalyzer();
+            fp.initialize();
+                        
             //callDetermineCPE_full("struts2-core-2.3.16.3.jar", "cpe:/a:apache:struts:2.3.16.3", instance, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
-            callDetermineCPE_full("hazelcast-2.5.jar", null, instance, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
-            callDetermineCPE_full("spring-context-support-2.5.5.jar", "cpe:/a:springsource:spring_framework:2.5.5", instance, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
-            callDetermineCPE_full("spring-core-3.0.0.RELEASE.jar", "cpe:/a:vmware:springsource_spring_framework:3.0.0", instance, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
-            callDetermineCPE_full("org.mortbay.jetty.jar", "cpe:/a:mortbay_jetty:jetty:4.2.27", instance, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
-            callDetermineCPE_full("jaxb-xercesImpl-1.5.jar", null, instance, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
-            callDetermineCPE_full("ehcache-core-2.2.0.jar", null, instance, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
+            callDetermineCPE_full("hazelcast-2.5.jar", null, cpeAnalyzer, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
+            callDetermineCPE_full("spring-context-support-2.5.5.jar", "cpe:/a:springsource:spring_framework:2.5.5", cpeAnalyzer, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
+            callDetermineCPE_full("spring-core-3.0.0.RELEASE.jar", "cpe:/a:vmware:springsource_spring_framework:3.0.0", cpeAnalyzer, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
+            callDetermineCPE_full("org.mortbay.jetty.jar", "cpe:/a:mortbay_jetty:jetty:4.2.27", cpeAnalyzer, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
+            callDetermineCPE_full("jaxb-xercesImpl-1.5.jar", null, cpeAnalyzer, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
+            callDetermineCPE_full("ehcache-core-2.2.0.jar", null, cpeAnalyzer, fnAnalyzer, jarAnalyzer, hAnalyzer, fp);
         } finally {
-            instance.close();
+            cpeAnalyzer.close();
         }
     }
 
@@ -107,7 +112,7 @@ public class CPEAnalyzerIntegrationTest extends BaseDBTestCase {
      *
      * @throws Exception is thrown when an exception occurs
      */
-    public void callDetermineCPE_full(String depName, String expResult, CPEAnalyzer instance, FileNameAnalyzer fnAnalyzer, JarAnalyzer jarAnalyzer, HintAnalyzer hAnalyzer, FalsePositiveAnalyzer fp) throws Exception {
+    public void callDetermineCPE_full(String depName, String expResult, CPEAnalyzer cpeAnalyzer, FileNameAnalyzer fnAnalyzer, JarAnalyzer jarAnalyzer, HintAnalyzer hAnalyzer, FalsePositiveAnalyzer fp) throws Exception {
 
         //File file = new File(this.getClass().getClassLoader().getResource(depName).getPath());
         File file = BaseTest.getResourceAsFile(this, depName);
@@ -117,7 +122,7 @@ public class CPEAnalyzerIntegrationTest extends BaseDBTestCase {
         fnAnalyzer.analyze(dep, null);
         jarAnalyzer.analyze(dep, null);
         hAnalyzer.analyze(dep, null);
-        instance.analyze(dep, null);
+        cpeAnalyzer.analyze(dep, null);
         fp.analyze(dep, null);
 
         if (expResult != null) {
@@ -146,8 +151,10 @@ public class CPEAnalyzerIntegrationTest extends BaseDBTestCase {
         fnAnalyzer.analyze(struts, null);
 
         HintAnalyzer hintAnalyzer = new HintAnalyzer();
+        hintAnalyzer.initialize();
         JarAnalyzer jarAnalyzer = new JarAnalyzer();
         jarAnalyzer.accept(new File("test.jar"));//trick analyzer into "thinking it is active"
+        jarAnalyzer.initialize();
 
         jarAnalyzer.analyze(struts, null);
         hintAnalyzer.analyze(struts, null);