Skip to content

Commit a0e8b41

Browse files
sksamuelsksamuel
committed
Updated itest configs
1 parent 1586054 commit a0e8b41

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

Diff for: ‎src/main/scala/scoverage/ScoverageSbtPlugin.scala

+35-33
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ class ScoverageSbtPlugin extends sbt.Plugin {
3535
libraryDependencies += {
3636
OrgScoverage % (ScalacArtifact + "_" + scalaBinaryVersion.value) % ScoverageVersion % ScoverageCompile.name
3737
},
38-
sources in ScoverageCompile <<= (sources in Compile),
39-
sourceDirectory in ScoverageCompile <<= (sourceDirectory in Compile),
40-
resourceDirectory in ScoverageCompile <<= (resourceDirectory in Compile),
41-
resourceGenerators in ScoverageCompile <<= (resourceGenerators in Compile),
42-
excludedPackages in ScoverageCompile := "",
43-
javacOptions in ScoverageCompile <<= (javacOptions in Compile),
44-
javaOptions in ScoverageCompile <<= (javaOptions in Compile),
4538

4639
minimumCoverage := 0, // default is no minimum
4740
failOnMinimumCoverage := false,
@@ -72,9 +65,9 @@ class ScoverageSbtPlugin extends sbt.Plugin {
7265

7366
val dataDir = cross / "/scoverage-data"
7467
val coberturaDir = cross / "coverage-report"
75-
val reportDir = cross / "scoverage-report"
68+
val scoverageDir = cross / "scoverage-report"
7669
coberturaDir.mkdirs()
77-
reportDir.mkdirs()
70+
scoverageDir.mkdirs()
7871

7972
val coverageFile = IOUtils.coverageFile(dataDir)
8073
val measurementFiles = IOUtils.findMeasurementFiles(dataDir)
@@ -89,27 +82,26 @@ class ScoverageSbtPlugin extends sbt.Plugin {
8982
log.info(s"[scoverage] Generating Cobertura report [${coberturaDir.getAbsolutePath}/cobertura.xml]")
9083
new CoberturaXmlWriter(baseDir, coberturaDir).write(coverage)
9184

92-
log.info(s"[scoverage] Generating XML report [${reportDir.getAbsolutePath}/scoverage.xml]")
93-
new ScoverageXmlWriter(compileSourceDirectory, reportDir, false).write(coverage)
94-
new ScoverageXmlWriter(compileSourceDirectory, reportDir, true).write(coverage)
85+
log.info(s"[scoverage] Generating XML report [${scoverageDir.getAbsolutePath}/scoverage.xml]")
86+
new ScoverageXmlWriter(compileSourceDirectory, scoverageDir, false).write(coverage)
87+
new ScoverageXmlWriter(compileSourceDirectory, scoverageDir, true).write(coverage)
9588

96-
log.info(s"[scoverage] Generating HTML report [${reportDir.getAbsolutePath}/index.html]")
97-
new ScoverageHtmlWriter(compileSourceDirectory, reportDir).write(coverage)
89+
log.info(s"[scoverage] Generating HTML report [${scoverageDir.getAbsolutePath}/index.html]")
90+
new ScoverageHtmlWriter(compileSourceDirectory, scoverageDir).write(coverage)
9891

9992
log.info("[scoverage] Reports completed")
10093
val min = minimumCoverage.value
101-
val failOnMin = failOnMinimumCoverage.value
10294

10395
// check for default minimum
10496
if (min > 0) {
10597
if (min > coverage.statementCoveragePercent) {
106-
log
107-
.error(s"[scoverage] Coverage is below minimum [${coverage.statementCoverageFormatted}% < $min%]")
108-
if (failOnMin)
109-
throw new RuntimeException("Coverage minimum was not reached")
98+
log.error(s"[scoverage] Coverage is below minimum [${coverage.statementCoverageFormatted}% < $min%]")
99+
if (failOnMinimumCoverage.value) {
100+
// todo better way to fail an SBT build ?
101+
throw new RuntimeException("Coverage minimum was not reached. Failing build.")
102+
}
110103
} else {
111-
log
112-
.info(s"[scoverage] Coverage is above minimum [${coverage.statementCoverageFormatted}% > $min%]")
104+
log.info(s"[scoverage] Coverage is above minimum [${coverage.statementCoverageFormatted}% > $min%]")
113105
}
114106
}
115107

@@ -118,39 +110,49 @@ class ScoverageSbtPlugin extends sbt.Plugin {
118110

119111
scalacOptions in ScoverageCompile ++= (if (highlighting.value) List("-Yrangepos") else Nil),
120112

113+
sources in ScoverageCompile <<= (sources in Compile),
114+
sourceDirectory in ScoverageCompile <<= (sourceDirectory in Compile),
115+
resourceDirectory in ScoverageCompile <<= (resourceDirectory in Compile),
116+
resourceGenerators in ScoverageCompile <<= (resourceGenerators in Compile),
117+
unmanagedResources in ScoverageCompile <<= (unmanagedResources in Compile),
118+
javaOptions in ScoverageCompile <<= (javaOptions in Compile),
119+
javacOptions in ScoverageCompile <<= (javacOptions in Compile),
120+
fork in ScoverageCompileTest <<= (fork in Compile),
121+
excludedPackages in ScoverageCompile := "",
122+
121123
sources in ScoverageTest <<= (sources in Test),
122124
sourceDirectory in ScoverageTest <<= (sourceDirectory in Test),
123125
resourceDirectory in ScoverageTest <<= (resourceDirectory in Test),
124126
resourceGenerators in ScoverageTest <<= (resourceGenerators in Test),
125127
unmanagedResources in ScoverageTest <<= (unmanagedResources in Test),
126-
javacOptions in ScoverageTest <<= (javacOptions in Test),
127128
javaOptions in ScoverageTest <<= (javaOptions in Test),
129+
javacOptions in ScoverageTest <<= (javacOptions in Test),
128130
fork in ScoverageTest <<= (fork in Test),
129131
testOptions in ScoverageTest <<= (testOptions in Test),
130-
sources in ScoverageITest <<= (sources in Test),
131132

132-
sourceDirectory in ScoverageITest <<= (sourceDirectory in Test),
133-
resourceDirectory in ScoverageITest <<= (resourceDirectory in Test),
134-
resourceGenerators in ScoverageITest <<= (resourceGenerators in Test),
135-
unmanagedResources in ScoverageITest <<= (unmanagedResources in Test),
136-
javacOptions in ScoverageITest <<= (javacOptions in Test),
137-
javaOptions in ScoverageITest <<= (javaOptions in Test),
138-
fork in ScoverageITest <<= (fork in Test),
139-
testOptions in ScoverageITest <<= (testOptions in Test),
133+
sources in ScoverageITest <<= (sources in Test),
134+
sourceDirectory in ScoverageITest <<= (sourceDirectory in IntegrationTest),
135+
resourceDirectory in ScoverageITest <<= (resourceDirectory in IntegrationTest),
136+
resourceGenerators in ScoverageITest <<= (resourceGenerators in IntegrationTest),
137+
unmanagedResources in ScoverageITest <<= (unmanagedResources in IntegrationTest),
138+
javaOptions in ScoverageITest <<= (javaOptions in IntegrationTest),
139+
javacOptions in ScoverageITest <<= (javacOptions in IntegrationTest),
140+
fork in ScoverageITest <<= (fork in IntegrationTest),
141+
testOptions in ScoverageITest <<= (testOptions in IntegrationTest),
140142

141143
externalDependencyClasspath in ScoverageCompile <<= Classpaths
142144
.concat(externalDependencyClasspath in ScoverageCompile, externalDependencyClasspath in Compile),
143145
externalDependencyClasspath in ScoverageTest <<= Classpaths
144146
.concat(externalDependencyClasspath in ScoverageTest, externalDependencyClasspath in Test),
145147
externalDependencyClasspath in ScoverageITest <<= Classpaths
146-
.concat(externalDependencyClasspath in ScoverageTest, externalDependencyClasspath in Test),
148+
.concat(externalDependencyClasspath in ScoverageTest, externalDependencyClasspath in IntegrationTest),
147149

148150
internalDependencyClasspath in ScoverageCompile <<= (internalDependencyClasspath in Compile),
149151
internalDependencyClasspath in ScoverageTest <<= (internalDependencyClasspath in Test, internalDependencyClasspath in ScoverageTest, classDirectory in Compile) map {
150152
(testDeps, scoverageDeps, oldClassDir) =>
151153
scoverageDeps ++ testDeps.filter(_.data != oldClassDir)
152154
},
153-
internalDependencyClasspath in ScoverageITest <<= (internalDependencyClasspath in Test, internalDependencyClasspath in ScoverageITest, classDirectory in Compile) map {
155+
internalDependencyClasspath in ScoverageITest <<= (internalDependencyClasspath in IntegrationTest, internalDependencyClasspath in ScoverageITest, classDirectory in Compile) map {
154156
(testDeps, scoverageDeps, oldClassDir) =>
155157
scoverageDeps ++ testDeps.filter(_.data != oldClassDir)
156158
},

0 commit comments

Comments
 (0)