Fixed the problem with the integration tests. Turns out the tests were working perfectly and uncovered a defect. -> Removed old, unused connect(...) from Client.

Author: TVolden

ocpp-common/src/main/java/eu/chargetime/ocpp/Client.java

@@ -56,15 +56,6 @@ public Client(Session session) {
         this.session = session;
     }
 
-    /**
-     * Connect to server
-     *
-     * @param   uri     url and port of the server
-     */
-    public void connect(String uri) {
-        this.connect(uri, null);
-    }
-
     /**
      * Connect to server
      *

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

@@ -60,6 +60,8 @@ public class ClientTest extends TestUtilities {
     private Feature feature = mock(Feature.class);
     @Mock
     private Request request = mock(Request.class);
+    @Mock
+    ClientEvents events = mock(ClientEvents.class);
 
     @Before
     public void setup() {
@@ -82,7 +84,7 @@ public void connect_connects() {
         String someUrl = "localhost";
 
         // When
-        client.connect(someUrl);
+        client.connect(someUrl, events);
 
         // Then
         verify(session, times(1)).open(eq(someUrl), anyObject());
@@ -91,7 +93,6 @@ public void connect_connects() {
     @Test
     public void connect_connectionOpenedEvent() {
         // Given
-        ClientEvents events = mock(ClientEvents.class);
         client.connect(null, events);
 
         // When
@@ -105,7 +106,6 @@ public void connect_connectionOpenedEvent() {
     @Test
     public void connect_connectionClosedEvent() {
         // Given
-        ClientEvents events = mock(ClientEvents.class);
         client.connect(null, events);
 
         // When
@@ -132,7 +132,7 @@ public void responseReceived_aMessageWasSend_PromiseIsCompleted() throws Excepti
         when(session.sendRequest(any(), any())).thenReturn(someUniqueId);
 
         // When
-        client.connect(null);
+        client.connect(null, null);
         CompletableFuture<Confirmation> promise = client.send(request);
         eventHandler.handleConfirmation(someUniqueId, null);
 
@@ -143,7 +143,7 @@ public void responseReceived_aMessageWasSend_PromiseIsCompleted() throws Excepti
     @Test
     public void handleRequest_returnsConfirmation() {
         // Given
-        client.connect(null);
+        client.connect(null, null);
         when(feature.handleRequest(null, request)).thenReturn(new TestConfirmation());
 
         // When
@@ -156,7 +156,7 @@ public void handleRequest_returnsConfirmation() {
     @Test
     public void handleRequest_callsFeatureHandleRequest() {
         // Given
-        client.connect(null);
+        client.connect(null, null);
 
         // When
         eventHandler.handleRequest(request);

ocpp-v1_6-test/pom.xml

@@ -96,7 +96,7 @@
                 <configuration>
                     <includes>
                         <include>**/*Test.java</include>
-                        <!--<include>**/*Spec.java</include>-->
+                        <include>**/*Spec.java</include>
                     </includes>
                 </configuration>
             </plugin>

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/SOAPClient.java

@@ -77,9 +77,9 @@ private SOAPClient(SOAPCommunicator communicator) {
      * @param uri url and port of the server
      */
     @Override
-    public void connect(String uri) {
+    public void connect(String uri, ClientEvents events) {
         communicator.setToUrl(uri);
-        super.connect(uri);
+        super.connect(uri, events);
         openWS();
     }