From dc849c3891af45b48dfb1317f27360ce5885b303 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 18 Oct 2015 06:17:21 -0400 Subject: [PATCH] removed duplicate abstract test base --- .../taskdefs/DependencyCheckTaskTest.java | 2 +- .../{data/nvdcve => }/BaseDBTestCase.java | 4 +- .../EngineIntegrationTest.java | 2 +- .../ArchiveAnalyzerIntegrationTest.java | 4 +- .../analyzer/CMakeAnalyzerTest.java | 2 +- .../analyzer/CPEAnalyzerIntegrationTest.java | 4 +- ...ndencyBundlingAnalyzerIntegrationTest.java | 4 +- .../analyzer/HintAnalyzerTest.java | 9 +---- ...itySuppressionAnalyzerIntegrationTest.java | 4 +- .../data/cpe/AbstractDatabaseTestCase.java | 37 ------------------- .../data/nvdcve/CveDBIntegrationTest.java | 1 + .../DatabasePropertiesIntegrationTest.java | 1 + .../data/update/BaseUpdaterTest.java | 2 +- .../ReportGeneratorIntegrationTest.java | 2 +- 14 files changed, 20 insertions(+), 58 deletions(-) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/{data/nvdcve => }/BaseDBTestCase.java (96%) delete mode 100644 dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java diff --git a/dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java b/dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java index f381e04d2..de9f62c1e 100644 --- a/dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java +++ b/dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase; +import org.owasp.dependencycheck.BaseDBTestCase; import org.owasp.dependencycheck.utils.Settings; import static org.junit.Assert.assertTrue; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java similarity index 96% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java index 652dc6e60..399b00703 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java @@ -15,7 +15,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data.nvdcve; +package org.owasp.dependencycheck; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -31,6 +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. * * @author Jeremy Long */ 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 68ed51f3d..e3fd59c9e 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 @@ -34,7 +34,7 @@ public class EngineIntegrationTest extends BaseTest { @Before public void setUp() throws Exception { - org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase.ensureDBExists(); + org.owasp.dependencycheck.BaseDBTestCase.ensureDBExists(); } @After diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java index 7a5bf74bf..179d06a58 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.*; import org.junit.Test; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.Engine; -import org.owasp.dependencycheck.data.cpe.AbstractDatabaseTestCase; +import org.owasp.dependencycheck.BaseDBTestCase; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.utils.Settings; @@ -32,7 +32,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class ArchiveAnalyzerIntegrationTest extends AbstractDatabaseTestCase { +public class ArchiveAnalyzerIntegrationTest extends BaseDBTestCase { /** * Test of getSupportedExtensions method, of class ArchiveAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java index fcde64fdf..f985e413a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; -import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase; +import org.owasp.dependencycheck.BaseDBTestCase; /** * Unit tests for CmakeAnalyzer. 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 0384fe407..36c6e7478 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 @@ -28,7 +28,7 @@ import org.junit.Assert; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.owasp.dependencycheck.BaseTest; -import org.owasp.dependencycheck.data.cpe.AbstractDatabaseTestCase; +import org.owasp.dependencycheck.BaseDBTestCase; import org.owasp.dependencycheck.data.cpe.IndexEntry; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; @@ -38,7 +38,7 @@ import org.owasp.dependencycheck.dependency.Identifier; * * @author Jeremy Long */ -public class CPEAnalyzerIntegrationTest extends AbstractDatabaseTestCase { +public class CPEAnalyzerIntegrationTest extends BaseDBTestCase { /** * Tests of buildSearch of class CPEAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java index 8ee12448f..69e93e458 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java @@ -18,13 +18,13 @@ package org.owasp.dependencycheck.analyzer; import org.junit.Test; -import org.owasp.dependencycheck.data.cpe.AbstractDatabaseTestCase; +import org.owasp.dependencycheck.BaseDBTestCase; /** * * @author Jeremy Long */ -public class DependencyBundlingAnalyzerIntegrationTest extends AbstractDatabaseTestCase { +public class DependencyBundlingAnalyzerIntegrationTest extends BaseDBTestCase { /** * Test of analyze method, of class DependencyBundlingAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java index c9079714f..990f24a28 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.Test; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.Engine; -import org.owasp.dependencycheck.data.cpe.AbstractDatabaseTestCase; +import org.owasp.dependencycheck.BaseDBTestCase; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; @@ -34,12 +34,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class HintAnalyzerTest extends AbstractDatabaseTestCase { - - @Before - public void setUp() throws Exception { - org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase.ensureDBExists(); - } +public class HintAnalyzerTest extends BaseDBTestCase { /** * Test of getName method, of class HintAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java index 1496a4a1c..172418c49 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java @@ -21,9 +21,9 @@ import java.io.File; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.owasp.dependencycheck.BaseDBTestCase; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.Engine; -import org.owasp.dependencycheck.data.cpe.AbstractDatabaseTestCase; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.utils.Settings; @@ -32,7 +32,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class VulnerabilitySuppressionAnalyzerIntegrationTest extends AbstractDatabaseTestCase { +public class VulnerabilitySuppressionAnalyzerIntegrationTest extends BaseDBTestCase { /** * Test of getName method, of class VulnerabilitySuppressionAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java deleted file mode 100644 index a2a328964..000000000 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of dependency-check-core. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Copyright (c) 2012 Jeremy Long. All Rights Reserved. - */ -package org.owasp.dependencycheck.data.cpe; - -import org.junit.Before; -import org.owasp.dependencycheck.BaseTest; -import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase; - -/** - * 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 - */ -public abstract class AbstractDatabaseTestCase extends BaseTest { - - @Before - public void setUp() throws Exception { - BaseDBTestCase.ensureDBExists(); - } - -} diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java index 72c3047c3..319136850 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java @@ -17,6 +17,7 @@ */ package org.owasp.dependencycheck.data.nvdcve; +import org.owasp.dependencycheck.BaseDBTestCase; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java index 04e66f086..f505af9c9 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java @@ -17,6 +17,7 @@ */ package org.owasp.dependencycheck.data.nvdcve; +import org.owasp.dependencycheck.BaseDBTestCase; import java.util.Properties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/BaseUpdaterTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/BaseUpdaterTest.java index 1a64959f7..1fffea9c5 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/BaseUpdaterTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/BaseUpdaterTest.java @@ -18,7 +18,7 @@ package org.owasp.dependencycheck.data.update; import org.junit.Test; -import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase; +import org.owasp.dependencycheck.BaseDBTestCase; import org.owasp.dependencycheck.data.nvdcve.CveDB; import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties; import org.owasp.dependencycheck.data.update.exception.UpdateException; 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 28dace177..6f5230ced 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 @@ -40,7 +40,7 @@ public class ReportGeneratorIntegrationTest extends BaseTest { @Before public void setUp() throws Exception { - org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase.ensureDBExists(); + org.owasp.dependencycheck.BaseDBTestCase.ensureDBExists(); } /**