Skip to content
Permalink
Browse files

Enough scalatest and scalatestplus to compile on 2.12

  • Loading branch information...
rossabaker committed May 26, 2019
1 parent 3a0b30c commit 7e5b334099455406687ea1ff8aab846573a0f29a
@@ -301,11 +301,11 @@ lazy val reactiveStreams = project
.in(file("reactive-streams"))
.enablePlugins(SbtOsgi)
.settings(commonSettings)
.settings(
libraryDependencies ++= Seq(
"org.reactivestreams" % "reactive-streams" % "1.0.2",
"org.reactivestreams" % "reactive-streams-tck" % "1.0.2" % "test"
))
.settings(libraryDependencies ++= Seq(
"org.reactivestreams" % "reactive-streams" % "1.0.2",
"org.reactivestreams" % "reactive-streams-tck" % "1.0.2" % "test",
"org.scalatestplus" %% "scalatestplus-testng" % "1.0.0-SNAP5" % "test"
))
.settings(mimaSettings)
.settings(
name := "fs2-reactive-streams",
@@ -8,15 +8,15 @@ import cats.effect._
import java.util.concurrent.atomic.AtomicBoolean
import scala.concurrent.ExecutionContext

import org.scalatest.FunSuite
import org.scalatest.funsuite.AnyFunSuite

/**
* This behaviour is already tested by the Reactive Stream test
* suite, but it's proven difficult to enforce, so we add our own
* tests that run the assertions multiple times to make possible
* failures due to race conditions more repeatable
*/
class CancellationSpec extends FunSuite {
class CancellationSpec extends AnyFunSuite {
implicit val ctx: ContextShift[IO] =
IO.contextShift(ExecutionContext.global)

@@ -4,9 +4,13 @@ package reactivestreams

import cats.effect._
import org.scalatest._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks

final class PublisherToSubscriberSpec extends FlatSpec with Matchers with ScalaCheckPropertyChecks {
final class PublisherToSubscriberSpec
extends AnyFlatSpec
with Matchers
with ScalaCheckPropertyChecks {

implicit val ctx: ContextShift[IO] =
IO.contextShift(scala.concurrent.ExecutionContext.Implicits.global)

0 comments on commit 7e5b334

Please sign in to comment.
You can’t perform that action at this time.