Skip to content

Commit 8d1f233

Browse files
augiaugi
committed
chore(deps): newer mockito with JDK17+, requires many test dependencies update
1 parent 306e286 commit 8d1f233

File tree

13 files changed

+65
-59
lines changed

13 files changed

+65
-59
lines changed

‎build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ allprojects {
3737
pureconfigVersion = "0.17.9"
3838
scalapbVersion = "0.11.18"
3939
scalapbJson4sVersion = "0.11.1"
40-
typesafeConfigVersion = "1.4.3"
40+
typesafeConfigVersion = "1.4.5"
4141
monixVersion = "3.4.0" // just for tests!
4242
}
4343

@@ -162,26 +162,27 @@ subprojects {
162162

163163
testImplementation "io.monix:monix_$scalaVersion:$monixVersion"
164164

165-
testImplementation "com.avast.metrics:metrics-jmx:${metricsVersion}"
165+
testImplementation "com.avast.metrics:metrics-jmx:$metricsVersion"
166166

167167
testImplementation "org.scalaj:scalaj-http_$scalaVersion:2.4.2"
168168
testImplementation "io.circe:circe-core_$scalaVersion:$circeVersion"
169169
testImplementation "io.circe:circe-generic_$scalaVersion:$circeVersion"
170170
testImplementation "io.circe:circe-parser_$scalaVersion:$circeVersion"
171171

172172
testImplementation 'junit:junit:4.13.2'
173-
testImplementation "org.scalatest:scalatest_$scalaVersion:3.0.8"
174-
testImplementation 'org.mockito:mockito-all:1.10.19'
173+
testImplementation "org.scalatest:scalatest_$scalaVersion:3.3.0-SNAP4"
174+
testImplementation "org.scalatestplus:junit-4-12_$scalaVersion:3.1.3.0"
175+
testImplementation "org.scalatestplus:mockito-5-18_$scalaVersion:3.2.19.0"
175176
testImplementation "com.typesafe.scala-logging:scala-logging_$scalaVersion:3.9.4"
176-
testImplementation 'ch.qos.logback:logback-classic:1.5.18'
177+
testImplementation 'ch.qos.logback:logback-classic:1.5.19'
177178

178179
testImplementation 'org.pegdown:pegdown:1.6.0'
179180
}
180181

181182
tasks.withType(ScalaCompile) {
182183
List plugins = configurations.scalaCompilerPlugin.files.collect { "-Xplugin:${it.getAbsolutePath()}".toString() }
183184
if (scalaVersion.startsWith("2.12")) {
184-
logger.info("Using -Ypartial-unification for Scala ${scalaVersion}")
185+
logger.info("Using -Ypartial-unification for Scala $scalaVersion")
185186
plugins.add("-Ypartial-unification")
186187
}
187188
scalaCompileOptions.additionalParameters = plugins

‎core/src/test/scala/com/avast/clients/rabbitmq/DefaultRabbitMQConsumerTest.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.rabbitmq.client.impl.recovery.AutorecoveringChannel
1313
import monix.eval.Task
1414
import monix.execution.Scheduler.Implicits.global
1515
import org.mockito.Mockito._
16-
import org.mockito.{ArgumentCaptor, Matchers}
16+
import org.mockito.{ArgumentCaptor, ArgumentMatchers}
1717
import org.scalatest.time.{Seconds, Span}
1818
import org.slf4j.event.Level
1919

@@ -147,7 +147,7 @@ class DefaultRabbitMQConsumerTest extends TestBase {
147147
verify(channel, times(0)).basicReject(deliveryTag, true)
148148
verify(channel, times(0)).basicReject(deliveryTag, false)
149149
val propertiesCaptor = ArgumentCaptor.forClass(classOf[BasicProperties])
150-
verify(channel, times(1)).basicPublish(Matchers.eq(""), Matchers.eq("queueName"), propertiesCaptor.capture(), Matchers.eq(body))
150+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq(""), ArgumentMatchers.eq("queueName"), propertiesCaptor.capture(), ArgumentMatchers.eq(body))
151151
assertResult(Some(originalUserId))(propertiesCaptor.getValue.getHeaders.asScala.get(DefaultRabbitMQConsumer.RepublishOriginalUserId))
152152
}
153153
}
@@ -220,10 +220,10 @@ class DefaultRabbitMQConsumerTest extends TestBase {
220220
when(channel.isOpen).thenReturn(true)
221221

222222
val monitor = mock[Monitor[Task]]
223-
when(monitor.meter(Matchers.anyString())).thenReturn(Monitor.noOp[Task]().meter(""))
224-
when(monitor.named(Matchers.eq("results"))).thenReturn(Monitor.noOp[Task]())
223+
when(monitor.meter(ArgumentMatchers.anyString())).thenReturn(Monitor.noOp[Task]().meter(""))
224+
when(monitor.named(ArgumentMatchers.eq("results"))).thenReturn(Monitor.noOp[Task]())
225225
val tasksMonitor = mock[Monitor[Task]]
226-
when(monitor.named(Matchers.eq("tasks"))).thenReturn(tasksMonitor)
226+
when(monitor.named(ArgumentMatchers.eq("tasks"))).thenReturn(tasksMonitor)
227227
when(tasksMonitor.gauge).thenReturn(new GaugeFactory[Task] {
228228
override def settableLong(n: String, replaceExisting: Boolean): SettableGauge[Task, Long] = new SettableGauge[Task, Long] {
229229
override def set(value: Long): Task[Unit] = fail("Should have not be called")
@@ -240,7 +240,7 @@ class DefaultRabbitMQConsumerTest extends TestBase {
240240
var successLengths = Seq.newBuilder[Long] // scalastyle:ignore
241241
var failuresLengths = Seq.newBuilder[Long] // scalastyle:ignore
242242

243-
when(tasksMonitor.timerPair(Matchers.eq("processed"))).thenReturn(new TimerPair[Task] {
243+
when(tasksMonitor.timerPair(ArgumentMatchers.eq("processed"))).thenReturn(new TimerPair[Task] {
244244
override def update(duration: Duration): Task[Unit] = Task.delay(successLengths += duration.toMillis)
245245
override def updateFailure(duration: Duration): Task[Unit] = Task.delay(failuresLengths += duration.toMillis)
246246

@@ -302,10 +302,10 @@ class DefaultRabbitMQConsumerTest extends TestBase {
302302
when(channel.isOpen).thenReturn(true)
303303

304304
val monitor = mock[Monitor[Task]]
305-
when(monitor.meter(Matchers.anyString())).thenReturn(Monitor.noOp[Task]().meter(""))
306-
when(monitor.named(Matchers.eq("results"))).thenReturn(Monitor.noOp[Task]())
305+
when(monitor.meter(ArgumentMatchers.anyString())).thenReturn(Monitor.noOp[Task]().meter(""))
306+
when(monitor.named(ArgumentMatchers.eq("results"))).thenReturn(Monitor.noOp[Task]())
307307
val tasksMonitor = mock[Monitor[Task]]
308-
when(monitor.named(Matchers.eq("tasks"))).thenReturn(tasksMonitor)
308+
when(monitor.named(ArgumentMatchers.eq("tasks"))).thenReturn(tasksMonitor)
309309
when(tasksMonitor.gauge).thenReturn(new GaugeFactory[Task] {
310310
override def settableLong(n: String, replaceExisting: Boolean): SettableGauge[Task, Long] = new SettableGauge[Task, Long] {
311311
override def set(value: Long): Task[Unit] = fail("Should have not be called")
@@ -322,7 +322,7 @@ class DefaultRabbitMQConsumerTest extends TestBase {
322322
var successLengths = Seq.newBuilder[Long] // scalastyle:ignore
323323
var failuresLengths = Seq.newBuilder[Long] // scalastyle:ignore
324324

325-
when(tasksMonitor.timerPair(Matchers.eq("processed"))).thenReturn(new TimerPair[Task] {
325+
when(tasksMonitor.timerPair(ArgumentMatchers.eq("processed"))).thenReturn(new TimerPair[Task] {
326326
override def update(duration: Duration): Task[Unit] = Task.delay(successLengths += duration.toMillis)
327327
override def updateFailure(duration: Duration): Task[Unit] = Task.delay(failuresLengths += duration.toMillis)
328328

‎core/src/test/scala/com/avast/clients/rabbitmq/DefaultRabbitMQProducerTest.scala‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.rabbitmq.client.impl.recovery.AutorecoveringChannel
1111
import monix.eval.Task
1212
import monix.execution.Scheduler.Implicits.global
1313
import org.mockito.Mockito._
14-
import org.mockito.{ArgumentCaptor, Matchers}
14+
import org.mockito.{ArgumentCaptor, ArgumentMatchers}
1515

1616
import scala.util.Random
1717

@@ -48,10 +48,10 @@ class DefaultRabbitMQProducerTest extends TestBase {
4848

4949
val captor = ArgumentCaptor.forClass(classOf[AMQP.BasicProperties])
5050

51-
verify(channel, times(1)).basicPublish(Matchers.eq(exchangeName),
52-
Matchers.eq(routingKey),
51+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq(exchangeName),
52+
ArgumentMatchers.eq(routingKey),
5353
captor.capture(),
54-
Matchers.eq(body.toByteArray))
54+
ArgumentMatchers.eq(body.toByteArray))
5555

5656
val caughtProperties = captor.getValue
5757

@@ -95,10 +95,10 @@ class DefaultRabbitMQProducerTest extends TestBase {
9595

9696
val captor = ArgumentCaptor.forClass(classOf[AMQP.BasicProperties])
9797

98-
verify(channel, times(1)).basicPublish(Matchers.eq(exchangeName),
99-
Matchers.eq(routingKey),
98+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq(exchangeName),
99+
ArgumentMatchers.eq(routingKey),
100100
captor.capture(),
101-
Matchers.eq(body.toByteArray))
101+
ArgumentMatchers.eq(body.toByteArray))
102102

103103
// check that the one from properties was used
104104
assertResult(cid)(captor.getValue.getCorrelationId)
@@ -134,10 +134,10 @@ class DefaultRabbitMQProducerTest extends TestBase {
134134

135135
val captor = ArgumentCaptor.forClass(classOf[AMQP.BasicProperties])
136136

137-
verify(channel, times(1)).basicPublish(Matchers.eq(exchangeName),
138-
Matchers.eq(routingKey),
137+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq(exchangeName),
138+
ArgumentMatchers.eq(routingKey),
139139
captor.capture(),
140-
Matchers.eq(body.toByteArray))
140+
ArgumentMatchers.eq(body.toByteArray))
141141

142142
// check that the one from headers was used
143143
assertResult(cid)(captor.getValue.getCorrelationId)
@@ -167,10 +167,10 @@ class DefaultRabbitMQProducerTest extends TestBase {
167167

168168
val captor = ArgumentCaptor.forClass(classOf[AMQP.BasicProperties])
169169

170-
verify(channel, times(1)).basicPublish(Matchers.eq(exchangeName),
171-
Matchers.eq(routingKey),
170+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq(exchangeName),
171+
ArgumentMatchers.eq(routingKey),
172172
captor.capture(),
173-
Matchers.eq(body.toByteArray))
173+
ArgumentMatchers.eq(body.toByteArray))
174174

175175
// check that some CID was generated
176176
assert(captor.getValue.getCorrelationId != null)

‎core/src/test/scala/com/avast/clients/rabbitmq/DefaultRabbitMQPullConsumerTest.scala‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.rabbitmq.client.{Envelope, GetResponse}
1111
import monix.eval.Task
1212
import monix.execution.Scheduler.Implicits.global
1313
import org.mockito.Mockito._
14-
import org.mockito.{ArgumentCaptor, Matchers}
14+
import org.mockito.{ArgumentCaptor, ArgumentMatchers}
1515
import org.scalatest.time.{Seconds, Span}
1616

1717
import java.util.UUID
@@ -39,7 +39,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
3939

4040
val body = Random.nextString(5).getBytes
4141

42-
when(channel.basicGet(Matchers.eq("queueName"), Matchers.eq(false))).thenReturn(
42+
when(channel.basicGet(ArgumentMatchers.eq("queueName"), ArgumentMatchers.eq(false))).thenReturn(
4343
new GetResponse(envelope, properties, body, 1)
4444
)
4545

@@ -74,7 +74,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
7474

7575
val body = Random.nextString(5).getBytes
7676

77-
when(channel.basicGet(Matchers.eq("queueName"), Matchers.eq(false))).thenReturn(
77+
when(channel.basicGet(ArgumentMatchers.eq("queueName"), ArgumentMatchers.eq(false))).thenReturn(
7878
new GetResponse(envelope, properties, body, 1)
7979
)
8080

@@ -109,7 +109,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
109109

110110
val body = Random.nextString(5).getBytes
111111

112-
when(channel.basicGet(Matchers.eq("queueName"), Matchers.eq(false))).thenReturn(
112+
when(channel.basicGet(ArgumentMatchers.eq("queueName"), ArgumentMatchers.eq(false))).thenReturn(
113113
new GetResponse(envelope, properties, body, 1)
114114
)
115115

@@ -145,7 +145,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
145145

146146
val body = Random.nextString(5).getBytes
147147

148-
when(channel.basicGet(Matchers.eq("queueName"), Matchers.eq(false))).thenReturn(
148+
when(channel.basicGet(ArgumentMatchers.eq("queueName"), ArgumentMatchers.eq(false))).thenReturn(
149149
new GetResponse(envelope, properties, body, 1)
150150
)
151151

@@ -162,7 +162,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
162162
verify(channel, times(0)).basicReject(deliveryTag, true)
163163
verify(channel, times(0)).basicReject(deliveryTag, false)
164164
val propertiesCaptor = ArgumentCaptor.forClass(classOf[BasicProperties])
165-
verify(channel, times(1)).basicPublish(Matchers.eq(""), Matchers.eq("queueName"), propertiesCaptor.capture(), Matchers.eq(body))
165+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq(""), ArgumentMatchers.eq("queueName"), propertiesCaptor.capture(), ArgumentMatchers.eq(body))
166166
assertResult(Some(originalUserId))(propertiesCaptor.getValue.getHeaders.asScala.get(DefaultRabbitMQConsumer.RepublishOriginalUserId))
167167
}
168168
}
@@ -182,7 +182,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
182182

183183
val body = Random.nextString(5).getBytes
184184

185-
when(channel.basicGet(Matchers.eq("queueName"), Matchers.eq(false))).thenReturn(
185+
when(channel.basicGet(ArgumentMatchers.eq("queueName"), ArgumentMatchers.eq(false))).thenReturn(
186186
new GetResponse(envelope, properties, body, 1)
187187
)
188188

@@ -220,7 +220,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
220220

221221
val body = Random.nextString(5).getBytes
222222

223-
when(channel.basicGet(Matchers.eq("queueName"), Matchers.eq(false))).thenReturn(
223+
when(channel.basicGet(ArgumentMatchers.eq("queueName"), ArgumentMatchers.eq(false))).thenReturn(
224224
new GetResponse(envelope, properties, body, 1)
225225
)
226226

@@ -251,7 +251,7 @@ class DefaultRabbitMQPullConsumerTest extends TestBase {
251251

252252
val body = Random.nextString(5).getBytes
253253

254-
when(channel.basicGet(Matchers.eq("queueName"), Matchers.eq(false))).thenReturn(
254+
when(channel.basicGet(ArgumentMatchers.eq("queueName"), ArgumentMatchers.eq(false))).thenReturn(
255255
new GetResponse(envelope, properties, body, 1)
256256
)
257257

‎core/src/test/scala/com/avast/clients/rabbitmq/PublisherConfirmsRabbitMQProducerTest.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import com.rabbitmq.client.impl.recovery.AutorecoveringChannel
99
import monix.eval.Task
1010
import monix.execution.Scheduler.Implicits.global
1111
import monix.execution.atomic.AtomicInt
12-
import org.mockito.Matchers
13-
import org.mockito.Matchers.any
12+
import org.mockito.ArgumentMatchers
13+
import org.mockito.ArgumentMatchers.any
1414
import org.mockito.Mockito.{times, verify, when}
1515

1616
import scala.concurrent.Await
@@ -56,7 +56,7 @@ class PublisherConfirmsRabbitMQProducerTest extends TestBase {
5656
Await.result(publishFuture, 10.seconds)
5757

5858
verify(channel, times(2))
59-
.basicPublish(Matchers.eq(exchangeName), Matchers.eq(routingKey), any(), Matchers.eq(body.toByteArray))
59+
.basicPublish(ArgumentMatchers.eq(exchangeName), ArgumentMatchers.eq(routingKey), any(), ArgumentMatchers.eq(body.toByteArray))
6060
}
6161

6262
test("Message not acked returned if number of attempts exhausted") {
@@ -97,7 +97,7 @@ class PublisherConfirmsRabbitMQProducerTest extends TestBase {
9797
Await.result(publishTask, 1.seconds)
9898
}
9999

100-
verify(channel).basicPublish(Matchers.eq(exchangeName), Matchers.eq(routingKey), any(), Matchers.eq(body.toByteArray))
100+
verify(channel).basicPublish(ArgumentMatchers.eq(exchangeName), ArgumentMatchers.eq(routingKey), any(), ArgumentMatchers.eq(body.toByteArray))
101101
}
102102

103103
test("Multiple messages are fully acked one by one") {
@@ -141,7 +141,7 @@ class PublisherConfirmsRabbitMQProducerTest extends TestBase {
141141

142142
assertResult(seqNumbers.length)(nextSeqNumber.get())
143143
verify(channel, times(seqNumbers.length))
144-
.basicPublish(Matchers.eq(exchangeName), Matchers.eq(routingKey), any(), Matchers.eq(body.toByteArray))
144+
.basicPublish(ArgumentMatchers.eq(exchangeName), ArgumentMatchers.eq(routingKey), any(), ArgumentMatchers.eq(body.toByteArray))
145145
}
146146

147147
test("Multiple messages are fully acked at once") {
@@ -184,6 +184,6 @@ class PublisherConfirmsRabbitMQProducerTest extends TestBase {
184184

185185
assertResult(seqNumbers.length)(nextSeqNumber.get())
186186
verify(channel, times(seqNumbers.length))
187-
.basicPublish(Matchers.eq(exchangeName), Matchers.eq(routingKey), any(), Matchers.eq(body.toByteArray))
187+
.basicPublish(ArgumentMatchers.eq(exchangeName), ArgumentMatchers.eq(routingKey), any(), ArgumentMatchers.eq(body.toByteArray))
188188
}
189189
}

‎core/src/test/scala/com/avast/clients/rabbitmq/RepublishStrategyTest.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.rabbitmq.client.impl.recovery.AutorecoveringChannel
1212
import monix.eval.Task
1313
import monix.execution.Scheduler.Implicits.global
1414
import org.mockito.Mockito._
15-
import org.mockito.{ArgumentCaptor, Matchers}
15+
import org.mockito.{ArgumentCaptor, ArgumentMatchers}
1616
import org.scalatest.time.{Seconds, Span}
1717
import org.slf4j.event.Level
1818

@@ -56,7 +56,7 @@ class RepublishStrategyTest extends TestBase {
5656
verify(channel, times(0)).basicReject(deliveryTag, false)
5757

5858
val propertiesCaptor = ArgumentCaptor.forClass(classOf[BasicProperties])
59-
verify(channel, times(1)).basicPublish(Matchers.eq(""), Matchers.eq("queueName"), propertiesCaptor.capture(), Matchers.eq(body))
59+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq(""), ArgumentMatchers.eq("queueName"), propertiesCaptor.capture(), ArgumentMatchers.eq(body))
6060
assertResult(Some(originalUserId))(propertiesCaptor.getValue.getHeaders.asScala.get(DefaultRabbitMQConsumer.RepublishOriginalUserId))
6161
}
6262
}
@@ -90,10 +90,10 @@ class RepublishStrategyTest extends TestBase {
9090
verify(channel, times(0)).basicReject(deliveryTag, false)
9191

9292
val propertiesCaptor = ArgumentCaptor.forClass(classOf[BasicProperties])
93-
verify(channel, times(1)).basicPublish(Matchers.eq("myCustomExchange"),
94-
Matchers.eq("queueName"),
93+
verify(channel, times(1)).basicPublish(ArgumentMatchers.eq("myCustomExchange"),
94+
ArgumentMatchers.eq("queueName"),
9595
propertiesCaptor.capture(),
96-
Matchers.eq(body))
96+
ArgumentMatchers.eq(body))
9797
assertResult(Some(originalUserId))(propertiesCaptor.getValue.getHeaders.asScala.get(DefaultRabbitMQConsumer.RepublishOriginalUserId))
9898
}
9999
}

‎core/src/test/scala/com/avast/clients/rabbitmq/TestBase.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import monix.execution.Scheduler
77
import monix.execution.Scheduler.Implicits.global
88
import monix.execution.schedulers.CanBlock
99
import org.junit.runner.RunWith
10-
import org.scalatest.FunSuite
10+
import org.scalatest.funsuite.AnyFunSuite
1111
import org.scalatest.concurrent.Eventually
1212
import org.scalatestplus.junit.JUnitRunner
1313
import org.scalatestplus.mockito.MockitoSugar
@@ -18,7 +18,7 @@ import scala.concurrent.{ExecutionContext, TimeoutException}
1818
import scala.language.implicitConversions
1919

2020
@RunWith(classOf[JUnitRunner])
21-
class TestBase extends FunSuite with MockitoSugar with Eventually with StrictLogging {
21+
class TestBase extends AnyFunSuite with MockitoSugar with Eventually with StrictLogging {
2222
protected implicit def taskToOps[A](t: Task[A]): TaskOps[A] = new TaskOps[A](t)
2323
protected implicit def IOToOps[A](t: IO[A]): IOOps[A] = new IOOps[A](t)
2424
protected implicit def resourceToIOOps[A](t: Resource[IO, A]): ResourceIOOps[A] = new ResourceIOOps[A](t)

‎extras-protobuf/src/test/scala/com/avast/clients/rabbitmq/extras/format/ProtobufConsumerTest.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import com.google.protobuf.util.JsonFormat
77
import monix.eval.Task
88
import monix.execution.Scheduler.Implicits.global
99
import org.junit.runner.RunWith
10-
import org.scalatest.{FlatSpec, Matchers}
10+
import org.scalatest.flatspec.FlatSpec
11+
import org.scalatest.matchers.should.Matchers
1112
import org.scalatestplus.junit.JUnitRunner
1213

1314
@RunWith(classOf[JUnitRunner])

‎extras-protobuf/src/test/scala/com/avast/clients/rabbitmq/extras/format/ProtobufConvertersTest.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import com.avast.bytes.Bytes
44
import com.avast.clients.rabbitmq.test.ExampleEvents
55
import com.google.protobuf.util.JsonFormat
66
import org.junit.runner.RunWith
7-
import org.scalatest.{FlatSpec, Matchers}
7+
import org.scalatest.flatspec.FlatSpec
8+
import org.scalatest.matchers.should.Matchers
89
import org.scalatestplus.junit.JUnitRunner
910

1011
@RunWith(classOf[JUnitRunner])

‎extras-scalapb/src/test/scala/com/avast/clients/rabbitmq/extras/format/ScalaPBConsumerTest.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import com.avast.clients.rabbitmq.test.FileSource
66
import monix.eval.Task
77
import monix.execution.Scheduler.Implicits.global
88
import org.junit.runner.RunWith
9-
import org.scalatest.{FlatSpec, Matchers}
9+
import org.scalatest.flatspec.FlatSpec
10+
import org.scalatest.matchers.should.Matchers
1011
import org.scalatestplus.junit.JUnitRunner
1112
import scalapb.json4s.Printer
1213

0 commit comments

Comments
 (0)