Merge pull request #152 from jmluy/master

Allow optional IdTagInfo in SendLocalList for deleting entries

Author: TVolden

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/AuthorizationData.java

@@ -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

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListRequest.java

@@ -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;
+        }
       }
     }
 

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/localauthlist/test/SendLocalListRequestTest.java

@@ -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;
@@ -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));
+  }
 }