Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow optional IdTagInfo in SendLocalList for deleting entries #152

Merged
merged 1 commit into from
Aug 15, 2021
Merged

Allow optional IdTagInfo in SendLocalList for deleting entries #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/AuthorizationData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void setIdTagInfo(IdTagInfo idTagInfo) {

@Override
public boolean validate() {
return ModelUtil.validate(idTag, 20) && idTagInfo.validate();
return ModelUtil.validate(idTag, 20) && (idTagInfo == null || idTagInfo.validate());
}

@Override
Expand Down
4 changes: 4 additions & 0 deletions ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ public boolean validate() {
if (localAuthorizationList != null) {
for (AuthorizationData data : localAuthorizationList) {
valid &= data.validate();

if (updateType == UpdateType.Full) {
valid &= data.getIdTagInfo() != null;
}
}
}

Expand Down
48 changes: 48 additions & 0 deletions ...6/src/test/java/eu/chargetime/ocpp/model/localauthlist/test/SendLocalListRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import eu.chargetime.ocpp.PropertyConstraintException;
import eu.chargetime.ocpp.model.core.AuthorizationStatus;
import eu.chargetime.ocpp.model.core.IdTagInfo;
import eu.chargetime.ocpp.model.localauthlist.AuthorizationData;
import eu.chargetime.ocpp.model.localauthlist.SendLocalListRequest;
import eu.chargetime.ocpp.model.localauthlist.UpdateType;
Expand Down Expand Up @@ -107,4 +112,47 @@ public void validate_updateTypeIsNotSet_isNotValid() {
// Then
assertThat(request.validate(), equalTo(false));
}

@Test
public void validate_updateTypeFullWithTagInfo_isValid() {
// When
request.setListVersion(42);
request.setUpdateType(UpdateType.Full);
request.setLocalAuthorizationList(aList(data));

when(data.validate()).thenReturn(true);
when(data.getIdTagInfo()).thenReturn(new IdTagInfo(AuthorizationStatus.Accepted));

// Then
assertThat(request.validate(), equalTo(true));
verify(data, times(1)).getIdTagInfo();
verify(data, times(1)).validate();
}

@Test
public void validate_updateTypeFullEmptyTagInfo_isNotValid() {
// When
request.setListVersion(42);
request.setUpdateType(UpdateType.Full);
request.setLocalAuthorizationList(aList(data));

when(data.validate()).thenReturn(true);
when(data.getIdTagInfo()).thenReturn(null);

// Then
assertThat(request.validate(), equalTo(false));
}

@Test
public void validate_updateTypeDifferentialEmptyIdTagInfo_isValid() {
// When
request.setListVersion(42);
request.setUpdateType(UpdateType.Differential);
request.setLocalAuthorizationList(aList(data));

when(data.validate()).thenReturn(true);

// Then
assertThat(request.validate(), equalTo(true));
}
}