Skip to content

Commit 82f2d4c

Browse files
committed
Implemented Server ClearCache feature.
1 parent 6c896e0 commit 82f2d4c

File tree

5 files changed

+26
-4
lines changed

5 files changed

+26
-4
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,13 @@ public void sendChangeConfigurationRequest(String key, String value) throws Exce
138138
public boolean hasReceivedChangeConfigurationConfirmation() {
139139
return receivedConfirmation instanceof ChangeConfigurationConfirmation;
140140
}
141+
142+
public void sendClearCacheRequest() throws Exception {
143+
ClearCacheRequest request = new ClearCacheRequest();
144+
server.send(sessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
145+
}
146+
147+
public boolean hasReceivedClearCacheConfirmation() {
148+
return receivedConfirmation instanceof ClearCacheConfirmation;
149+
}
141150
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ public ChangeConfigurationConfirmation handleChangeConfigurationRequest(ChangeCo
7070
@Override
7171
public ClearCacheConfirmation handleClearCacheRequest(ClearCacheRequest request) {
7272
receivedRequest = request;
73-
return new ClearCacheConfirmation();
73+
ClearCacheConfirmation confirmation = new ClearCacheConfirmation();
74+
confirmation.setStatus(ClearCacheStatus.Accepted);
75+
return confirmation;
7476
}
7577

7678
@Override

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/ClearCache.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/ClearCacheSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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 ClearCache extends Specification
9+
class ClearCacheSpec extends Specification
1010
{
1111
@Shared
12-
OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
12+
FakeCentralSystem centralSystem = FakeCentralSystem.getInstance();
1313
@Shared FakeChargePoint chargePoint = new FakeChargePoint();
1414

1515
def setupSpec() {

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
@@ -45,6 +45,7 @@ public ServerCoreProfile(ServerCoreEventHandler handler) {
4545
features.add(new BootNotificationFeature(this));
4646
features.add(new ChangeAvailabilityFeature(this));
4747
features.add(new ChangeConfigurationFeature(this));
48+
features.add(new ClearCacheFeature(this));
4849
}
4950

5051
@Override

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,16 @@ public void getFeatureList_containsChangeConfigurationFeature() {
114114
assertThat(findFeature(features, "ChangeConfiguration"), is(instanceOf(ChangeConfigurationFeature.class)));
115115
}
116116

117+
@Test
118+
public void getFeatureList_containsClearCacheFeature() {
119+
// When
120+
Feature[] features = core.getFeatureList();
121+
122+
// Then
123+
assertThat(findFeature(features, "ClearCache"), is(instanceOf(ClearCacheFeature.class)));
124+
}
125+
126+
117127
private Feature findFeature(Feature[] features, String action) {
118128
Feature output = null;
119129
for (Feature feature : features) {

0 commit comments

Comments
 (0)