Merge pull request #13 from medvedev/mockito-junit-runner

Use MockitoJUnitRunner to create mock instances in tests

Author: TVolden

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

@@ -12,7 +12,9 @@
 import eu.chargetime.ocpp.utilities.TestUtilities;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -47,21 +49,22 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
  */
+
+@RunWith(MockitoJUnitRunner.class)
 public class ClientTest extends TestUtilities {
     private Client client;
     private SessionEvents eventHandler;
-    private static final String IDENTIFIER = "test";
 
     @Mock
-    private Session session = mock(Session.class);
+    private Session session;
     @Mock
-    private Profile profile = mock(Profile.class);
+    private Profile profile;
     @Mock
-    private Feature feature = mock(Feature.class);
+    private Feature feature;
     @Mock
-    private Request request = mock(Request.class);
+    private Request request;
     @Mock
-    ClientEvents events = mock(ClientEvents.class);
+    private ClientEvents events;
 
     @Before
     public void setup() {

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

@@ -5,7 +5,9 @@
 import eu.chargetime.ocpp.model.Request;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.*;
@@ -35,19 +37,21 @@ of this software and associated documentation files (the "Software"), to deal
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
  */
+
+@RunWith(MockitoJUnitRunner.class)
 public class CommunicatorTest {
 
     private Communicator communicator;
     private RadioEvents eventHandler;
 
     @Mock
-    private Receiver receiver = mock(Receiver.class);
+    private Receiver receiver;
     @Mock
-    private Request transactionRelatedRequest = mock(Request.class);
+    private Request transactionRelatedRequest;
     @Mock
-    private Request normalRequest = mock(Request.class);
+    private Request normalRequest;
     @Mock
-    private CommunicatorEvents events = mock(CommunicatorEvents.class);
+    private CommunicatorEvents events;
 
     @Before
     public void setup() throws Exception {

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

@@ -8,7 +8,9 @@
 import eu.chargetime.ocpp.utilities.TestUtilities;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.UUID;
 
@@ -39,6 +41,8 @@ of this software and associated documentation files (the "Software"), to deal
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
  */
+
+@RunWith(MockitoJUnitRunner.class)
 public class ServerTest extends TestUtilities {
 
     private static final String LOCALHOST = "localhost";
@@ -51,17 +55,17 @@ public class ServerTest extends TestUtilities {
     private UUID sessionIndex;
 
     @Mock
-    private Session session = mock(Session.class);
+    private Session session;
     @Mock
-    private Profile profile = mock(Profile.class);
+    private Profile profile;
     @Mock
-    private Feature feature = mock(Feature.class);
+    private Feature feature;
     @Mock
-    private Listener listener = mock(Listener.class);
+    private Listener listener;
     @Mock
-    private ServerEvents serverEvents = mock(ServerEvents.class);
+    private ServerEvents serverEvents;
     @Mock
-    private Request request = mock(Request.class);
+    private Request request;
 
 
     @Before

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

@@ -7,7 +7,9 @@
 import eu.chargetime.ocpp.model.TestRequest;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -39,19 +41,21 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
  */
+
+@RunWith(MockitoJUnitRunner.class)
 public class SessionTest {
     private Session session;
 
     private CommunicatorEvents eventHandler;
 
     @Mock
-    Communicator communicator = mock(Communicator.class);
+    private Communicator communicator;
     @Mock
-    Queue queue = mock(Queue.class);
+    private Queue queue;
     @Mock
-    SessionEvents sessionEvents = mock(SessionEvents.class);
+    private SessionEvents sessionEvents;
     @Mock
-    Feature feature = mock(Feature.class);
+    private Feature feature;
 
     @Before
     public void setup() throws Exception {

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

@@ -8,7 +8,9 @@
 import eu.chargetime.ocpp.model.core.*;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.Calendar;
 import java.util.UUID;
@@ -44,14 +46,15 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ClientCoreProfileTest
 {
     private static final UUID SESSION_NULL = null;
 
     private ClientCoreProfile core;
 
     @Mock
-    ClientCoreEventHandler handler = mock(ClientCoreEventHandler.class);
+    ClientCoreEventHandler handler;
 
     @Before
     public void setup() {

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

@@ -7,7 +7,9 @@
 import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.UUID;
 
@@ -41,13 +43,14 @@
  * SOFTWARE.
  */
 
+@RunWith(MockitoJUnitRunner.class)
 public class ClientRemoteTriggerProfileTest {
 
     private static final UUID SESSION_NULL = null;
     private ClientRemoteTriggerProfile profile;
 
     @Mock
-    ClientRemoteTriggerHandler handler = mock(ClientRemoteTriggerHandler.class);
+    private ClientRemoteTriggerHandler handler;
 
     @Before
     public void setup() {

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

@@ -9,7 +9,9 @@
 import eu.chargetime.ocpp.model.smartcharging.*;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.Calendar;
 import java.util.UUID;
@@ -45,13 +47,14 @@
  * SOFTWARE.
  */
 
+@RunWith(MockitoJUnitRunner.class)
 public class ClientSmartChargingProfileTest {
 
     private static final UUID SESSION_NULL = null;
     private ClientSmartChargingProfile smartCharging;
 
     @Mock
-    ClientSmartChargingEventHandler handler = mock(ClientSmartChargingEventHandler.class);
+    private ClientSmartChargingEventHandler handler;
 
     @Before
     public void setup() {

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

@@ -6,7 +6,9 @@
 import eu.chargetime.ocpp.model.core.*;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.UUID;
 
@@ -41,12 +43,14 @@ of this software and associated documentation files (the "Software"), to deal
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
  */
+
+@RunWith(MockitoJUnitRunner.class)
 public class ServerCoreProfileTest {
 
     private ServerCoreProfile core;
 
     @Mock
-    ServerCoreEventHandler handler = mock(ServerCoreEventHandler.class);
+    private ServerCoreEventHandler handler;
 
     @Before
     public void setup() {

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

@@ -8,7 +8,9 @@
 import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequestType;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
@@ -41,12 +43,13 @@
  * SOFTWARE.
  */
 
+@RunWith(MockitoJUnitRunner.class)
 public class ServerRemoteTriggerProfileTest {
 
     private ServerRemoteTriggerProfile profile;
 
     @Mock
-    ServerRemoteTriggerHandler handler = mock(ServerRemoteTriggerHandler.class);
+    private ServerRemoteTriggerHandler handler;
 
     @Before
     public void setup() {

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

@@ -8,7 +8,9 @@
 import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
@@ -42,12 +44,13 @@
  * SOFTWARE.
  */
 
+@RunWith(MockitoJUnitRunner.class)
 public class ServerSmartChargingProfileTest {
 
     private ServerSmartChargingProfile smartCharging;
 
     @Mock
-    ServerSmartChargingHandler handler = mock(ServerSmartChargingHandler.class);
+    private ServerSmartChargingHandler handler;
 
     @Before
     public void setup() {