Move Tests to Mockito4

Author: slachiewicz

OCPP-J/pom.xml

@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

OCPP-J/src/test/java/eu/chargetime/ocpp/wss/test/BaseWssSocketBuilderTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import eu.chargetime.ocpp.wss.BaseWssFactoryBuilder;

ocpp-common/pom.xml

@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

ocpp-common/src/test/java/eu/chargetime/ocpp/test/ClientTest.java

@@ -41,7 +41,7 @@ of this software and associated documentation files (the "Software"), to deal
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ClientTest {
@@ -59,7 +59,7 @@ public class ClientTest {
   @Before
   public void setup() {
     when(request.validate()).thenReturn(true);
-    doAnswer(invocation -> eventHandler = invocation.getArgumentAt(1, SessionEvents.class))
+    doAnswer(invocation -> eventHandler = invocation.getArgument(1, SessionEvents.class))
         .when(session)
         .open(any(), any());
 
@@ -77,7 +77,7 @@ public void connect_connects() {
     client.connect(someUrl, events);
 
     // Then
-    verify(session, times(1)).open(eq(someUrl), anyObject());
+    verify(session).open(eq(someUrl), any());
   }
 
   @Test
@@ -89,7 +89,7 @@ public void connect_connectionOpenedEvent() {
     this.eventHandler.handleConnectionOpened();
 
     // Then
-    verify(events, times(1)).connectionOpened();
+    verify(events).connectionOpened();
     verify(events, never()).connectionClosed();
   }
 
@@ -102,7 +102,7 @@ public void connect_connectionClosedEvent() {
     this.eventHandler.handleConnectionClosed();
 
     // Then
-    verify(events, times(1)).connectionClosed();
+    verify(events).connectionClosed();
     verify(events, never()).connectionOpened();
   }
 
@@ -112,14 +112,15 @@ public void send_aMessage_isCommunicated() throws Exception {
     client.send(request);
 
     // Then
-    verify(session, times(1)).sendRequest(anyString(), eq(request), anyString());
+    // TODO action and uuid should not be nullable
+    verify(session).sendRequest(nullable(String.class), eq(request), nullable(String.class));
   }
 
   @Test
   public void responseReceived_aMessageWasSend_PromiseIsCompleted() throws Exception {
     // Given
     String someUniqueId = "Some id";
-    when(session.storeRequest(any())).thenReturn(someUniqueId);
+    lenient().when(session.storeRequest(any())).thenReturn(someUniqueId);
     when(promiseRepository.getPromise(any())).thenReturn(Optional.of(completableFuture));
 
     // When
@@ -152,7 +153,7 @@ public void handleRequest_callsFeatureHandleRequest() throws UnsupportedFeatureE
     eventHandler.handleRequest(request);
 
     // Then
-    verify(feature, times(1)).handleRequest(any(), eq(request));
+    verify(feature).handleRequest(any(), eq(request));
   }
 
   @Test
@@ -161,6 +162,6 @@ public void send_aMessage_validatesMessage() throws Exception {
     client.send(request);
 
     // Then
-    verify(request, times(1)).validate();
+    verify(request).validate();
   }
 }

ocpp-common/src/test/java/eu/chargetime/ocpp/test/CommunicatorTest.java

@@ -1,6 +1,6 @@
 package eu.chargetime.ocpp.test;
 
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 import eu.chargetime.ocpp.*;
@@ -12,7 +12,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /*
    ChargeTime.eu - Java-OCA-OCPP
@@ -57,7 +57,7 @@ public void setup() throws Exception {
 
     when(transactionRelatedRequest.transactionRelated()).thenReturn(true);
     when(normalRequest.transactionRelated()).thenReturn(false);
-    doAnswer(invocation -> eventHandler = invocation.getArgumentAt(0, RadioEvents.class))
+    doAnswer(invocation -> eventHandler = invocation.getArgument(0, RadioEvents.class))
         .when(receiver)
         .accept(any());
     setupCommunicator(true);
@@ -126,7 +126,7 @@ public void sendCall_aNormalRequestAndRadioThrowsNotConnectedException_onErrorIs
     communicator.sendCall(uniqueId, action, normalRequest);
 
     // Then
-    verify(events, times(1)).onError(eq(uniqueId), any(), any(), any());
+    verify(events).onError(eq(uniqueId), any(), any(), any());
   }
 
   @Test
@@ -164,7 +164,7 @@ public void sendCall_queueNotEmpty_messagesAreProcessInSequence() throws Excepti
 
     // Then
     verify(receiver, times(2)).send(eq(firstId));
-    verify(receiver, times(1)).send(eq(secondId));
+    verify(receiver).send(eq(secondId));
   }
 
   @Test
@@ -222,7 +222,7 @@ public boolean validate() {
     communicator.sendCallResult(uniqueId, action, conf);
 
     // Then
-    verify(handler, times(1)).onConfirmationCompleted();
+    verify(handler).onConfirmationCompleted();
   }
 
   @Test

ocpp-common/src/test/java/eu/chargetime/ocpp/test/ServerTest.java

@@ -12,7 +12,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /*
    ChargeTime.eu - Java-OCA-OCPP
@@ -65,13 +65,14 @@ public void setup() {
     UUID sessionId = UUID.randomUUID();
     when(request.validate()).thenReturn(true);
     when(session.getSessionId()).thenReturn(sessionId);
-    doAnswer(invocation -> listenerEvents = invocation.getArgumentAt(2, ListenerEvents.class))
+//    when(session.storeRequest(any())).thenReturn(UUID.randomUUID().toString());
+    doAnswer(invocation -> listenerEvents = invocation.getArgument(2, ListenerEvents.class))
         .when(listener)
         .open(anyString(), anyInt(), any());
-    doAnswer(invocation -> sessionEvents = invocation.getArgumentAt(0, SessionEvents.class))
+    doAnswer(invocation -> sessionEvents = invocation.getArgument(0, SessionEvents.class))
         .when(session)
         .accept(any());
-    doAnswer(invocation -> sessionIndex = invocation.getArgumentAt(0, UUID.class))
+    doAnswer(invocation -> sessionIndex = invocation.getArgument(0, UUID.class))
         .when(serverEvents)
         .newSession(any(), any());
 
@@ -89,7 +90,7 @@ public void newSession_serverIsListening_sessionIsAccepted() {
     listenerEvents.newSession(session, information);
 
     // Then
-    verify(session, times(1)).accept(any());
+    verify(session).accept(any());
   }
 
   @Test
@@ -101,7 +102,7 @@ public void newSession_serverIsListening_callbackWithIndex0() {
     listenerEvents.newSession(session, information);
 
     // Then
-    verify(serverEvents, times(1)).newSession(any(UUID.class), eq(information));
+    verify(serverEvents).newSession(any(UUID.class), eq(information));
   }
 
   @Test
@@ -114,7 +115,8 @@ public void send_aMessage_isCommunicated() throws Exception {
     server.send(sessionIndex, request);
 
     // Then
-    verify(session, times(1)).sendRequest(anyString(), eq(request), anyString());
+    // TODO action and uuid should not be nullable
+    verify(session).sendRequest(nullable(String.class), eq(request), nullable(String.class));
   }
 
   @Test
@@ -127,7 +129,7 @@ public void handleRequest_callsFeatureHandleRequest() throws UnsupportedFeatureE
     sessionEvents.handleRequest(request);
 
     // Then
-    verify(feature, times(1)).handleRequest(any(UUID.class), eq(request));
+    verify(feature).handleRequest(any(UUID.class), eq(request));
   }
 
   @Test
@@ -140,6 +142,6 @@ public void send_aMessage_validatesMessage() throws Exception {
     server.send(sessionIndex, request);
 
     // Then
-    verify(request, times(1)).validate();
+    verify(request).validate();
   }
 }

ocpp-common/src/test/java/eu/chargetime/ocpp/test/SessionTest.java

@@ -16,7 +16,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /*
 ChargeTime.eu - Java-OCA-OCPP
@@ -63,7 +63,7 @@ public class SessionTest {
   public void setup() throws Exception {
     when(featureRepository.findFeature(any())).thenReturn(Optional.of(feature));
     session = new Session(communicator, queue, fulfiller, featureRepository);
-    doAnswer(invocation -> eventHandler = invocation.getArgumentAt(1, CommunicatorEvents.class))
+    doAnswer(invocation -> eventHandler = invocation.getArgument(1, CommunicatorEvents.class))
         .when(communicator)
         .connect(any(), any());
     session.open(null, sessionEvents);
@@ -103,7 +103,8 @@ public boolean validate() {
     session.sendRequest(someAction, someRequest, null);
 
     // Then
-    verify(communicator, times(1)).sendCall(anyString(), eq(someAction), eq(someRequest));
+    // TODO uniqueid should not be nullable
+    verify(communicator).sendCall(nullable(String.class), eq(someAction), eq(someRequest));
   }
 
   @Test
@@ -115,7 +116,8 @@ public void sendRequest_someUniqueId_sendsUniqueIdToCommunicator() {
     session.sendRequest(null, null, someUniqueId);
 
     // Then
-    verify(communicator, times(1)).sendCall(eq(someUniqueId), anyString(), any());
+    // TODO uuid and request should not be nullable
+    verify(communicator).sendCall(eq(someUniqueId), nullable(String.class), nullable(Request.class));
   }
 
   @Test
@@ -134,7 +136,7 @@ public boolean validate() {
     session.sendConfirmation(someUniqueId, action, conf);
 
     // Then
-    verify(communicator, times(1)).sendCallResult(eq(someUniqueId), eq(action), eq(conf));
+    verify(communicator).sendCallResult(eq(someUniqueId), eq(action), eq(conf));
   }
 
   @Test
@@ -146,14 +148,14 @@ public void open_connectsViaCommunicator() {
     session.open(someUri, null);
 
     // Then
-    verify(communicator, times(1)).connect(eq(someUri), any());
+    verify(communicator).connect(eq(someUri), any());
   }
 
   @Test
   public void onCall_unhandledCallback_callSendCallError() throws Exception {
     // Given
     String someId = "Some id";
-    doAnswer(invocation -> invocation.getArgumentAt(0, CompletableFuture.class).complete(null))
+    doAnswer(invocation -> invocation.getArgument(0, CompletableFuture.class).complete(null))
         .when(fulfiller)
         .fulfill(any(), any(), any());
     when(communicator.unpackPayload(any(), any())).thenReturn(new TestRequest());
@@ -162,7 +164,8 @@ public void onCall_unhandledCallback_callSendCallError() throws Exception {
     eventHandler.onCall(someId, null, null);
 
     // then
-    verify(communicator, times(1)).sendCallError(eq(someId), anyString(), anyString(), anyString());
+    // TODO action should not be nullable
+    verify(communicator).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
   }
 
   @Test
@@ -178,7 +181,7 @@ public boolean validate() {
 
     doAnswer(
             invocation ->
-                invocation.getArgumentAt(0, CompletableFuture.class).complete(aConfirmation))
+                invocation.getArgument(0, CompletableFuture.class).complete(aConfirmation))
         .when(fulfiller)
         .fulfill(any(), any(), any());
     when(communicator.unpackPayload(any(), any())).thenReturn(new TestRequest());
@@ -187,7 +190,8 @@ public boolean validate() {
     eventHandler.onCall(someId, null, null);
 
     // then
-    verify(communicator, times(1)).sendCallResult(anyString(), anyString(), eq(aConfirmation));
+    // TODO action should not be nullable
+    verify(communicator).sendCallResult(anyString(), nullable(String.class), eq(aConfirmation));
   }
 
   @Test
@@ -197,7 +201,7 @@ public void onCall_callbackThrowsException_callSendCallResult() throws Exception
     doAnswer(
             invocation ->
                 invocation
-                    .getArgumentAt(0, CompletableFuture.class)
+                    .getArgument(0, CompletableFuture.class)
                     .completeExceptionally(new Exception()))
         .when(fulfiller)
         .fulfill(any(), any(), any());
@@ -207,7 +211,8 @@ public void onCall_callbackThrowsException_callSendCallResult() throws Exception
     eventHandler.onCall(someId, null, null);
 
     // then
-    verify(communicator, times(1)).sendCallError(eq(someId), anyString(), anyString(), anyString());
+    // TODO uniqueid should not be nullable
+    verify(communicator).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
   }
 
   @Test
@@ -216,7 +221,7 @@ public void close_disconnects() {
     session.close();
 
     // Then
-    verify(communicator, times(1)).disconnect();
+    verify(communicator).disconnect();
   }
 
   @Test
@@ -229,6 +234,7 @@ public void onCall_unknownAction_callSendCallError() {
     eventHandler.onCall(someId, null, null);
 
     // Then
-    verify(communicator, times(1)).sendCallError(eq(someId), anyString(), anyString(), anyString());
+    // TODO uniqueid should not be nullable
+    verify(communicator).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
   }
 }

ocpp-common/src/test/java/eu/chargetime/ocpp/test/SimpleRequestDispatcherTest.java

@@ -25,20 +25,20 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import eu.chargetime.ocpp.SessionEvents;
 import eu.chargetime.ocpp.SimplePromiseFulfiller;
 import eu.chargetime.ocpp.UnsupportedFeatureException;
 import eu.chargetime.ocpp.model.Confirmation;
 import java.util.concurrent.CompletableFuture;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SimpleRequestDispatcherTest {
@@ -65,6 +65,6 @@ public void fulfill_throwsException_completesWithException() throws UnsupportedF
     sut.fulfill(promise, eventsMock, null);
 
     // Then
-    assertThat(result[0], is(expectedException));
+    assertEquals(result[0], expectedException);
   }
 }