For story TG-1: Implemented Server Status notification feature.

Author: TVolden

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

@@ -114,6 +114,13 @@ public StartTransactionConfirmation handleStartTransactionRequest(int sessionInd
                 confirmation.setIdTagInfo(tagInfo);
                 return confirmation;
             }
+
+            @Override
+            public StatusNotificationConfirmation handleStatusNotificationRequest(int sessionIndex, StatusNotificationRequest request) {
+                receivedRequest = request;
+                StatusNotificationConfirmation confirmation = new StatusNotificationConfirmation();
+                return confirmation;
+            }
         }));
         server.open("localhost", 8887, new ServerEvents() {
             @Override
@@ -260,4 +267,8 @@ public boolean hasReceivedResetConfirmation(String status) {
     public boolean hasHandledStartTransactionRequest() {
         return receivedRequest instanceof StartTransactionRequest;
     }
+
+    public boolean hasHandledStatusNotificationRequest() {
+        return receivedRequest instanceof StatusNotificationRequest;
+    }
 }

…ocpp/test/core/StatusNotification.groovy …/test/core/StatusNotificationSpec.groovyocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/StatusNotification.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/StatusNotificationSpec.groovy ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/StatusNotification.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/StatusNotificationSpec.groovy

@@ -1,14 +1,14 @@
 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 StatusNotification extends Specification {
+class StatusNotificationSpec extends Specification {
     @Shared
-    OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
+    FakeCentralSystem centralSystem = FakeCentralSystem.getInstance();
     @Shared
     FakeChargePoint chargePoint = new FakeChargePoint();
 
@@ -32,12 +32,9 @@ class StatusNotification extends Specification {
 
         then:
         conditions.eventually {
-            assert centralSystem.hasReceivedStatusNotificationRequest();
+            assert centralSystem.hasHandledStatusNotificationRequest();
         }
 
-        when:
-        centralSystem.sendStatusNotificationConfirmation();
-
         then:
         conditions.eventually {
             assert chargePoint.hasReceivedStatusNotificationConfirmation();

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

@@ -32,6 +32,7 @@ public interface ServerCoreEventHandler {
     DataTransferConfirmation handleDataTransferRequest(int sessionIndex, DataTransferRequest request);
     HeartbeatConfirmation handleHeartbeatRequest(int sessionIndex, HeartbeatRequest request);
     MeterValuesConfirmation handleMeterValuesRequest(int sessionIndex, MeterValuesRequest request);
-
     StartTransactionConfirmation handleStartTransactionRequest(int sessionIndex, StartTransactionRequest request);
+
+    StatusNotificationConfirmation handleStatusNotificationRequest(int sessionIndex, StatusNotificationRequest request);
 }

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

@@ -53,6 +53,7 @@ public ServerCoreProfile(ServerCoreEventHandler handler) {
         features.add(new RemoteStopTransactionFeature(this));
         features.add(new ResetFeature(this));
         features.add(new StartTransactionFeature(this));
+        features.add(new StatusNotificationFeature(this));
     }
 
     @Override
@@ -76,6 +77,8 @@ public Confirmation handleRequest(int sessionIndex, Request request) {
             result = handler.handleMeterValuesRequest(sessionIndex, (MeterValuesRequest) request);
         } else if (request instanceof StartTransactionRequest) {
             result = handler.handleStartTransactionRequest(sessionIndex, (StartTransactionRequest) request);
+        } else if (request instanceof StatusNotificationRequest) {
+            result = handler.handleStatusNotificationRequest(sessionIndex, (StatusNotificationRequest) request);
         }
 
         return result;

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

@@ -246,6 +246,28 @@ public void handleRequest_aStartTransactionRequest_callsHandleStartTransactionRe
         verify(handler, times(1)).handleStartTransactionRequest(eq(sessionId), eq(request));
     }
 
+    @Test
+    public void getFeatureList_containsStatusNotificationFeature() {
+        // When
+        Feature[] features = core.getFeatureList();
+
+        // Then
+        assertThat(findFeature(features, "StatusNotification"), is(instanceOf(StatusNotificationFeature.class)));
+    }
+
+    @Test
+    public void handleRequest_aStatusNotificationRequest_callsHandleStatusNotificationRequest() {
+        // Given
+        StatusNotificationRequest request = new StatusNotificationRequest();
+        int sessionId = 42;
+
+        // When
+        core.handleRequest(sessionId, request);
+
+        // Then
+        verify(handler, times(1)).handleStatusNotificationRequest(eq(sessionId), eq(request));
+    }
+
     private Feature findFeature(Feature[] features, String action) {
         Feature output = null;
         for (Feature feature : features) {