From 5681e0bfdfe8b76b67dd864b91731f70046227b4 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 5 May 2017 15:17:39 -0400
Subject: [PATCH] fixed test cases

---
 .../org/owasp/dependencycheck/data/nvdcve/CveDB.java   | 10 ++++++++++
 .../org/owasp/dependencycheck/data/nvdcve/CveDBIT.java |  4 +++-
 .../dependencycheck/data/nvdcve/CveDBMySqlIT.java      |  4 +++-
 pom.xml                                                |  6 +++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
index bb32ae907..7b42d82c3 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
@@ -230,6 +230,16 @@ public final class CveDB implements AutoCloseable {
         }
     }
 
+    /**
+     * Method added for testing, returns the current usage count of the CveDB
+     * singleton.
+     *
+     * @return the current usage of the CveDB singleton
+     */
+    protected synchronized int getUsageCount() {
+        return usageCount;
+    }
+
     /**
      * Opens the database connection. If the database does not exist, it will
      * create a new one.
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java
index e65f1b917..3ff98ee36 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java
@@ -68,8 +68,10 @@ public class CveDBIT extends BaseDBTestCase {
         } catch (DatabaseException | SQLException ex) {
             fail(ex.getMessage());
         } finally {
+            int start = instance.getUsageCount();
             instance.close();
-            assertFalse(instance.isOpen());
+            int end = instance.getUsageCount();
+            assertTrue( end < start);
         }
     }
 
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java
index b38419a0d..e37fecafb 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java
@@ -49,8 +49,10 @@ public class CveDBMySqlIT extends BaseTest {
             System.out.println("Unable to connect to the My SQL database; verify that the db server is running and that the schema has been generated");
             fail(ex.getMessage());
         } finally {
+            int start = instance.getUsageCount();
             instance.close();
-            assertFalse(instance.isOpen());
+            int end = instance.getUsageCount();
+            assertTrue( end < start);
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 36d31223b..448a901c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,9 +320,6 @@ Copyright (c) 2012 - Jeremy Long
                             <value>${project.build.directory}/temp</value>
                         </property>
                     </systemProperties>
-                    <excludes>
-                        <exclude>**/*MySqlIT.java</exclude>
-                    </excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -336,6 +333,9 @@ Copyright (c) 2012 - Jeremy Long
                             <value>${project.build.directory}/temp</value>
                         </property>
                     </systemProperties>
+                    <excludes>
+                        <exclude>**/*MySqlIT.java</exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>