Remove Suite.

Author: zainab-ali

modules/core/shared/src/main/scala/weaver/Runner.scala

@@ -19,7 +19,7 @@ class Runner[F[_]: Async](
   // Signaling option, because we need to detect completion
   private type Channel[A] = Queue[F, Option[A]]
 
-  def run(suites: fs2.Stream[F, Suite[F]]): F[Outcome] =
+  def run(suites: fs2.Stream[F, EffectSuite[F]]): F[Outcome] =
     for {
       buffer  <- Ref[F].of(Chain.empty[SpecEvent])
       channel <- Queue.unbounded[F, Option[SpecEvent]]

modules/core/shared/src/main/scala/weaver/suites.scala

@@ -14,31 +14,28 @@ import org.junit.runner.RunWith
 @EnableReflectiveInstantiation
 trait BaseSuiteClass {}
 
-trait Suite[F[_]] extends BaseSuiteClass {
-  def name: String
-  def spec(args: List[String]): Stream[F, TestOutcome]
-}
-
 // A version of EffectSuite that has a type member instead of a type parameter.
 protected[weaver] trait EffectSuiteAux {
   type EffectType[A]
   implicit protected def effect: Async[EffectType]
 }
 
-trait EffectSuite[F[_]] extends Suite[F] with EffectSuiteAux
+trait EffectSuite[F[_]] extends EffectSuiteAux
     with SourceLocation.Here { self =>
 
   final type EffectType[A] = F[A]
   implicit protected def effectCompat: EffectCompat[F]
   implicit final protected def effect: Async[F] = effectCompat.effect
 
-  override def name: String = self.getClass.getName.replace("$", "")
+  def name: String = self.getClass.getName.replace("$", "")
 
   protected def adaptRunError: PartialFunction[Throwable, Throwable] =
     PartialFunction.empty
 
   final def run(args: List[String])(report: TestOutcome => F[Unit]): F[Unit] =
     spec(args).evalMap(report).compile.drain.adaptErr(adaptRunError)
+
+  def spec(args: List[String]): Stream[F, TestOutcome]
 }
 
 @RunWith(classOf[weaver.junit.WeaverRunner])

modules/docs/shared/src/main/scala/main/scala/weaver/Output.scala

@@ -17,7 +17,7 @@ object Output {
     if (s.endsWith("\n")) s.substring(0, s.length - 2) else s
   }
 
-  def runSuites(s: Suite[IO]*): String = {
+  def runSuites(s: EffectSuite[IO]*): String = {
     import cats.effect.unsafe.implicits.global
     val header = "<div class='terminal'><pre>"
     val footer = "</pre></div>"