From e7a847615a30692a032438ff880e1ecf0dfcc88e Mon Sep 17 00:00:00 2001
From: Nabil Abdel-Hafeez <7283535+987Nabil@users.noreply.github.com>
Date: Sun, 16 Oct 2022 22:42:53 +0200
Subject: [PATCH] Add zio-test TestFramework to default test frameworks

---
 main/src/main/scala/sbt/Defaults.scala                |  2 +-
 sbt-app/src/sbt-test/tests/zio-test/build.sbt         |  4 ++++
 .../tests/zio-test/src/test/scala/spec/Spec.scala     | 11 +++++++++++
 sbt-app/src/sbt-test/tests/zio-test/test              |  1 +
 testing/src/main/scala/sbt/TestFramework.scala        |  1 +
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 sbt-app/src/sbt-test/tests/zio-test/build.sbt
 create mode 100644 sbt-app/src/sbt-test/tests/zio-test/src/test/scala/spec/Spec.scala
 create mode 100644 sbt-app/src/sbt-test/tests/zio-test/test

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index c199329f4..81aa5e509 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -1217,7 +1217,7 @@ object Defaults extends BuildCommon {
       Seq(
         testFrameworks :== {
           import sbt.TestFrameworks._
-          Seq(ScalaCheck, Specs2, Specs, ScalaTest, JUnit, MUnit)
+          Seq(ScalaCheck, Specs2, Specs, ScalaTest, JUnit, MUnit, ZIOTest)
         },
         testListeners :== Nil,
         testOptions :== Nil,
diff --git a/sbt-app/src/sbt-test/tests/zio-test/build.sbt b/sbt-app/src/sbt-test/tests/zio-test/build.sbt
new file mode 100644
index 000000000..a2ddfa655
--- /dev/null
+++ b/sbt-app/src/sbt-test/tests/zio-test/build.sbt
@@ -0,0 +1,4 @@
+ThisBuild / scalaVersion := "2.13.10"
+
+libraryDependencies += "dev.zio" %% "zio-test" % "2.0.2" % Test
+libraryDependencies += "dev.zio" %% "zio-test-sbt" % "2.0.2" % Test
diff --git a/sbt-app/src/sbt-test/tests/zio-test/src/test/scala/spec/Spec.scala b/sbt-app/src/sbt-test/tests/zio-test/src/test/scala/spec/Spec.scala
new file mode 100644
index 000000000..f95610899
--- /dev/null
+++ b/sbt-app/src/sbt-test/tests/zio-test/src/test/scala/spec/Spec.scala
@@ -0,0 +1,11 @@
+package spec
+
+import zio.test._
+
+object Spec extends ZIOSpecDefault {
+  def spec = suite("Spec")(
+    test("test") {
+      assertTrue(1 == 1)
+    }
+  )
+}
\ No newline at end of file
diff --git a/sbt-app/src/sbt-test/tests/zio-test/test b/sbt-app/src/sbt-test/tests/zio-test/test
new file mode 100644
index 000000000..a270b7b48
--- /dev/null
+++ b/sbt-app/src/sbt-test/tests/zio-test/test
@@ -0,0 +1 @@
+> test
\ No newline at end of file
diff --git a/testing/src/main/scala/sbt/TestFramework.scala b/testing/src/main/scala/sbt/TestFramework.scala
index cb89dd5f4..bd20829ed 100644
--- a/testing/src/main/scala/sbt/TestFramework.scala
+++ b/testing/src/main/scala/sbt/TestFramework.scala
@@ -27,6 +27,7 @@ object TestFrameworks {
     TestFramework("org.specs2.runner.Specs2Framework", "org.specs2.runner.SpecsFramework")
   val JUnit = TestFramework("com.novocode.junit.JUnitFramework")
   val MUnit = TestFramework("munit.Framework")
+  val ZIOTest = TestFramework("zio.test.sbt.ZTestFramework")
 }
 
 final class TestFramework(val implClassNames: String*) extends Serializable {