Merge pull request #264 from slachiewicz/mockito4

Move Tests to Mockito4

OCPP-J/build.gradle

@@ -6,8 +6,8 @@ dependencies {
     compile project(':common')
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'org.java-websocket:Java-WebSocket:1.5.3'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'junit:junit:4.13.2'
+    testCompile 'org.mockito:mockito-core:4.11.0'
     testCompile 'org.hamcrest:hamcrest-core:1.3'
 }
 

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/build.gradle

@@ -5,8 +5,8 @@ dependencies {
     compile group: 'javax.xml.soap', name: 'javax.xml.soap-api', version: '1.4.0'
     compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1'
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'junit:junit:4.13.2'
+    testCompile 'org.mockito:mockito-core:4.11.0'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
 }
 

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, times(1)).open(eq(someUrl), any());
   }
 
   @Test
@@ -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, times(1)).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

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);

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,13 @@ 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))
+    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());
 
@@ -114,7 +114,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, times(1)).sendRequest(nullable(String.class), eq(request), nullable(String.class));
   }
 
   @Test

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, times(1)).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, times(1)).sendCall(eq(someUniqueId), nullable(String.class), nullable(Request.class));
   }
 
   @Test
@@ -153,7 +155,7 @@ public void open_connectsViaCommunicator() {
   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, times(1)).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, times(1)).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, times(1)).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
   }
 
   @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, times(1)).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
   }
 }

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

@@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import eu.chargetime.ocpp.SessionEvents;
@@ -38,7 +38,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 SimpleRequestDispatcherTest {

ocpp-v1_6/build.gradle

@@ -7,9 +7,9 @@ dependencies {
     compile project(':OCPP-J')
     compile 'org.java-websocket:Java-WebSocket:1.5.3'
     compile group: 'javax.xml.soap', name: 'javax.xml.soap-api', version: '1.4.0'
-    
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+
+    testCompile 'junit:junit:4.13.2'
+    testCompile 'org.mockito:mockito-core:4.11.0'
     testCompile 'org.hamcrest:hamcrest-core:1.3'
 }
 

ocpp-v1_6/pom.xml

@@ -71,7 +71,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-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientCoreProfileTest.java

@@ -17,7 +17,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

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientFirmwareManagementProfileTest.java

@@ -29,7 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -43,7 +43,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 ClientFirmwareManagementProfileTest extends ProfileTest {

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientLocalAuthListProfileTest.java

@@ -28,7 +28,7 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -45,7 +45,7 @@
 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 ClientLocalAuthListProfileTest extends ProfileTest {

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientRemoteTriggerProfileTest.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

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientReservationProfileTest.java

@@ -30,7 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -47,7 +47,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 ClientReservationProfileTest extends ProfileTest {

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientSmartChargingProfileTest.java

@@ -14,7 +14,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

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java

@@ -3,7 +3,7 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -17,7 +17,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