Merge pull request #91 from simonweiser/master

Add transactionId to validation method of StartTransactionConfirmation
ChargeTimeEU · Feb 13, 2019 · 2ee40bc · 2ee40bc
2 parents 0f3e760 + 588d6aa
commit 2ee40bc
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/DummyHandlers.java b/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/DummyHandlers.java
@@ -111,6 +111,7 @@ public StartTransactionConfirmation handleStartTransactionRequest(UUID sessionIn
 
                 StartTransactionConfirmation confirmation = new StartTransactionConfirmation();
                 confirmation.setIdTagInfo(tagInfo);
+                confirmation.setTransactionId(42);
                 return failurePoint(confirmation);
             }
 

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionConfirmation.java
@@ -49,6 +49,7 @@ public boolean validate() {
         boolean valid = true;
         if (valid &= idTagInfo != null)
             valid &= idTagInfo.validate();
+        valid &= transactionId != null;
         return valid;
     }
 

diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/StartTransactionConfirmationTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/StartTransactionConfirmationTest.java
@@ -77,7 +77,33 @@ public void validate_returnFalse() {
     }
 
     @Test
-    public void validate_idTagInfoAndTransactionIdIsSet_idTagInfoIsValidated() throws Exception {
+    public void validate_idTagInfoIsNotSetAndTransactionIdIsSet_returnFalse() {
+        // Given
+        confirmation.setTransactionId(42);
+
+        // When
+        boolean isValid = confirmation.validate();
+
+        // Then
+        assertThat(isValid, is(false));
+    }
+
+    @Test
+    public void validate_idTagInfoIsSetAndTransactionIdIsNotSet_returnFalse() {
+        // Given
+        IdTagInfo idTagInfo = mock(IdTagInfo.class);
+        when(idTagInfo.validate()).thenReturn(true);
+        confirmation.setIdTagInfo(idTagInfo);
+
+        // When
+        boolean isValid = confirmation.validate();
+
+        // Then
+        assertThat(isValid, is(false));
+    }
+
+    @Test
+    public void validate_idTagInfoAndTransactionIdIsSet_idTagInfoIsValidated() {
         // Given
         confirmation.setTransactionId(42);
         IdTagInfo idTagInfo = mock(IdTagInfo.class);
@@ -91,7 +117,7 @@ public void validate_idTagInfoAndTransactionIdIsSet_idTagInfoIsValidated() throw
     }
 
     @Test
-    public void validate_idTagInfoAndTransactionIdIsSet_returnTrue() throws Exception {
+    public void validate_idTagInfoAndTransactionIdIsSet_returnTrue() {
         // Given
         confirmation.setTransactionId(42);
         IdTagInfo idTagInfo = mock(IdTagInfo.class);