Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package com.avast.sst.http4s.client

import cats.effect._
import org.http4s.headers.{`User-Agent`, AgentComment, AgentProduct}
import org.scalatest.AsyncFunSuite

import scala.concurrent.ExecutionContext
import org.scalatest.funsuite.AsyncFunSuite

class Http4SBlazeClientTest extends AsyncFunSuite {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import cats.effect.{ContextShift, IO, Timer}
import com.avast.sst.http4s.client.{Http4sBlazeClientConfig, Http4sBlazeClientModule}
import org.http4s.HttpRoutes
import org.http4s.dsl.Http4sDsl
import org.scalatest.AsyncFunSuite

import scala.concurrent.ExecutionContext
import org.scalatest.funsuite.AsyncFunSuite

class Http4sBlazeServerModuleTest extends AsyncFunSuite with Http4sDsl[IO] {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package com.avast.sst.http4s.server.micrometer

import io.micrometer.core.instrument.simple.SimpleMeterRegistry
import org.http4s.Status
import org.scalatest.FunSuite
import org.scalatest.funsuite.AnyFunSuite

class HttpStatusMetricsTest extends FunSuite {
class HttpStatusMetricsTest extends AnyFunSuite {

test("HTTP status monitoring") {
val simpleMeterRegistry = new SimpleMeterRegistry()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import java.util.concurrent.TimeUnit
import cats.effect.SyncIO
import io.micrometer.core.instrument.simple.SimpleMeterRegistry
import org.http4s.{Method, Status}
import org.scalatest.FunSuite
import org.scalatest.funsuite.AnyFunSuite

class MicrometerHttp4sMetricsOpsModuleTest extends FunSuite {
class MicrometerHttp4sMetricsOpsModuleTest extends AnyFunSuite {

test("http4s MetricsOps for Micrometer") {
val registry = new SimpleMeterRegistry()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import java.util.concurrent.TimeUnit
import cats.effect.{Clock, SyncIO}
import io.micrometer.core.instrument.simple.SimpleMeterRegistry
import org.http4s.Response
import org.scalatest.FunSuite
import org.scalatest.funsuite.AnyFunSuite

class RouteMetricsTest extends FunSuite {
class RouteMetricsTest extends AnyFunSuite {

test("Single route metrics") {
val registry = new SimpleMeterRegistry()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import org.http4s.dsl.Http4sDsl
import org.http4s.server.blaze.BlazeServerBuilder
import org.http4s.util.CaseInsensitiveString
import org.http4s.{Header, HttpRoutes, Request, Uri}
import org.scalatest.AsyncFunSuite

import scala.concurrent.ExecutionContext
import org.scalatest.funsuite.AsyncFunSuite

class CorrelationIdMiddlewareTest extends AsyncFunSuite with Http4sDsl[IO] {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.avast.sst.jvm.execution

import cats.effect.SyncIO
import org.scalatest.FunSuite
import org.scalatest.funsuite.AnyFunSuite

class ExecutorModuleTest extends FunSuite {
class ExecutorModuleTest extends AnyFunSuite {

test("ExecutorModule initializes properly and blocking executor differs from callback executor") {
val executorModule = ExecutorModule.makeDefault[SyncIO].use(m => SyncIO.pure(m)).unsafeRunSync()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package com.avast.sst.jvm.system.console
import java.io.{ByteArrayInputStream, ByteArrayOutputStream}

import cats.effect.SyncIO
import org.scalatest.FunSuite

import scala.{Console => SConsole}
import org.scalatest.funsuite.AnyFunSuite

class ConsoleModuleTest extends FunSuite {
class ConsoleModuleTest extends AnyFunSuite {

test("Console input") {
SConsole.withIn(new ByteArrayInputStream("test input\n".getBytes("UTF-8"))) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.avast.sst.jvm.system.random

import cats.effect.SyncIO
import org.scalatest.FunSuite
import org.scalatest.funsuite.AnyFunSuite

class RandomModuleTest extends FunSuite {
class RandomModuleTest extends AnyFunSuite {

test("RandomModule initializes properly") {
val test = for {
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ object Dependencies {
val monixCatnap = "io.monix" %% "monix-catnap" % Versions.monix
val postgresql = "org.postgresql" % "postgresql" % "42.2.8"
val pureConfig = "com.github.pureconfig" %% "pureconfig" % "0.12.1"
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8"
val scalaTest = "org.scalatest" %% "scalatest" % "3.1.0"
val scalazzi = "com.github.vovapolu" %% "scaluzzi" % "0.1.3"
val silencer = "com.github.ghik" % "silencer-plugin" % Versions.silencer cross CrossVersion.full
val silencerLib = "com.github.ghik" % "silencer-lib" % Versions.silencer cross CrossVersion.full
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package com.avast.sst.pureconfig

import cats.data.NonEmptyList
import cats.effect.SyncIO
import org.scalatest.FunSuite
import pureconfig.error.ConfigReaderException
import pureconfig.generic.semiauto.deriveReader
import pureconfig.{ConfigReader, ConfigSource}
import org.scalatest.funsuite.AnyFunSuite

class PureConfigModuleTest extends FunSuite {
class PureConfigModuleTest extends AnyFunSuite {

private val source = ConfigSource.string("""|number = 123
|string = "test"""".stripMargin)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package com.avast.sst.ssl

import cats.effect.SyncIO
import com.typesafe.config.ConfigFactory
import org.scalatest.FunSuite
import org.scalatest.funsuite.AnyFunSuite

class SslContextModuleTest extends FunSuite {
class SslContextModuleTest extends AnyFunSuite {

test("SslContextModule initializes properly from JKS store") {
val sslContext = SslContextModule.make[SyncIO](ConfigFactory.load().getConfig("ssl-config")).unsafeRunSync()
Expand Down