From f8a29b748bcf00ef93b6346b957294afafa4e1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 22 May 2023 05:28:04 +0200 Subject: [PATCH] Add weaver-cats as a default test framework (#7263) Add weaver-cats as a default test framework --- main/src/main/scala/sbt/Defaults.scala | 5 +---- sbt-app/src/sbt-test/tests/weaver-cats/build.sbt | 3 +++ .../tests/weaver-cats/src/test/scala/spec/Spec.scala | 10 ++++++++++ sbt-app/src/sbt-test/tests/weaver-cats/test | 1 + testing/src/main/scala/sbt/TestFramework.scala | 4 ++++ 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 sbt-app/src/sbt-test/tests/weaver-cats/build.sbt create mode 100644 sbt-app/src/sbt-test/tests/weaver-cats/src/test/scala/spec/Spec.scala create mode 100644 sbt-app/src/sbt-test/tests/weaver-cats/test diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index d64d1be8a..3011f79ba 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1221,10 +1221,7 @@ object Defaults extends BuildCommon { private[this] def testDefaults = Defaults.globalDefaults( Seq( - testFrameworks :== { - import sbt.TestFrameworks._ - Seq(ScalaCheck, Specs2, Specs, ScalaTest, JUnit, MUnit, ZIOTest) - }, + testFrameworks :== sbt.TestFrameworks.All, testListeners :== Nil, testOptions :== Nil, testResultLogger :== TestResultLogger.Default, diff --git a/sbt-app/src/sbt-test/tests/weaver-cats/build.sbt b/sbt-app/src/sbt-test/tests/weaver-cats/build.sbt new file mode 100644 index 000000000..27ab29d39 --- /dev/null +++ b/sbt-app/src/sbt-test/tests/weaver-cats/build.sbt @@ -0,0 +1,3 @@ +ThisBuild / scalaVersion := "2.13.10" + +libraryDependencies += "com.disneystreaming" %% "weaver-cats" % "0.8.3" % Test diff --git a/sbt-app/src/sbt-test/tests/weaver-cats/src/test/scala/spec/Spec.scala b/sbt-app/src/sbt-test/tests/weaver-cats/src/test/scala/spec/Spec.scala new file mode 100644 index 000000000..13153d720 --- /dev/null +++ b/sbt-app/src/sbt-test/tests/weaver-cats/src/test/scala/spec/Spec.scala @@ -0,0 +1,10 @@ +package spec + +import weaver._ + +object Spec extends FunSuite { + test("test") { + // expected to fail + assert(1 == 2) + } +} diff --git a/sbt-app/src/sbt-test/tests/weaver-cats/test b/sbt-app/src/sbt-test/tests/weaver-cats/test new file mode 100644 index 000000000..5a9f22365 --- /dev/null +++ b/sbt-app/src/sbt-test/tests/weaver-cats/test @@ -0,0 +1 @@ +-> test diff --git a/testing/src/main/scala/sbt/TestFramework.scala b/testing/src/main/scala/sbt/TestFramework.scala index bd20829ed..ab229487f 100644 --- a/testing/src/main/scala/sbt/TestFramework.scala +++ b/testing/src/main/scala/sbt/TestFramework.scala @@ -28,6 +28,10 @@ object TestFrameworks { val JUnit = TestFramework("com.novocode.junit.JUnitFramework") val MUnit = TestFramework("munit.Framework") val ZIOTest = TestFramework("zio.test.sbt.ZTestFramework") + val WeaverTestCats = TestFramework("weaver.framework.CatsEffect") + + val All: Seq[TestFramework] = + Seq(ScalaCheck, Specs2, Specs, ScalaTest, JUnit, MUnit, ZIOTest, WeaverTestCats) } final class TestFramework(val implClassNames: String*) extends Serializable {