This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-proton-j.git
commit 48e41200bd6b1d2e820149f56a406014011bf90a Author: Robbie Gemmell <[email protected]> AuthorDate: Mon Aug 29 11:19:31 2022 +0100 PROTON-2595: update to mockito 4.7.0 --- pom.xml | 2 +- .../impl/ssl/SslHandshakeSniffingTransportWrapperTest.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 89e255f8..f0ff2729 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ <properties> <!-- Test dependency versions --> <junit-version>4.13.2</junit-version> - <mockito-version>3.11.2</mockito-version> + <mockito-version>4.7.0</mockito-version> <jython-version>2.7.2</jython-version> <bcpkix-jdk15on-version>1.69</bcpkix-jdk15on-version> diff --git a/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapperTest.java b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapperTest.java index 3a148376..4c544be0 100644 --- a/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapperTest.java +++ b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapperTest.java @@ -24,7 +24,7 @@ import static org.apache.qpid.proton.engine.impl.TransportTestHelper.assertByteB import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.nio.ByteBuffer; @@ -97,7 +97,7 @@ public class SslHandshakeSniffingTransportWrapperTest _sniffingWrapper.pop(consumed); verify(transportThatShouldBeUsed).pop(consumed); - verifyZeroInteractionsWithOtherTransport(transportThatShouldBeUsed); + verifyNoInteractionsWithOtherTransport(transportThatShouldBeUsed); } @Test @@ -115,7 +115,7 @@ public class SslHandshakeSniffingTransportWrapperTest } finally { - verifyZeroInteractions(_secureTransportWrapper, _plainTransportWrapper); + verifyNoInteractions(_secureTransportWrapper, _plainTransportWrapper); } } @@ -124,7 +124,7 @@ public class SslHandshakeSniffingTransportWrapperTest { assertEquals("Cipher name should be null", null, _sniffingWrapper.getCipherName()); assertEquals("Protocol name should be null", null, _sniffingWrapper.getProtocolName()); - verifyZeroInteractions(_secureTransportWrapper, _plainTransportWrapper); + verifyNoInteractions(_secureTransportWrapper, _plainTransportWrapper); } @Test @@ -161,10 +161,10 @@ public class SslHandshakeSniffingTransportWrapperTest assertEquals(expectedCipherName, _sniffingWrapper.getCipherName()); assertEquals(expectedProtocolName, _sniffingWrapper.getProtocolName()); - verifyZeroInteractionsWithOtherTransport(transportThatShouldBeUsed); + verifyNoInteractionsWithOtherTransport(transportThatShouldBeUsed); } - private void verifyZeroInteractionsWithOtherTransport(TransportWrapper transportThatShouldBeUsed) + private void verifyNoInteractionsWithOtherTransport(TransportWrapper transportThatShouldBeUsed) { final TransportWrapper transportThatShouldNotBeUsed; if(transportThatShouldBeUsed == _plainTransportWrapper) @@ -176,7 +176,7 @@ public class SslHandshakeSniffingTransportWrapperTest transportThatShouldNotBeUsed = _plainTransportWrapper; } - verifyZeroInteractions(transportThatShouldNotBeUsed); + verifyNoInteractions(transportThatShouldNotBeUsed); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
