Merge pull request #552 from rolandtritsch/main

rolandtritsch · web-flow · commit 942d544e0ca5 · 2024-08-21T17:40:49.000+01:00
Make scripted tests more comprehensive
diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt
@@ -12,6 +12,6 @@ lazy val c = project.disablePlugins(ScoverageSbtPlugin)
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt
@@ -35,6 +35,6 @@ lazy val root = (project in file("."))
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt
@@ -35,6 +35,6 @@ lazy val root = (project in file("."))
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt
@@ -10,6 +10,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt
@@ -4,10 +4,10 @@ scalaVersion := "2.13.13"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedFiles := ".*/two/GoodCoverage"
+coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/coverage-excluded-files/test b/src/sbt-test/scoverage/coverage-excluded-files/test
@@ -4,4 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded files
+$ exists target/scala-2.13/scoverage-report/GoodCoverage.scala.html
 -$ exists target/scala-2.13/scoverage-report/two
+-$ exists target/scala-2.13/scoverage-report/three
diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt
@@ -4,10 +4,10 @@ scalaVersion := "2.13.13"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedPackages := "two\\..*"
+coverageExcludedPackages := "two\\..*;three\\..*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/test b/src/sbt-test/scoverage/coverage-excluded-packages/test
@@ -4,4 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded package
+$ exists target/scala-2.13/scoverage-report/GoodCoverage.scala.html
 -$ exists target/scala-2.13/scoverage-report/two
+-$ exists target/scala-2.13/scoverage-report/three
diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt
@@ -15,6 +15,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/data-dir/build.sbt b/src/sbt-test/scoverage/data-dir/build.sbt
@@ -12,6 +12,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt
@@ -15,6 +15,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt
@@ -34,7 +34,7 @@ checkScoverageEnabled := {
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
 
diff --git a/src/sbt-test/scoverage/scala3-bad/build.sbt b/src/sbt-test/scoverage/scala3-bad/build.sbt
@@ -12,6 +12,6 @@ coverageEnabled := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt
@@ -4,10 +4,10 @@ scalaVersion := "3.4.2"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedFiles := ".*/two/GoodCoverage;.*/three/GoodCoverage"
+coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test
@@ -4,4 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded files
--$ exists target/scala-3.4.2/scoverage-report/two
+$ exists target/scala-3.4.2/scoverage-report/GoodCoverage.scala.html
+-$ exists target/scala-3.4.2/scoverage-report/two
+-$ exists target/scala-3.4.2/scoverage-report/three
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt
@@ -8,6 +8,6 @@ coverageExcludedPackages := "two\\..*;three\\..*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test
@@ -4,4 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded package
+$ exists target/scala-3.4.2/scoverage-report/GoodCoverage.scala.html
 -$ exists target/scala-3.4.2/scoverage-report/two
+-$ exists target/scala-3.4.2/scoverage-report/three
diff --git a/src/sbt-test/scoverage/scala3-good/build.sbt b/src/sbt-test/scoverage/scala3-good/build.sbt
@@ -15,6 +15,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt
@@ -16,6 +16,6 @@ lazy val crossJVM = cross.jvm
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ lazy val c = project.disablePlugins(ScoverageSbtPlugin)`
`12`	`12`
`13`	`13`	`ThisBuild / resolvers ++= {`
`14`	`14`	`if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))`
`15`		`- Seq(Resolver.sonatypeRepo("snapshots"))`
	`15`	`+ Resolver.sonatypeOssRepos("snapshots")`
`16`	`16`	`else Seq.empty`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ lazy val root = (project in file("."))`
`35`	`35`
`36`	`36`	`ThisBuild / resolvers ++= {`
`37`	`37`	`if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))`
`38`		`- Seq(Resolver.sonatypeRepo("snapshots"))`
	`38`	`+ Resolver.sonatypeOssRepos("snapshots")`
`39`	`39`	`else Seq.empty`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ resolvers ++= {`
`14`	`14`	`.get("plugin.version")`
`15`	`15`	`.map(_.endsWith("-SNAPSHOT"))`
`16`	`16`	`.getOrElse(false)`
`17`		`- ) Seq(Resolver.sonatypeRepo("snapshots"))`
	`17`	`+ ) Resolver.sonatypeOssRepos("snapshots")`
`18`	`18`	`else Seq.empty`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ coverageFailOnMinimum := true`
`10`	`10`
`11`	`11`	`resolvers ++= {`
`12`	`12`	`if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))`
`13`		`- Seq(Resolver.sonatypeRepo("snapshots"))`
	`13`	`+ Resolver.sonatypeOssRepos("snapshots")`
`14`	`14`	`else Seq.empty`
`15`	`15`	`}`