Skip to content

Commit

Permalink
adapt mock verification
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru committed Dec 23, 2021
1 parent 2735fa2 commit 083018e
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions tests/src/test/scala/akka/kafka/internal/ProducerSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import akka.stream.{ActorAttributes, Supervision}
import akka.testkit.TestKit
import akka.{Done, NotUsed}
import com.typesafe.config.ConfigFactory
import org.apache.kafka.clients.consumer.OffsetAndMetadata
import org.apache.kafka.clients.consumer.{ConsumerGroupMetadata, OffsetAndMetadata}
import org.apache.kafka.clients.producer._
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.serialization.StringSerializer
Expand Down Expand Up @@ -642,20 +642,18 @@ class ProducerMock[K, V](handler: ProducerMock.Handler[K, V])(implicit ec: Execu
inOrder.verify(mock).beginTransaction()
}

@nowarn("cat=deprecation")
def verifyTxCommit(po: ConsumerMessage.PartitionOffset) = {
val inOrder = Mockito.inOrder(mock)
val offsets = Map(new TopicPartition(po.key.topic, po.key.partition) -> new OffsetAndMetadata(po.offset + 1)).asJava
inOrder.verify(mock).sendOffsetsToTransaction(offsets, po.key.groupId)
inOrder.verify(mock).sendOffsetsToTransaction(offsets, new ConsumerGroupMetadata(po.key.groupId))
inOrder.verify(mock).commitTransaction()
inOrder.verify(mock).beginTransaction()
}

@nowarn("cat=deprecation")
def verifyTxCommitWhenShutdown(po: ConsumerMessage.PartitionOffset) = {
val inOrder = Mockito.inOrder(mock)
val offsets = Map(new TopicPartition(po.key.topic, po.key.partition) -> new OffsetAndMetadata(po.offset + 1)).asJava
inOrder.verify(mock).sendOffsetsToTransaction(offsets, po.key.groupId)
inOrder.verify(mock).sendOffsetsToTransaction(offsets, new ConsumerGroupMetadata(po.key.groupId))
inOrder.verify(mock).commitTransaction()
}

Expand Down

0 comments on commit 083018e

Please sign in to comment.