From 4f1fe39182b34d48b964926989843da6dff35dda Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 8 Aug 2022 18:36:10 +0200
Subject: [PATCH] fix unittests

---
 unittests/cfdp/testKeepAlivePdu.cpp | 8 +++++---
 unittests/cfdp/testMetadataPdu.cpp  | 7 +++++--
 unittests/cfdp/testPromptPdu.cpp    | 8 +++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/unittests/cfdp/testKeepAlivePdu.cpp b/unittests/cfdp/testKeepAlivePdu.cpp
index 876b71f6..127d8a8c 100644
--- a/unittests/cfdp/testKeepAlivePdu.cpp
+++ b/unittests/cfdp/testKeepAlivePdu.cpp
@@ -71,9 +71,11 @@ TEST_CASE("Keep Alive PDU", "[cfdp][pdu]") {
 
     // invalid max size
     for (size_t invalidMaxSz = 0; invalidMaxSz < sz; invalidMaxSz++) {
-      deserializer.setData(kaBuffer.data(), invalidMaxSz);
-      result = deserializer.parseData();
-      REQUIRE(result != HasReturnvaluesIF::RETURN_OK);
+      ReturnValue_t setResult = deserializer.setData(kaBuffer.data(), invalidMaxSz);
+      if (setResult == HasReturnvaluesIF::RETURN_OK) {
+        result = deserializer.parseData();
+        REQUIRE(result != HasReturnvaluesIF::RETURN_OK);
+      }
     }
   }
 }
diff --git a/unittests/cfdp/testMetadataPdu.cpp b/unittests/cfdp/testMetadataPdu.cpp
index 19586604..4ea15451 100644
--- a/unittests/cfdp/testMetadataPdu.cpp
+++ b/unittests/cfdp/testMetadataPdu.cpp
@@ -2,6 +2,7 @@
 
 #include <array>
 #include <catch2/catch_test_macros.hpp>
+#include <iostream>
 
 #include "fsfw/cfdp/pdu/MetadataPduCreator.h"
 #include "fsfw/cfdp/pdu/MetadataPduReader.h"
@@ -172,8 +173,10 @@ TEST_CASE("Metadata PDU", "[cfdp][pdu]") {
     info.setOptionsArray(options.data(), &sizeOfOptions, nullptr);
     for (size_t maxSz = 0; maxSz < 46; maxSz++) {
       MetadataPduReader invalidSzDeser(mdBuffer.data(), maxSz, info);
-      result = invalidSzDeser.parseData();
-      REQUIRE(result == SerializeIF::STREAM_TOO_SHORT);
+      if (not invalidSzDeser.isNull()) {
+        result = invalidSzDeser.parseData();
+        REQUIRE(result == SerializeIF::STREAM_TOO_SHORT);
+      }
     }
   }
 }
diff --git a/unittests/cfdp/testPromptPdu.cpp b/unittests/cfdp/testPromptPdu.cpp
index 868f7140..93cb9a5d 100644
--- a/unittests/cfdp/testPromptPdu.cpp
+++ b/unittests/cfdp/testPromptPdu.cpp
@@ -59,9 +59,11 @@ TEST_CASE("Prompt PDU", "[cfdp][pdu]") {
     rawBuf[2] = 2;
 
     for (size_t invalidMaxSz = 0; invalidMaxSz < sz; invalidMaxSz++) {
-      deserializer.setData(rawBuf.data(), invalidMaxSz);
-      result = deserializer.parseData();
-      REQUIRE(result != HasReturnvaluesIF::RETURN_OK);
+      ReturnValue_t setResult = deserializer.setData(rawBuf.data(), invalidMaxSz);
+      if (setResult == result::OK) {
+        result = deserializer.parseData();
+        REQUIRE(result != HasReturnvaluesIF::RETURN_OK);
+      }
     }
   }
 }