Cleaned up the dependencies.

Author: TVolden

…me/ocpp/model/test/TestConfirmation.java …rgetime/ocpp/model/TestConfirmation.javaocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/model/test/TestConfirmation.java renamed to ocpp-common/src/main/java/eu/chargetime/ocpp/model/TestConfirmation.java ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/model/test/TestConfirmation.java renamed to ocpp-common/src/main/java/eu/chargetime/ocpp/model/TestConfirmation.java

@@ -1,6 +1,4 @@
-package eu.chargetime.ocpp.model.test;
-
-import eu.chargetime.ocpp.model.Confirmation;
+package eu.chargetime.ocpp.model;
 
 /**
  ChargeTime.eu - Java-OCA-OCPP

…hargetime/ocpp/model/test/TestModel.java …/eu/chargetime/ocpp/model/TestModel.javaocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/model/test/TestModel.java renamed to ocpp-common/src/main/java/eu/chargetime/ocpp/model/TestModel.java ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/model/test/TestModel.java renamed to ocpp-common/src/main/java/eu/chargetime/ocpp/model/TestModel.java

@@ -1,4 +1,4 @@
-package eu.chargetime.ocpp.model.test;
+package eu.chargetime.ocpp.model;
 
 import java.util.Calendar;
 

…rgetime/ocpp/model/test/TestRequest.java …u/chargetime/ocpp/model/TestRequest.javaocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/model/test/TestRequest.java renamed to ocpp-common/src/main/java/eu/chargetime/ocpp/model/TestRequest.java ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/model/test/TestRequest.java renamed to ocpp-common/src/main/java/eu/chargetime/ocpp/model/TestRequest.java

@@ -1,6 +1,4 @@
-package eu.chargetime.ocpp.model.test;
-
-import eu.chargetime.ocpp.model.Request;
+package eu.chargetime.ocpp.model;
 
 /**
  * ChargeTime.eu - Java-OCA-OCPP

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

@@ -7,7 +7,7 @@
 import eu.chargetime.ocpp.feature.profile.Profile;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
-import eu.chargetime.ocpp.model.test.TestConfirmation;
+import eu.chargetime.ocpp.model.TestConfirmation;
 import eu.chargetime.ocpp.utilities.TestUtilities;
 import org.junit.Before;
 import org.junit.Test;
@@ -16,7 +16,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.*;
 

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

@@ -50,7 +50,7 @@ public void setUp() throws Exception
     public void addRequest_getTicket()
     {
         // When
-        String ticket = queue.store(null);
+        queue.store(null);
     }
 
     @Test

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

@@ -4,13 +4,12 @@
 import eu.chargetime.ocpp.feature.Feature;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
-import eu.chargetime.ocpp.model.test.TestRequest;
+import eu.chargetime.ocpp.model.TestRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.testng.TestException;
 
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.*;
 
@@ -176,7 +175,7 @@ public boolean validate() {
     public void onCall_callbackThrowsException_callSendCallResult() throws Exception {
         // Given
         String someId = "Some id";
-        when(sessionEvents.handleRequest(any())).thenThrow(TestException.class);
+        when(sessionEvents.handleRequest(any())).thenThrow(Exception.class);
         when(communicator.unpackPayload(any(), any())).thenReturn(new TestRequest());
 
         // When

ocpp-common/src/test/java/eu/chargetime/ocpp/utilities/test/ModelUtilTest.java

@@ -3,8 +3,8 @@
 import eu.chargetime.ocpp.utilities.ModelUtil;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
 /**
  ChargeTime.eu - Java OCA OCPP

ocpp-v1_6-test/src/it/groovy/eu/chargetime/ocpp/test/core/Authorize.groovy

@@ -36,15 +36,15 @@ class Authorize extends Specification
 
         then:
         conditions.eventually {
-            centralSystem.hasReceivedAuthorizeRequest();
+            assert centralSystem.hasReceivedAuthorizeRequest();
         }
 
         when:
             centralSystem.sendAuthorizeConfirmation(FakeCentralSystem.AuthorizationStatus.Accepted);
 
         then:
         conditions.eventually {
-            chargePoint.hasReceivedAuthorizeConfirmation("Accepted");
+            assert chargePoint.hasReceivedAuthorizeConfirmation("Accepted");
         }
     }
 

ocpp-v1_6-test/src/it/groovy/eu/chargetime/ocpp/test/core/BootNotification.groovy

@@ -32,15 +32,15 @@ class BootNotification extends Specification
 
         then:
         conditions.eventually {
-            centralSystem.hasReceivedBootNotification("VendorX", "SingleSocketCharger");
+            assert centralSystem.hasReceivedBootNotification("VendorX", "SingleSocketCharger");
         }
 
         when:
         centralSystem.sendBootConfirmation(RegistrationStatus.Accepted);
 
         then:
         conditions.eventually {
-            chargePoint.hasReceivedBootConfirmation(RegistrationStatus.Accepted);
+            assert chargePoint.hasReceivedBootConfirmation(RegistrationStatus.Accepted);
         }
     }
 }

ocpp-v1_6-test/src/it/groovy/eu/chargetime/ocpp/test/core/ChangeAvailability.groovy

@@ -32,8 +32,8 @@ class ChangeAvailability extends Specification
 
         then:
         conditions.eventually {
-            chargePoint.hasHandledChangeAvailabilityRequest();
-            centralSystem.hasReceivedChangeAvailabilityConfirmation("Accepted");
+            assert chargePoint.hasHandledChangeAvailabilityRequest();
+            assert centralSystem.hasReceivedChangeAvailabilityConfirmation("Accepted");
         }
     }
 }