updated test cases to track down build issue

dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java

@@ -31,8 +31,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * An abstract database test case that is used to ensure the H2 DB exists prior to performing tests that utilize the data
+ * An abstract database test case that is used to ensure the H2 DB exists prior
- * contained within.
+ * to performing tests that utilize the data contained within.
  *
  * @author Jeremy Long
  */
@@ -49,6 +49,11 @@ public abstract class BaseDBTestCase extends BaseTest {
 
     public static void ensureDBExists() throws Exception {
 
+        File f = new File("./target/data/dc.h2.db");
+        if (f.exists() && f.isFile() && f.length() < 71680) {
+            f.delete();
+        }
+
         java.io.File dataPath = Settings.getDataDirectory();
         String fileName = Settings.getString(Settings.KEYS.DB_FILE_NAME);
         LOGGER.trace("DB file name {}", fileName);

dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseTest.java

@@ -39,7 +39,7 @@ public class BaseTest {
         if (f.exists() && f.isFile() && f.length() < 71680) {
             System.err.println("------------------------------------------------");
             System.err.println("------------------------------------------------");
-            System.err.println("I broke the build");
+            System.err.println("Test referenced CveDB() and does not extend BaseDbTestCases?");
             System.err.println("------------------------------------------------");
             System.err.println("------------------------------------------------");
         }

dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java

@@ -30,16 +30,7 @@ import org.owasp.dependencycheck.utils.Settings;
  *
  * @author Jeremy Long
  */
-public class EngineIntegrationTest extends BaseTest {
+public class EngineIntegrationTest extends BaseDBTestCase {
-
-    @Before
-    public void setUp() throws Exception {
-        org.owasp.dependencycheck.BaseDBTestCase.ensureDBExists();
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test running the entire engine.

dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java

@@ -20,13 +20,13 @@ package org.owasp.dependencycheck.analyzer;
 import java.util.Iterator;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import org.owasp.dependencycheck.BaseTest;
+import org.owasp.dependencycheck.BaseDBTestCase;
 
 /**
  *
  * @author Jeremy Long
  */
-public class AnalyzerServiceTest extends BaseTest {
+public class AnalyzerServiceTest extends BaseDBTestCase {
 
     /**
      * Test of getAnalyzers method, of class AnalyzerService.

dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java

@@ -55,6 +55,7 @@ public class ComposerLockAnalyzerTest extends BaseDBTestCase {
      */
     @Before
     public void setUp() throws Exception {
+        super.setUp();
         analyzer = new ComposerLockAnalyzer();
         analyzer.setFilesMatched(true);
         analyzer.initialize();

dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java

@@ -18,6 +18,7 @@ package org.owasp.dependencycheck.analyzer;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 import org.owasp.dependencycheck.Engine;
 import org.owasp.dependencycheck.dependency.Dependency;
 
@@ -25,7 +26,7 @@ import org.owasp.dependencycheck.dependency.Dependency;
  *
  * @author Jeremy Long
  */
-public class FalsePositiveAnalyzerTest {
+public class FalsePositiveAnalyzerTest extends BaseTest {
 
     /**
      * Test of getName method, of class FalsePositiveAnalyzer.

dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java

@@ -28,7 +28,7 @@ import org.owasp.dependencycheck.dependency.Dependency;
  *
  * @author Jeremy Long
  */
-public class FileNameAnalyzerTest {
+public class FileNameAnalyzerTest extends BaseTest  {
 
     /**
      * Test of getName method, of class FileNameAnalyzer.

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java

@@ -25,11 +25,12 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 
 import static org.junit.Assert.*;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  * Created by colezlaw on 9/5/15.
  */
-public class ComposerLockParserTest {
+public class ComposerLockParserTest extends BaseTest  {
 
     private InputStream inputStream;
 

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java

@@ -19,12 +19,13 @@ package org.owasp.dependencycheck.data.cpe;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class IndexEntryTest {
+public class IndexEntryTest extends BaseTest  {
 
     /**
      * Test of setName method, of class IndexEntry.

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java

@@ -23,31 +23,13 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class CweDBTest {
+public class CweDBTest  extends BaseTest {
-
-    public CweDBTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Method to serialize the CWE HashMap. This is not used in production; this is only used once during dev to create

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java

@@ -43,28 +43,13 @@ import static org.junit.Assert.assertFalse;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class FieldAnalyzerTest {
+public class FieldAnalyzerTest extends BaseTest {
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     @Test
     public void testAnalyzers() throws Exception {

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java

@@ -23,28 +23,13 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class LuceneUtilsTest {
+public class LuceneUtilsTest  extends BaseTest {
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of appendEscapedLuceneQuery method, of class LuceneUtils.

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java

@@ -39,14 +39,6 @@ import org.junit.Test;
  */
 public class TokenPairConcatenatingFilterTest extends BaseTokenStreamTestCase {
 
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
     @Override
     @Before
     public void setUp() throws Exception {

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java

@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 import org.owasp.dependencycheck.dependency.Vulnerability;
 import org.owasp.dependencycheck.dependency.VulnerableSoftware;
 import org.owasp.dependencycheck.utils.Settings;
@@ -33,25 +34,7 @@ import org.owasp.dependencycheck.utils.Settings;
  *
  * @author Jeremy Long
  */
-public class CveDBMySQLTest {
+public class CveDBMySQLTest extends BaseTest {
-
-    @BeforeClass
-    public static void setUpClass() {
-        Settings.initialize();
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-        Settings.cleanup();
-    }
-
-    @Before
-    public void setUp() throws Exception {
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    }
 
     /**
      * Pretty useless tests of open, commit, and close methods, of class CveDB.

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java

@@ -33,26 +33,7 @@ import org.owasp.dependencycheck.BaseTest;
  *
  * @author Jeremy Long
  */
-public class DriverLoaderTest {
+public class DriverLoaderTest extends BaseTest {
-
-    public DriverLoaderTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of load method, of class DriverLoader.
@@ -71,7 +52,8 @@ public class DriverLoaderTest {
     }
 
     /**
-     * Test of load method, of class DriverLoader; expecting an exception due to a bad driver class name.
+     * Test of load method, of class DriverLoader; expecting an exception due to
+     * a bad driver class name.
      */
     @Test(expected = DriverLoadException.class)
     public void testLoad_String_ex() throws Exception {

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java

@@ -36,26 +36,7 @@ import org.owasp.dependencycheck.dependency.VulnerableSoftware;
  *
  * @author Jeremy Long
  */
-public class NvdCve_1_2_HandlerTest {
+public class NvdCve_1_2_HandlerTest  extends BaseTest {
-
-    public NvdCve_1_2_HandlerTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     @Test
     public void testParse() throws Exception {

dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java

@@ -33,26 +33,7 @@ import org.owasp.dependencycheck.BaseTest;
  *
  * @author Jeremy Long
  */
-public class NvdCve_2_0_HandlerTest {
+public class NvdCve_2_0_HandlerTest extends BaseTest {
-
-    public NvdCve_2_0_HandlerTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     @Test
     public void testParse() {

dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java

@@ -35,26 +35,7 @@ import org.owasp.dependencycheck.data.nexus.MavenArtifact;
  *
  * @author Jeremy Long
  */
-public class DependencyTest {
+public class DependencyTest extends BaseTest {
-
-    public DependencyTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of getFileName method, of class Dependency.

dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java

@@ -20,12 +20,13 @@ package org.owasp.dependencycheck.dependency;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class EvidenceTest {
+public class EvidenceTest extends BaseTest {
 
     /**
      * Test of equals method, of class Evidence.

dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java

@@ -23,31 +23,13 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class VulnerableSoftwareTest {
+public class VulnerableSoftwareTest extends BaseTest  {
-
-    public VulnerableSoftwareTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of equals method, of class VulnerableSoftware.

dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java

@@ -26,6 +26,7 @@ import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 import org.junit.Before;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseDBTestCase;
 import org.owasp.dependencycheck.BaseTest;
 import org.owasp.dependencycheck.Engine;
 import org.owasp.dependencycheck.data.nvdcve.CveDB;
@@ -36,12 +37,7 @@ import org.owasp.dependencycheck.utils.Settings;
  *
  * @author Jeremy Long
  */
-public class ReportGeneratorIntegrationTest extends BaseTest {
+public class ReportGeneratorIntegrationTest extends BaseDBTestCase {
-
-    @Before
-    public void setUp() throws Exception {
-        org.owasp.dependencycheck.BaseDBTestCase.ensureDBExists();
-    }
 
     /**
      * Test of generateReport method, of class ReportGenerator.

dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/PropertyTypeTest.java

@@ -25,31 +25,13 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class PropertyTypeTest {
+public class PropertyTypeTest extends BaseTest {
-
-    public PropertyTypeTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of set and getValue method, of class PropertyType.

dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java

@@ -39,26 +39,7 @@ import org.xml.sax.XMLReader;
  *
  * @author Jeremy Long
  */
-public class SuppressionHandlerTest {
+public class SuppressionHandlerTest extends BaseTest {
-
-    public SuppressionHandlerTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of getSuppressionRules method, of class SuppressionHandler.

dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionParserTest.java

@@ -32,26 +32,7 @@ import org.owasp.dependencycheck.BaseTest;
  *
  * @author Jeremy Long
  */
-public class SuppressionParserTest {
+public class SuppressionParserTest extends BaseTest {
-
-    public SuppressionParserTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of parseSuppressionRules method, of class SuppressionParser.

dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java

@@ -34,7 +34,7 @@ import org.owasp.dependencycheck.dependency.Vulnerability;
  *
  * @author Jeremy Long
  */
-public class SuppressionRuleTest {
+public class SuppressionRuleTest extends BaseTest {
 
     //<editor-fold defaultstate="collapsed" desc="Stupid tests of properties">
     /**

dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java

@@ -22,31 +22,13 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class DateUtilTest {
+public class DateUtilTest extends BaseTest {
-
-    public DateUtilTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of withinDateRange method, of class DateUtil.

dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java

@@ -24,12 +24,13 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class DependencyVersionTest {
+public class DependencyVersionTest extends BaseTest {
 
     /**
      * Test of parseVersion method, of class DependencyVersion.

dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java

@@ -24,31 +24,13 @@ import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class DependencyVersionUtilTest {
+public class DependencyVersionUtilTest extends BaseTest {
-
-    public DependencyVersionUtilTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of parseVersion method, of class DependencyVersionUtil.

dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java

@@ -23,12 +23,13 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author Jeremy Long
  */
-public class FilterTest {
+public class FilterTest extends BaseTest {
 
     /**
      * Test of passes method, of class Filter.

dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java

@@ -23,12 +23,13 @@ import java.util.Properties;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
+import org.owasp.dependencycheck.BaseTest;
 
 /**
  *
  * @author jeremy
  */
-public class ModelTest {
+public class ModelTest extends BaseTest {
 
     /**
      * Test of getName method, of class Model.

dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java

@@ -27,7 +27,7 @@ import org.owasp.dependencycheck.BaseTest;
  *
  * @author jeremy
  */
-public class PomUtilsTest {
+public class PomUtilsTest extends BaseTest {
 
     /**
      * Test of readPom method, of class PomUtils.