Implemented Server Heartbeat feature.

Author: TVolden

ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java

@@ -89,6 +89,14 @@ public DataTransferConfirmation handleDataTransferRequest(int sessionIndex, Data
                 confirmation.setStatus(DataTransferStatus.Accepted);
                 return confirmation;
             }
+
+            @Override
+            public HeartbeatConfirmation handleHeartbeatRequest(int sessionIndex, HeartbeatRequest request) {
+                receivedRequest = request;
+                HeartbeatConfirmation confirmation = new HeartbeatConfirmation();
+                confirmation.setCurrentTime(Calendar.getInstance());
+                return confirmation;
+            }
         }));
         server.open("localhost", 8887, new ServerEvents() {
             @Override
@@ -181,4 +189,8 @@ public void sendGetConfigurationRequest(String... key) throws Exception {
     public boolean hasReceivedGetConfigurationConfirmation() {
         return receivedConfirmation instanceof GetConfigurationConfirmation;
     }
+
+    public boolean hasHandledHeartbeat() {
+        return receivedRequest instanceof HeartbeatRequest;
+    }
 }

…argetime/ocpp/test/core/Heartbeat.groovy …time/ocpp/test/core/HeartbeatSpec.groovyocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/Heartbeat.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/HeartbeatSpec.groovy ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/Heartbeat.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/HeartbeatSpec.groovy

@@ -1,15 +1,15 @@
 package eu.chargetime.ocpp.test.core
 
+import eu.chargetime.ocpp.test.FakeCentralSystem
 import eu.chargetime.ocpp.test.FakeChargePoint
-import eu.chargetime.ocpp.test.OldFakeCentralSystem
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
-class Heartbeat extends Specification
+class HeartbeatSpec extends Specification
 {
     @Shared
-    OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
+    FakeCentralSystem centralSystem = FakeCentralSystem.getInstance();
     @Shared FakeChargePoint chargePoint = new FakeChargePoint();
 
     def setupSpec() {
@@ -33,12 +33,9 @@ class Heartbeat extends Specification
 
         then:
         conditions.eventually {
-            assert centralSystem.hasReceivedHeartbeat();
+            assert centralSystem.hasHandledHeartbeat();
         }
 
-        when:
-            centralSystem.sendHeartbeatConfirmation();
-
         then:
         conditions.eventually {
             assert chargePoint.hasReceivedHeartbeatConfirmation();

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreEventHandler.java

@@ -29,6 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 public interface ServerCoreEventHandler {
     AuthorizeConfirmation handleAuthorizeRequest(int sessionIndex, AuthorizeRequest request);
     BootNotificationConfirmation handleBootNotificationRequest(int sessionIndex, BootNotificationRequest request);
-
     DataTransferConfirmation handleDataTransferRequest(int sessionIndex, DataTransferRequest request);
+
+    HeartbeatConfirmation handleHeartbeatRequest(int sessionIndex, HeartbeatRequest request);
 }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreProfile.java

@@ -30,6 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.model.core.AuthorizeRequest;
 import eu.chargetime.ocpp.model.core.BootNotificationRequest;
 import eu.chargetime.ocpp.model.core.DataTransferRequest;
+import eu.chargetime.ocpp.model.core.HeartbeatRequest;
 
 import java.util.HashSet;
 
@@ -49,6 +50,7 @@ public ServerCoreProfile(ServerCoreEventHandler handler) {
         features.add(new ClearCacheFeature(this));
         features.add(new DataTransferFeature(this));
         features.add(new GetConfigurationFeature(this));
+        features.add(new HeartbeatFeature(this));
     }
 
     @Override
@@ -66,6 +68,8 @@ public Confirmation handleRequest(int sessionIndex, Request request) {
             result = handler.handleBootNotificationRequest(sessionIndex, (BootNotificationRequest) request);
         } else if (request instanceof DataTransferRequest) {
             result = handler.handleDataTransferRequest(sessionIndex, (DataTransferRequest) request);
+        } else if (request instanceof HeartbeatRequest) {
+            result = handler.handleHeartbeatRequest(sessionIndex, (HeartbeatRequest) request);
         }
 
         return result;

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

@@ -6,6 +6,7 @@
 import eu.chargetime.ocpp.model.core.AuthorizeRequest;
 import eu.chargetime.ocpp.model.core.BootNotificationRequest;
 import eu.chargetime.ocpp.model.core.DataTransferRequest;
+import eu.chargetime.ocpp.model.core.HeartbeatRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -155,6 +156,28 @@ public void getFeatureList_containsGetConfigurationFeature() {
         assertThat(findFeature(features, "GetConfiguration"), is(instanceOf(GetConfigurationFeature.class)));
     }
 
+    @Test
+    public void getFeatureList_containsHeartbeatFeature() {
+        // When
+        Feature[] features = core.getFeatureList();
+
+        // Then
+        assertThat(findFeature(features, "Heartbeat"), is(instanceOf(HeartbeatFeature.class)));
+    }
+
+    @Test
+    public void handleRequest_aHeartbeatRequest_callsHandleHeartbeatRequest() {
+        // Given
+        HeartbeatRequest request = new HeartbeatRequest();
+        int sessionId = 42;
+
+        // When
+        core.handleRequest(sessionId, request);
+
+        // Then
+        verify(handler, times(1)).handleHeartbeatRequest(eq(sessionId), eq(request));
+    }
+
     private Feature findFeature(Feature[] features, String action) {
         Feature output = null;
         for (Feature feature : features) {