From c622ff2b199eeea5de9c31cc1089f4e758a4c0d8 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 2 Apr 2017 08:16:21 -0400 Subject: [PATCH 1/3] converted to using jacoco for code coverage --- build-reporting/pom.xml | 72 ++++++++++++ dependency-check-ant/pom.xml | 42 ------- dependency-check-cli/pom.xml | 56 ---------- dependency-check-core/pom.xml | 105 +----------------- ...gineIntegrationTest.java => EngineIT.java} | 3 +- ...rationTest.java => ArchiveAnalyzerIT.java} | 2 +- ...ntegrationTest.java => CPEAnalyzerIT.java} | 4 +- ...java => DependencyBundlingAnalyzerIT.java} | 2 +- ...> VulnerabilitySuppressionAnalyzerIT.java} | 4 +- ...CveDBIntegrationTest.java => CveDBIT.java} | 17 ++- ...{CveDBMySQLTest.java => CveDBMySqlIT.java} | 4 +- ...ionTest.java => DatabasePropertiesIT.java} | 5 +- ...egrationTest.java => NvdCveUpdaterIT.java} | 4 +- ...rationTest.java => ReportGeneratorIT.java} | 3 +- dependency-check-maven/pom.xml | 17 --- dependency-check-utils/pom.xml | 57 +--------- ...IntegrationTest.java => DownloaderIT.java} | 3 +- pom.xml | 69 ++++++++++-- 18 files changed, 173 insertions(+), 296 deletions(-) create mode 100644 build-reporting/pom.xml rename dependency-check-core/src/test/java/org/owasp/dependencycheck/{EngineIntegrationTest.java => EngineIT.java} (97%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/{ArchiveAnalyzerIntegrationTest.java => ArchiveAnalyzerIT.java} (99%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/{CPEAnalyzerIntegrationTest.java => CPEAnalyzerIT.java} (98%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/{DependencyBundlingAnalyzerIntegrationTest.java => DependencyBundlingAnalyzerIT.java} (97%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/{VulnerabilitySuppressionAnalyzerIntegrationTest.java => VulnerabilitySuppressionAnalyzerIT.java} (96%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/{CveDBIntegrationTest.java => CveDBIT.java} (90%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/{CveDBMySQLTest.java => CveDBMySqlIT.java} (94%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/{DatabasePropertiesIntegrationTest.java => DatabasePropertiesIT.java} (94%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/{NvdCveUpdaterIntegrationTest.java => NvdCveUpdaterIT.java} (93%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/{ReportGeneratorIntegrationTest.java => ReportGeneratorIT.java} (98%) rename dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/{DownloaderIntegrationTest.java => DownloaderIT.java} (95%) diff --git a/build-reporting/pom.xml b/build-reporting/pom.xml new file mode 100644 index 000000000..ad3943d9c --- /dev/null +++ b/build-reporting/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + org.owasp + dependency-check-parent + 1.4.6-SNAPSHOT + + + build-reporting + + + + org.owasp + dependency-check-utils + ${project.version} + + + org.owasp + dependency-check-core + ${project.version} + + + org.owasp + dependency-check-ant + ${project.version} + + + org.owasp + dependency-check-cli + ${project.version} + + + org.owasp + dependency-check-maven + ${project.version} + + + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + verify + + report-aggregate + + + + + + + diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml index c3504b6e2..9c7962954 100644 --- a/dependency-check-ant/pom.xml +++ b/dependency-check-ant/pom.xml @@ -223,48 +223,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/dependency-check-data - - - - diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml index e62681f64..a1d13d0c2 100644 --- a/dependency-check-cli/pom.xml +++ b/dependency-check-cli/pom.xml @@ -69,62 +69,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - org.owasp.dependencycheck.App - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - cpe - data/cpe - target - - - cve - data/cpe - target - - - - org.codehaus.mojo appassembler-maven-plugin diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml index dc7590c6c..7cb0cee7f 100644 --- a/dependency-check-core/pom.xml +++ b/dependency-check-core/pom.xml @@ -121,93 +121,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - - - .*\$KEYS\.class - .*\$Element\.class - - - .*\$KEYS\.class - .*\$Element\.class - - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - org.owasp.dependencycheck.data.cpe.Fields - 0 - 0 - - - org.owasp.dependencycheck.App - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/data - - - temp.directory - ${project.build.directory}/temp - - - - **/*IntegrationTest.java - **/*MySQLTest.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - data.directory - ${project.build.directory}/data - - - temp.directory - ${project.build.directory}/temp - - - - @@ -481,13 +394,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-failsafe-plugin @@ -507,7 +413,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - **/*MySQLTest.java + **/*MySqlIT.java @@ -538,13 +444,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-failsafe-plugin @@ -564,7 +463,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - **/*MySQLTest.java + **/*MySqlIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java similarity index 97% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java index 5a78871c1..774748e78 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java @@ -29,12 +29,13 @@ import org.owasp.dependencycheck.exception.ReportException; import org.owasp.dependencycheck.reporting.ReportGenerator; import org.owasp.dependencycheck.utils.InvalidSettingException; import org.owasp.dependencycheck.utils.Settings; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class EngineIntegrationTest extends BaseDBTestCase { +public class EngineIT extends BaseDBTestCase { /** * Test running the entire engine. 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/ArchiveAnalyzerIT.java similarity index 99% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java index 12fcd195f..a80e845bd 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/ArchiveAnalyzerIT.java @@ -33,7 +33,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class ArchiveAnalyzerIntegrationTest extends BaseDBTestCase { +public class ArchiveAnalyzerIT extends BaseDBTestCase { /** * Test of getSupportedExtensions method, of class ArchiveAnalyzer. 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/CPEAnalyzerIT.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java index e26d825a3..562a5bff3 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/CPEAnalyzerIT.java @@ -34,12 +34,14 @@ import org.owasp.dependencycheck.data.cpe.IndexEntry; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Identifier; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class CPEAnalyzerIntegrationTest extends BaseDBTestCase { +public class CPEAnalyzerIT 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/DependencyBundlingAnalyzerIT.java similarity index 97% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java index 69e93e458..3378cf94a 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/DependencyBundlingAnalyzerIT.java @@ -24,7 +24,7 @@ import org.owasp.dependencycheck.BaseDBTestCase; * * @author Jeremy Long */ -public class DependencyBundlingAnalyzerIntegrationTest extends BaseDBTestCase { +public class DependencyBundlingAnalyzerIT extends BaseDBTestCase { /** * Test of analyze method, of class DependencyBundlingAnalyzer. 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/VulnerabilitySuppressionAnalyzerIT.java similarity index 96% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java index 172418c49..807a84666 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/VulnerabilitySuppressionAnalyzerIT.java @@ -26,13 +26,15 @@ import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.Engine; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.utils.Settings; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * Testing the vulnerability suppression analyzer. * * @author Jeremy Long */ -public class VulnerabilitySuppressionAnalyzerIntegrationTest extends BaseDBTestCase { +public class VulnerabilitySuppressionAnalyzerIT extends BaseDBTestCase { /** * Test of getName method, of class VulnerabilitySuppressionAnalyzer. 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/CveDBIT.java similarity index 90% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java index 54ad59c88..d73942304 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/CveDBIT.java @@ -33,12 +33,27 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class CveDBIntegrationTest extends BaseDBTestCase { +public class CveDBIT 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/CveDBMySQLTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java similarity index 94% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java index a27ef0191..04bb6af5e 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/CveDBMySqlIT.java @@ -27,12 +27,14 @@ import org.junit.Test; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.dependency.Vulnerability; import org.owasp.dependencycheck.dependency.VulnerableSoftware; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class CveDBMySQLTest extends BaseTest { +public class CveDBMySqlIT extends BaseTest { /** * Test of getCPEs method, of class CveDB. 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/DatabasePropertiesIT.java similarity index 94% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java index 6c6af8bcf..5243018c4 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/DatabasePropertiesIT.java @@ -24,12 +24,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.owasp.dependencycheck.data.update.nvd.NvdCveInfo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class DatabasePropertiesIntegrationTest extends BaseDBTestCase { +public class DatabasePropertiesIT extends BaseDBTestCase { /** * Test of isEmpty method, of class DatabaseProperties. 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/NvdCveUpdaterIT.java similarity index 93% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java index d2305a956..3211ff214 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/NvdCveUpdaterIT.java @@ -23,12 +23,14 @@ import org.junit.Test; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.data.update.exception.UpdateException; import org.owasp.dependencycheck.data.update.nvd.UpdateableNvdCve; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class NvdCveUpdaterIntegrationTest extends BaseTest { +public class NvdCveUpdaterIT extends BaseTest { public NvdCveUpdater getUpdater() { NvdCveUpdater instance = new NvdCveUpdater(); 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/ReportGeneratorIT.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java index f379d332d..af638db7d 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/ReportGeneratorIT.java @@ -39,12 +39,13 @@ import org.owasp.dependencycheck.exception.ReportException; import org.owasp.dependencycheck.utils.InvalidSettingException; import org.owasp.dependencycheck.utils.Settings; import org.xml.sax.SAXException; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class ReportGeneratorIntegrationTest extends BaseDBTestCase { +public class ReportGeneratorIT extends BaseDBTestCase { /** * Test of generateReport method, of class ReportGenerator. diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml index 498bdcb94..7acd5269f 100644 --- a/dependency-check-maven/pom.xml +++ b/dependency-check-maven/pom.xml @@ -85,23 +85,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/dependency-check-data - - - temp.directory - ${project.build.directory}/temp - - - - true org.apache.maven.plugins diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml index da6abef71..035222a77 100644 --- a/dependency-check-utils/pom.xml +++ b/dependency-check-utils/pom.xml @@ -41,62 +41,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/data - - - temp.directory - ${project.build.directory}/temp - - - - **/*IntegrationTest.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - + diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java similarity index 95% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java rename to dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java index 7e9e39309..a181249f6 100644 --- a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java +++ b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java @@ -21,12 +21,13 @@ import java.io.File; import java.net.URL; import static org.junit.Assert.assertTrue; import org.junit.Test; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class DownloaderIntegrationTest extends BaseTest { +public class DownloaderIT extends BaseTest { /** * Test of fetchFile method, of class Downloader. diff --git a/pom.xml b/pom.xml index 8698773ce..36d31223b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ Copyright (c) 2012 - Jeremy Long dependency-check-maven dependency-check-utils dependency-check-plugin + build-reporting Dependency-Check https://github.com/jeremylong/DependencyCheck.git @@ -132,7 +133,6 @@ Copyright (c) 2012 - Jeremy Long 3.0 2.17 - 2.7 3.6 @@ -162,9 +162,9 @@ Copyright (c) 2012 - Jeremy Long 1.10 - org.codehaus.mojo - cobertura-maven-plugin - 2.7 + org.jacoco + jacoco-maven-plugin + 0.7.9 org.apache.maven.plugins @@ -278,19 +278,64 @@ Copyright (c) 2012 - Jeremy Long + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + + surefireArgLine + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + failsafeArgLine + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefireArgLine} -Dfile.encoding=UTF-8 + + + data.directory + ${project.build.directory}/data + + + temp.directory + ${project.build.directory}/temp + + + + **/*MySqlIT.java + + + org.apache.maven.plugins maven-failsafe-plugin + ${failsafeArgLine} temp.directory ${project.build.directory}/temp - - **/*IntegrationTest.java - @@ -529,13 +574,15 @@ Copyright (c) 2012 - Jeremy Long - org.codehaus.mojo - cobertura-maven-plugin - ${reporting.cobertura-plugin.version} + org.jacoco + jacoco-maven-plugin + 0.7.9 + + - cobertura + report-aggregate From 567022a9b7c3ed20a1429f5af7fc50d5c86d8559 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Wed, 3 May 2017 06:28:30 -0400 Subject: [PATCH 2/3] updated so that jacoco results can be sent to codacy --- .travis.yml | 10 +++++++ build-reporting/pom.xml | 10 ++++++- build-reporting/src/site/markdown/index.md | 5 ++++ build-reporting/src/site/site.xml | 32 +++++++++++++++++++++ src/site/markdown/jacoco-aggregate/index.md | 2 ++ 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 build-reporting/src/site/markdown/index.md create mode 100644 build-reporting/src/site/site.xml create mode 100644 src/site/markdown/jacoco-aggregate/index.md diff --git a/.travis.yml b/.travis.yml index 7e2ab77cf..75e4c7e78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,13 @@ language: java jdk: oraclejdk7 script: mvn install -DreleaseTesting +env: + global: + secure: ZUzhWfpXJw/oAeDlUkDFkEJMT0T7kCN3d7ah8urkL2B0KFfKOqQagkbXkgvDa1SYud8VdcnoGa69LfkEr5IrdqW7R4bEYZAiN5swm4Z0iO8t53szVspm2f+O9jQ44O/sfOfpfLxWUUuhdc7Vbrszp+tSszxdPmssWL+f5a/mfWs= + +before_install: + - sudo apt-get install jq + - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url) + +after_success: + - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r build-reporting/target/site/jacoco-aggregate/jacoco.xml diff --git a/build-reporting/pom.xml b/build-reporting/pom.xml index ad3943d9c..d77663e2d 100644 --- a/build-reporting/pom.xml +++ b/build-reporting/pom.xml @@ -24,7 +24,15 @@ Copyright (c) 2017 - Jeremy Long. All Rights Reserved. build-reporting - + + + + github-pages-site + Deployment through GitHub's site deployment plugin + ${basedir}/../target/site/${project.version}/build-reporting + + + org.owasp diff --git a/build-reporting/src/site/markdown/index.md b/build-reporting/src/site/markdown/index.md new file mode 100644 index 000000000..1a2e3d771 --- /dev/null +++ b/build-reporting/src/site/markdown/index.md @@ -0,0 +1,5 @@ +About +===== +OWASP dependency-check build reporting is used to aggregate jacoco test coverage results +so that they can be posted to [Codacy](https://www.codacy.com/app/OWASP_Reviews/DependencyCheck/dashboard) +to track code coverage. \ No newline at end of file diff --git a/build-reporting/src/site/site.xml b/build-reporting/src/site/site.xml new file mode 100644 index 000000000..9304ea3c4 --- /dev/null +++ b/build-reporting/src/site/site.xml @@ -0,0 +1,32 @@ + + + + + OWASP dependency-check build reporting + OWASP dependency-check build reporting + ../images/dc.svg + + + + + + + + + \ No newline at end of file diff --git a/src/site/markdown/jacoco-aggregate/index.md b/src/site/markdown/jacoco-aggregate/index.md new file mode 100644 index 000000000..40b4fd961 --- /dev/null +++ b/src/site/markdown/jacoco-aggregate/index.md @@ -0,0 +1,2 @@ +# Jacoco Aggregate Report +The test coverage reports can be found [here](../build-reporting/jacoco-aggregate/index.html). \ No newline at end of file From 5681e0bfdfe8b76b67dd864b91731f70046227b4 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 5 May 2017 15:17:39 -0400 Subject: [PATCH 3/3] fixed test cases --- .../org/owasp/dependencycheck/data/nvdcve/CveDB.java | 10 ++++++++++ .../org/owasp/dependencycheck/data/nvdcve/CveDBIT.java | 4 +++- .../dependencycheck/data/nvdcve/CveDBMySqlIT.java | 4 +++- pom.xml | 6 +++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java index bb32ae907..7b42d82c3 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java @@ -230,6 +230,16 @@ public final class CveDB implements AutoCloseable { } } + /** + * Method added for testing, returns the current usage count of the CveDB + * singleton. + * + * @return the current usage of the CveDB singleton + */ + protected synchronized int getUsageCount() { + return usageCount; + } + /** * Opens the database connection. If the database does not exist, it will * create a new one. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java index e65f1b917..3ff98ee36 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java @@ -68,8 +68,10 @@ public class CveDBIT extends BaseDBTestCase { } catch (DatabaseException | SQLException ex) { fail(ex.getMessage()); } finally { + int start = instance.getUsageCount(); instance.close(); - assertFalse(instance.isOpen()); + int end = instance.getUsageCount(); + assertTrue( end < start); } } diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java index b38419a0d..e37fecafb 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java @@ -49,8 +49,10 @@ public class CveDBMySqlIT extends BaseTest { 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()); } finally { + int start = instance.getUsageCount(); instance.close(); - assertFalse(instance.isOpen()); + int end = instance.getUsageCount(); + assertTrue( end < start); } } diff --git a/pom.xml b/pom.xml index 36d31223b..448a901c2 100644 --- a/pom.xml +++ b/pom.xml @@ -320,9 +320,6 @@ Copyright (c) 2012 - Jeremy Long ${project.build.directory}/temp - - **/*MySqlIT.java - @@ -336,6 +333,9 @@ Copyright (c) 2012 - Jeremy Long ${project.build.directory}/temp + + **/*MySqlIT.java +