Implemented Server MeterValues feature.

Author: TVolden

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

@@ -97,6 +97,12 @@ public HeartbeatConfirmation handleHeartbeatRequest(int sessionIndex, HeartbeatR
                 confirmation.setCurrentTime(Calendar.getInstance());
                 return confirmation;
             }
+
+            @Override
+            public MeterValuesConfirmation handleMeterValuesRequest(int sessionIndex, MeterValuesRequest request) {
+                receivedRequest = request;
+                return new MeterValuesConfirmation();
+            }
         }));
         server.open("localhost", 8887, new ServerEvents() {
             @Override
@@ -193,4 +199,8 @@ public boolean hasReceivedGetConfigurationConfirmation() {
     public boolean hasHandledHeartbeat() {
         return receivedRequest instanceof HeartbeatRequest;
     }
+
+    public boolean hasHandledMeterValuesRequest() {
+        return receivedRequest instanceof MeterValuesRequest;
+    }
 }

…getime/ocpp/test/core/MeterValues.groovy …me/ocpp/test/core/MeterValuesSpec.groovyocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/MeterValues.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/MeterValuesSpec.groovy ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/MeterValues.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/MeterValuesSpec.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 MeterValues extends Specification
+class MeterValuesSpec extends Specification
 {
     @Shared
-    OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
+    FakeCentralSystem centralSystem = FakeCentralSystem.getInstance();
     @Shared FakeChargePoint chargePoint = new FakeChargePoint();
 
     def setupSpec() {
@@ -32,12 +32,9 @@ class MeterValues extends Specification
 
         then:
         conditions.eventually {
-            assert centralSystem.hasReceivedMeterValuesRequest();
+            assert centralSystem.hasHandledMeterValuesRequest();
         }
 
-        when:
-            centralSystem.sendMeterValuesConfirmation();
-
         then:
         conditions.eventually {
             assert chargePoint.hasReceivedMeterValuesConfirmation();

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

@@ -30,6 +30,7 @@ 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);
+
+    MeterValuesConfirmation handleMeterValuesRequest(int sessionIndex, MeterValuesRequest request);
 }

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

@@ -27,10 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.feature.*;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
-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 eu.chargetime.ocpp.model.core.*;
 
 import java.util.HashSet;
 
@@ -51,6 +48,7 @@ public ServerCoreProfile(ServerCoreEventHandler handler) {
         features.add(new DataTransferFeature(this));
         features.add(new GetConfigurationFeature(this));
         features.add(new HeartbeatFeature(this));
+        features.add(new MeterValuesFeature(this));
     }
 
     @Override
@@ -70,6 +68,8 @@ public Confirmation handleRequest(int sessionIndex, Request request) {
             result = handler.handleDataTransferRequest(sessionIndex, (DataTransferRequest) request);
         } else if (request instanceof HeartbeatRequest) {
             result = handler.handleHeartbeatRequest(sessionIndex, (HeartbeatRequest) request);
+        } else if (request instanceof MeterValuesRequest) {
+            result = handler.handleMeterValuesRequest(sessionIndex, (MeterValuesRequest) request);
         }
 
         return result;

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

@@ -3,10 +3,7 @@
 import eu.chargetime.ocpp.feature.*;
 import eu.chargetime.ocpp.feature.profile.ServerCoreEventHandler;
 import eu.chargetime.ocpp.feature.profile.ServerCoreProfile;
-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 eu.chargetime.ocpp.model.core.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -178,6 +175,28 @@ public void handleRequest_aHeartbeatRequest_callsHandleHeartbeatRequest() {
         verify(handler, times(1)).handleHeartbeatRequest(eq(sessionId), eq(request));
     }
 
+    @Test
+    public void getFeatureList_containsMeterValuesFeature() {
+        // When
+        Feature[] features = core.getFeatureList();
+
+        // Then
+        assertThat(findFeature(features, "MeterValues"), is(instanceOf(MeterValuesFeature.class)));
+    }
+
+    @Test
+    public void handleRequest_aMeterValuesRequest_callsHandleMeterValuesRequest() {
+        // Given
+        MeterValuesRequest request = new MeterValuesRequest();
+        int sessionId = 42;
+
+        // When
+        core.handleRequest(sessionId, request);
+
+        // Then
+        verify(handler, times(1)).handleMeterValuesRequest(eq(sessionId), eq(request));
+    }
+
     private Feature findFeature(Feature[] features, String action) {
         Feature output = null;
         for (Feature feature : features) {