Skip to content

Commit 5df04ef

Browse files
committed
For story TG-1: Implemented Server RemoteStopTransaction feature.
1 parent 6b1fce9 commit 5df04ef

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,17 @@ public boolean hasReceivedRemoteStartTransactionConfirmation(String status) {
219219
result &= ((RemoteStartTransactionConfirmation) receivedConfirmation).getStatus().equals(status);
220220
return result;
221221
}
222+
223+
public void sendRemoteStopTransactionRequest(int transactionId) throws Exception {
224+
RemoteStopTransactionRequest request = new RemoteStopTransactionRequest();
225+
request.setTransactionId(transactionId);
226+
server.send(sessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
227+
}
228+
229+
public boolean hasReceivedRemoteStopTransactionConfirmation(String status) {
230+
boolean result = receivedConfirmation instanceof RemoteStopTransactionConfirmation;
231+
if (result)
232+
result &= ((RemoteStopTransactionConfirmation) receivedConfirmation).getStatus().equals(status);
233+
return result;
234+
}
222235
}

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/RemoteStopTransaction.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/RemoteStopTransactionSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package eu.chargetime.ocpp.test.core
22

3+
import eu.chargetime.ocpp.test.FakeCentralSystem
34
import eu.chargetime.ocpp.test.FakeChargePoint
4-
import eu.chargetime.ocpp.test.OldFakeCentralSystem
55
import spock.lang.Shared
66
import spock.lang.Specification
77
import spock.util.concurrent.PollingConditions
88

9-
class RemoteStopTransaction extends Specification {
9+
class RemoteStopTransactionSpec extends Specification {
1010
@Shared
11-
OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
11+
FakeCentralSystem centralSystem = FakeCentralSystem.getInstance();
1212
@Shared
1313
FakeChargePoint chargePoint = new FakeChargePoint();
1414

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public ServerCoreProfile(ServerCoreEventHandler handler) {
5050
features.add(new HeartbeatFeature(this));
5151
features.add(new MeterValuesFeature(this));
5252
features.add(new RemoteStartTransactionFeature(this));
53+
features.add(new RemoteStopTransactionFeature(this));
5354
}
5455

5556
@Override

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,15 @@ public void getFeatureList_containsRemoteStartTransactionFeature() {
206206
assertThat(findFeature(features, "RemoteStartTransaction"), is(instanceOf(RemoteStartTransactionFeature.class)));
207207
}
208208

209+
@Test
210+
public void getFeatureList_containsRemoteStopTransactionFeature() {
211+
// When
212+
Feature[] features = core.getFeatureList();
213+
214+
// Then
215+
assertThat(findFeature(features, "RemoteStopTransaction"), is(instanceOf(RemoteStopTransactionFeature.class)));
216+
}
217+
209218
private Feature findFeature(Feature[] features, String action) {
210219
Feature output = null;
211220
for (Feature feature : features) {

0 commit comments

Comments
 (0)