Skip to content

Commit 7f9901c

Browse files
authored
Merge pull request #188 from BennyHill/topic/testing
Update preserve-set to use crossScalaVersions
2 parents 541bed3 + 985ef46 commit 7f9901c

File tree

2 files changed

+35
-9
lines changed

2 files changed

+35
-9
lines changed

src/sbt-test/scoverage/preserve-set/build.sbt

+19-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import sbt.complete.DefaultParsers._
22

33
version := "0.1"
44

5-
scalaVersion := "2.10.4"
5+
scalaVersion := "2.11.8"
6+
7+
crossScalaVersions := Seq("2.10.6", "2.11.8")
68

79
libraryDependencies += "org.specs2" %% "specs2" % "2.3.13" % "test"
810

@@ -13,7 +15,23 @@ checkScalaVersion := {
1315
()
1416
}
1517

18+
val checkScoverageEnabled = inputKey[Unit]("Input task to compare the value of coverageEnabled setting with a given input.")
19+
checkScoverageEnabled := {
20+
val arg: String = (Space ~> StringBasic).parsed
21+
if (coverageEnabled.value.toString != arg) error(s"coverageEnabled [${coverageEnabled.value}] not equal to expected [$arg]")
22+
()
23+
}
24+
25+
1626
resolvers ++= {
1727
if (sys.props.get("plugin.version").map(_.endsWith("-SNAPSHOT")).getOrElse(false)) Seq(Resolver.sonatypeRepo("snapshots"))
1828
else Seq.empty
1929
}
30+
31+
// We force coverage to be always disabled for 2.10. This is not an uncommon real world scenario
32+
coverageEnabled := {
33+
CrossVersion.partialVersion(scalaVersion.value) match {
34+
case Some((2, 10)) => false
35+
case _ => coverageEnabled.value
36+
}
37+
}
+16-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
# check scalaVersion setting
2-
> checkScalaVersion "2.10.4"
3-
# override scalaVersion setting
4-
> set scalaVersion := {"2.10.5"}
5-
> checkScalaVersion "2.10.5"
6-
# activate coverage - override should still be present
2+
> checkScalaVersion "2.11.8"
3+
> checkScoverageEnabled "false"
74
> coverage
8-
> checkScalaVersion "2.10.5"
9-
# turn off coverage - override should still be present
5+
> checkScoverageEnabled "true"
106
> coverageOff
11-
> checkScalaVersion "2.10.5"
7+
> checkScalaVersion "2.11.8"
8+
> checkScoverageEnabled "false"
9+
# changs scala version
10+
> ++2.10.6
11+
> checkScalaVersion "2.10.6"
12+
> checkScoverageEnabled "false"
13+
> coverage
14+
> checkScalaVersion "2.10.6"
15+
# We want coverage to be false, as we set it in the build.sbt
16+
> checkScoverageEnabled "false"
17+
> coverageOff
18+
> checkScalaVersion "2.10.6"
19+
> checkScoverageEnabled "false"

0 commit comments

Comments
 (0)