clean up a few tests

src/fsfw/cfdp/definitions.h

@@ -42,17 +42,17 @@ enum ChecksumType {
   NULL_CHECKSUM = 15
 };
 
-enum PduType : bool { FILE_DIRECTIVE = 0, FILE_DATA = 1 };
+enum PduType : uint8_t { FILE_DIRECTIVE = 0, FILE_DATA = 1 };
 
-enum TransmissionModes : bool { ACKNOWLEDGED = 0, UNACKNOWLEDGED = 1 };
+enum TransmissionModes : uint8_t { ACKNOWLEDGED = 0, UNACKNOWLEDGED = 1 };
 
-enum SegmentMetadataFlag : bool { NOT_PRESENT = 0, PRESENT = 1 };
+enum SegmentMetadataFlag : bool { NOT_PRESENT = false, PRESENT = true };
 
-enum Direction : bool { TOWARDS_RECEIVER = 0, TOWARDS_SENDER = 1 };
+enum Direction : uint8_t { TOWARDS_RECEIVER = 0, TOWARDS_SENDER = 1 };
 
 enum SegmentationControl : bool {
-  NO_RECORD_BOUNDARIES_PRESERVATION = 0,
-  RECORD_BOUNDARIES_PRESERVATION = 1
+  NO_RECORD_BOUNDARIES_PRESERVATION = false,
+  RECORD_BOUNDARIES_PRESERVATION = true
 };
 
 enum WidthInBytes : uint8_t {
@@ -106,7 +106,7 @@ enum FinishedFileStatus {
   FILE_STATUS_UNREPORTED = 3
 };
 
-enum PromptResponseRequired : bool { PROMPT_NAK = 0, PROMPT_KEEP_ALIVE = 1 };
+enum PromptResponseRequired : uint8_t { PROMPT_NAK = 0, PROMPT_KEEP_ALIVE = 1 };
 
 enum TlvTypes : uint8_t {
   FILESTORE_REQUEST = 0x00,

src/fsfw/cfdp/pdu/PduConfig.cpp

@@ -1,12 +1,14 @@
 #include "PduConfig.h"
 
-PduConfig::PduConfig(cfdp::TransmissionModes mode, cfdp::TransactionSeqNum seqNum,
-                     cfdp::EntityId sourceId, cfdp::EntityId destId, bool crcFlag, bool largeFile,
+#include <utility>
+
+PduConfig::PduConfig(cfdp::EntityId sourceId, cfdp::EntityId destId, cfdp::TransmissionModes mode,
+                     cfdp::TransactionSeqNum seqNum, bool crcFlag, bool largeFile,
                      cfdp::Direction direction)
     : mode(mode),
-      seqNum(seqNum),
-      sourceId(sourceId),
-      destId(destId),
+      seqNum(std::move(seqNum)),
+      sourceId(std::move(sourceId)),
+      destId(std::move(destId)),
       crcFlag(crcFlag),
       largeFile(largeFile),
       direction(direction) {}

src/fsfw/cfdp/pdu/PduConfig.h

@@ -21,8 +21,8 @@ struct TransactionSeqNum : public VarLenField {
 
 class PduConfig {
  public:
-  PduConfig(cfdp::TransmissionModes mode, cfdp::TransactionSeqNum seqNum, cfdp::EntityId sourceId,
-            cfdp::EntityId destId, bool crcFlag = false, bool largeFile = false,
+  PduConfig(cfdp::EntityId sourceId, cfdp::EntityId destId, cfdp::TransmissionModes mode,
+            cfdp::TransactionSeqNum seqNum, bool crcFlag = false, bool largeFile = false,
             cfdp::Direction direction = cfdp::Direction::TOWARDS_RECEIVER);
   cfdp::TransmissionModes mode;
   cfdp::TransactionSeqNum seqNum;

src/fsfw/cfdp/pdu/VarLenField.cpp

@@ -118,3 +118,10 @@ ReturnValue_t cfdp::VarLenField::deSerialize(const uint8_t **buffer, size_t *siz
     }
   }
 }
+
+template <typename T>
+cfdp::VarLenField::VarLenField(UnsignedByteField<T> byteField)
+    : width(static_cast<WidthInBytes>(sizeof(T))) {
+  static_assert((sizeof(T) % 2) == 0);
+  value = byteField.getValue();
+}

src/fsfw/cfdp/pdu/VarLenField.h

@@ -4,9 +4,9 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../definitions.h"
+#include "fsfw/cfdp/definitions.h"
 #include "fsfw/serialize/SerializeIF.h"
-
+#include "fsfw/util/UnsignedByteField.h"
 namespace cfdp {
 
 class VarLenField : public SerializeIF {
@@ -19,6 +19,8 @@ class VarLenField : public SerializeIF {
   };
 
   VarLenField();
+  template <typename T>
+  explicit VarLenField(UnsignedByteField<T> byteField);
   VarLenField(cfdp::WidthInBytes width, size_t value);
 
   ReturnValue_t setValue(cfdp::WidthInBytes, size_t value);
@@ -26,13 +28,13 @@ class VarLenField : public SerializeIF {
   ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
                           Endianness streamEndianness) const override;
 
-  size_t getSerializedSize() const override;
+  [[nodiscard]] size_t getSerializedSize() const override;
 
   ReturnValue_t deSerialize(cfdp::WidthInBytes width, const uint8_t **buffer, size_t *size,
                             Endianness streamEndianness);
 
-  cfdp::WidthInBytes getWidth() const;
-  size_t getValue() const;
+  [[nodiscard]] cfdp::WidthInBytes getWidth() const;
+  [[nodiscard]] size_t getValue() const;
 
  private:
   ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,