From dfc6d952bd33adbc87c91bb68e8b3fad14e04b90 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 10 Mar 2017 15:38:00 -0500
Subject: [PATCH] codacy cleanup

---
 .../data/update/NvdCveUpdater.java              |  1 -
 .../owasp/dependencycheck/BaseDBTestCase.java   |  5 -----
 .../data/nvdcve/CveDBMySQLTest.java             | 17 ++---------------
 .../update/NvdCveUpdaterIntegrationTest.java    |  1 -
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java
index d86583af1..caebce05f 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java
@@ -24,7 +24,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.net.URL;
-import java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java
index c09568194..1bb992197 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java
@@ -26,7 +26,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.owasp.dependencycheck.data.nvdcve.CveDB;
 import org.owasp.dependencycheck.utils.Settings;
 import org.slf4j.Logger;
@@ -44,10 +43,6 @@ public abstract class BaseDBTestCase extends BaseTest {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(BaseDBTestCase.class);
 
-//    @BeforeClass
-//    public static void setUpClass() throws Exception {
-//        BaseTest.setUpClass();
-//    }
     @Before
     public void setUpDb() throws Exception {
         ensureDBExists();        
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java
index 99e2b3581..a27ef0191 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java
@@ -34,19 +34,6 @@ import org.owasp.dependencycheck.dependency.VulnerableSoftware;
  */
 public class CveDBMySQLTest extends BaseTest {
 
-    /**
-     * Pretty useless tests of open, commit, and close methods, of class CveDB.
-     */
-    @Test
-    public void testOpen() {
-        try {
-            CveDB instance = CveDB.getInstance();
-        } catch (DatabaseException ex) {
-            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());
-        }
-    }
-
     /**
      * Test of getCPEs method, of class CveDB.
      */
@@ -55,7 +42,7 @@ public class CveDBMySQLTest extends BaseTest {
         CveDB instance = CveDB.getInstance();
         try {
             String vendor = "apache";
-            String product = "struts";            
+            String product = "struts";
             Set<VulnerableSoftware> result = instance.getCPEs(vendor, product);
             assertTrue("Has data been loaded into the MySQL DB? if not consider using the CLI to populate it", result.size() > 5);
         } catch (Exception ex) {
@@ -77,6 +64,6 @@ public class CveDBMySQLTest extends BaseTest {
         } catch (Exception ex) {
             System.out.println("Unable to access the My SQL database; verify that the db server is running and that the schema has been generated");
             throw ex;
-        } 
+        }
     }
 }
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
index 6cedb1858..d2305a956 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import org.junit.Test;
 import org.owasp.dependencycheck.BaseTest;
-import org.owasp.dependencycheck.data.nvdcve.CveDB;
 import org.owasp.dependencycheck.data.update.exception.UpdateException;
 import org.owasp.dependencycheck.data.update.nvd.UpdateableNvdCve;