From 228bb2fc8689d1d1fd7053a11b9d99c128de19ae Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 21 Apr 2014 21:46:54 -0400 Subject: [PATCH] converted long running tests to integration tests Former-commit-id: 36a20d08b8de14b369a083d1c52e0f458b276d47 --- ...iveAnalyzerTest.java => ArchiveAnalyzerIntegrationTest.java} | 2 +- .../{CPEAnalyzerTest.java => CPEAnalyzerIntegrationTest.java} | 2 +- ...ava => VulnerabilitySuppressionAnalyzerIntegrationTest.java} | 2 +- .../data/nvdcve/{CveDBTest.java => CveDBIntegrationTest.java} | 2 +- ...opertiesTest.java => DatabasePropertiesIntegrationTest.java} | 2 +- ...rtGeneratorTest.java => ReportGeneratorIntegrationTest.java} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/{ArchiveAnalyzerTest.java => ArchiveAnalyzerIntegrationTest.java} (99%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/{CPEAnalyzerTest.java => CPEAnalyzerIntegrationTest.java} (99%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/{VulnerabilitySuppressionAnalyzerTest.java => VulnerabilitySuppressionAnalyzerIntegrationTest.java} (97%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/{CveDBTest.java => CveDBIntegrationTest.java} (97%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/{DatabasePropertiesTest.java => DatabasePropertiesIntegrationTest.java} (98%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/{ReportGeneratorTest.java => ReportGeneratorIntegrationTest.java} (98%) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java similarity index 99% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java index c47f489ad..1ca50dfcf 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java @@ -32,7 +32,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class ArchiveAnalyzerTest extends AbstractDatabaseTestCase { +public class ArchiveAnalyzerIntegrationTest extends AbstractDatabaseTestCase { /** * Test of getSupportedExtensions method, of class ArchiveAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java similarity index 99% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java index 3bd89589d..8e07b4aa6 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java @@ -35,7 +35,7 @@ import org.owasp.dependencycheck.dependency.Identifier; * * @author Jeremy Long */ -public class CPEAnalyzerTest extends AbstractDatabaseTestCase { +public class CPEAnalyzerIntegrationTest extends AbstractDatabaseTestCase { /** * Tests of buildSearch of class CPEAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java similarity index 97% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java index 891ca6281..599ded307 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java @@ -31,7 +31,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class VulnerabilitySuppressionAnalyzerTest extends AbstractDatabaseTestCase { +public class VulnerabilitySuppressionAnalyzerIntegrationTest extends AbstractDatabaseTestCase { /** * Test of getName method, of class VulnerabilitySuppressionAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java similarity index 97% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java index d891a2c40..66f78f19c 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java @@ -27,7 +27,7 @@ import org.owasp.dependencycheck.dependency.VulnerableSoftware; * * @author Jeremy Long */ -public class CveDBTest extends BaseDBTestCase { +public class CveDBIntegrationTest extends BaseDBTestCase { /** * 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/DatabasePropertiesTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java index dd7277bb8..43d6537a2 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java @@ -27,7 +27,7 @@ import org.owasp.dependencycheck.data.update.NvdCveInfo; * * @author Jeremy Long */ -public class DatabasePropertiesTest extends BaseDBTestCase { +public class DatabasePropertiesIntegrationTest extends BaseDBTestCase { /** * Test of isEmpty method, of class DatabaseProperties. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java index a66abc816..ac213659c 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java @@ -36,7 +36,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class ReportGeneratorTest extends BaseTest { +public class ReportGeneratorIntegrationTest extends BaseTest { @Before public void setUp() throws Exception {