From 9e463647594e4b4e6ee4be4d97cac4243df03274 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 30 Apr 2016 10:56:50 -0400 Subject: [PATCH] updated test cases to track down build issue --- .../owasp/dependencycheck/BaseDBTestCase.java | 9 +++++-- .../org/owasp/dependencycheck/BaseTest.java | 2 +- .../EngineIntegrationTest.java | 11 +-------- .../analyzer/AnalyzerServiceTest.java | 4 ++-- .../analyzer/ComposerLockAnalyzerTest.java | 1 + .../analyzer/FalsePositiveAnalyzerTest.java | 3 ++- .../analyzer/FileNameAnalyzerTest.java | 2 +- .../data/composer/ComposerLockParserTest.java | 3 ++- .../data/cpe/IndexEntryTest.java | 3 ++- .../dependencycheck/data/cwe/CweDBTest.java | 22 ++--------------- .../data/lucene/FieldAnalyzerTest.java | 19 ++------------- .../data/lucene/LuceneUtilsTest.java | 19 ++------------- .../TokenPairConcatenatingFilterTest.java | 8 ------- .../data/nvdcve/CveDBMySQLTest.java | 21 ++-------------- .../data/nvdcve/DriverLoaderTest.java | 24 +++---------------- .../update/nvd/NvdCve_1_2_HandlerTest.java | 21 +--------------- .../update/nvd/NvdCve_2_0_HandlerTest.java | 21 +--------------- .../dependency/DependencyTest.java | 21 +--------------- .../dependency/EvidenceTest.java | 3 ++- .../dependency/VulnerableSoftwareTest.java | 22 ++--------------- .../ReportGeneratorIntegrationTest.java | 8 ++----- .../suppression/PropertyTypeTest.java | 22 ++--------------- .../suppression/SuppressionHandlerTest.java | 21 +--------------- .../suppression/SuppressionParserTest.java | 21 +--------------- .../suppression/SuppressionRuleTest.java | 2 +- .../dependencycheck/utils/DateUtilTest.java | 22 ++--------------- .../utils/DependencyVersionTest.java | 3 ++- .../utils/DependencyVersionUtilTest.java | 22 ++--------------- .../dependencycheck/utils/FilterTest.java | 3 ++- .../dependencycheck/xml/pom/ModelTest.java | 3 ++- .../dependencycheck/xml/pom/PomUtilsTest.java | 2 +- 31 files changed, 55 insertions(+), 313 deletions(-) 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 399b00703..511c9618e 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 @@ -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 - * contained within. + * An abstract database test case that is used to ensure the H2 DB exists prior + * 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); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseTest.java index 1b6a7b4cb..b18b876cb 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseTest.java +++ b/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("------------------------------------------------"); } diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java index e3fd59c9e..4c2767364 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java +++ b/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 { - - @Before - public void setUp() throws Exception { - org.owasp.dependencycheck.BaseDBTestCase.ensureDBExists(); - } - - @After - public void tearDown() { - } +public class EngineIntegrationTest extends BaseDBTestCase { /** * Test running the entire engine. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java index 6f021bfc6..befa0692c 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java index f7549f47f..179deb433 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java +++ b/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(); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java index 37094afcc..d1b068da8 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java index 063f99fe7..c8b436ee5 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java index 444788659..b325decf0 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java +++ b/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; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java index aa938b73c..68fd1fe99 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java index 63f7d509d..e6df37477 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java +++ b/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 CweDBTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class CweDBTest extends BaseTest { /** * Method to serialize the CWE HashMap. This is not used in production; this is only used once during dev to create diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java index fe6113768..5cffc96e4 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java +++ b/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 { - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class FieldAnalyzerTest extends BaseTest { @Test public void testAnalyzers() throws Exception { diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java index 7d7552bc7..418962266 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java +++ b/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 { - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class LuceneUtilsTest extends BaseTest { /** * Test of appendEscapedLuceneQuery method, of class LuceneUtils. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java index dca6675ab..e6544153a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java +++ b/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 { 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 ba1fcba0d..00dc3612a 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 @@ -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 { - - @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 { - } +public class CveDBMySQLTest extends BaseTest { /** * Pretty useless tests of open, commit, and close methods, of class CveDB. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java index d8dfd64ec..83885f2b2 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java +++ b/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 DriverLoaderTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class DriverLoaderTest extends BaseTest { /** * 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 { diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java index fa00e849f..cc6c788d7 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java +++ b/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 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() { - } +public class NvdCve_1_2_HandlerTest extends BaseTest { @Test public void testParse() throws Exception { diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java index ea1c147ad..70257e6ed 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java +++ b/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 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() { - } +public class NvdCve_2_0_HandlerTest extends BaseTest { @Test public void testParse() { diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java index cbccb2083..63733fc59 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java +++ b/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 DependencyTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class DependencyTest extends BaseTest { /** * Test of getFileName method, of class Dependency. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java index 56b7e6393..09953bd19 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java index dce5b9883..5fa12af18 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java +++ b/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 VulnerableSoftwareTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class VulnerableSoftwareTest extends BaseTest { /** * Test of equals method, of class VulnerableSoftware. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java index 6f5230ced..5d5d6d47f 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java +++ b/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 { - - @Before - public void setUp() throws Exception { - org.owasp.dependencycheck.BaseDBTestCase.ensureDBExists(); - } +public class ReportGeneratorIntegrationTest extends BaseDBTestCase { /** * Test of generateReport method, of class ReportGenerator. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/PropertyTypeTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/PropertyTypeTest.java index d779ea112..47fa13d82 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/PropertyTypeTest.java +++ b/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 PropertyTypeTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class PropertyTypeTest extends BaseTest { /** * Test of set and getValue method, of class PropertyType. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java index 72cde170b..651c4c0f6 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java +++ b/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 SuppressionHandlerTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class SuppressionHandlerTest extends BaseTest { /** * Test of getSuppressionRules method, of class SuppressionHandler. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionParserTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionParserTest.java index dc0563e96..22cafd4b6 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionParserTest.java +++ b/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 SuppressionParserTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class SuppressionParserTest extends BaseTest { /** * Test of parseSuppressionRules method, of class SuppressionParser. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java index cdc5c538a..0a73d13a1 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java +++ b/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 { // /** diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java index fb8709932..ef97e51e8 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java +++ b/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 DateUtilTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class DateUtilTest extends BaseTest { /** * Test of withinDateRange method, of class DateUtil. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java index fae60cbc7..a53142f89 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java index b8b49c453..6f70e3d49 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java +++ b/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 DependencyVersionUtilTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } +public class DependencyVersionUtilTest extends BaseTest { /** * Test of parseVersion method, of class DependencyVersionUtil. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java index 03a851590..dc0290d85 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java index d99ed4712..cb6b1be5d 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java +++ b/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. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java index 67f047712..adedf1b35 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java +++ b/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.