Skip to content

Commit 6070473

Browse files
committed
For story TG-1: Implemented Server Unlock connector feature.
Removed debug output from Communicator. Removed old Fake Central System.
1 parent 63b124e commit 6070473

File tree

6 files changed

+26
-350
lines changed

6 files changed

+26
-350
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ public void connected() {
181181

182182
@Override
183183
public void receivedMessage(String input) {
184-
System.out.println(input);
185184
Message message = parse(input);
186185
if (message instanceof CallResultMessage) {
187186
events.onCallResult(message.getId(), message.getPayload());

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
@@ -282,4 +282,17 @@ public boolean hasHandledStatusNotificationRequest() {
282282
public boolean hasHandledStopTransactionRequest() {
283283
return receivedRequest instanceof StopTransactionRequest;
284284
}
285+
286+
public void sendUnlockConnectorRequest(int connectorId) throws Exception {
287+
UnlockConnectorRequest request = new UnlockConnectorRequest();
288+
request.setConnectorId(connectorId);
289+
server.send(sessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
290+
}
291+
292+
public boolean hasReceivedUnlockConnectorConfirmation(String status) {
293+
boolean result = receivedConfirmation instanceof UnlockConnectorConfirmation;
294+
if (result)
295+
result &= ((UnlockConnectorConfirmation) receivedConfirmation).getStatus().equals(status);
296+
return result;
297+
}
285298
}

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

Lines changed: 0 additions & 346 deletions
This file was deleted.

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/UnlockConnector.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/UnlockConnectorSpec.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 UnlockConnector extends Specification {
9+
class UnlockConnectorSpec 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
@@ -55,6 +55,7 @@ public ServerCoreProfile(ServerCoreEventHandler handler) {
5555
features.add(new StartTransactionFeature(this));
5656
features.add(new StatusNotificationFeature(this));
5757
features.add(new StopTransactionFeature(this));
58+
features.add(new UnlockConnectorFeature(this));
5859
}
5960

6061
@Override

0 commit comments

Comments
 (0)