Fix string records for data products

FppTest/dp/DpTest.cpp

@@ -15,19 +15,25 @@ namespace FppTest {
 // Construction, initialization, and destruction
 // ----------------------------------------------------------------------
 
-DpTest ::DpTest(const char* const compName,
-                U32 u32RecordData,
-                U16 dataRecordData,
-                const U8ArrayRecordData& u8ArrayRecordData,
-                const U32ArrayRecordData& u32ArrayRecordData,
-                const DataArrayRecordData& dataArrayRecordData)
+DpTest::DpTest(const char* const compName,
+               U32 u32RecordData,
+               U16 dataRecordData,
+               const U8ArrayRecordData& u8ArrayRecordData,
+               const U32ArrayRecordData& u32ArrayRecordData,
+               const DataArrayRecordData& dataArrayRecordData,
+               const Fw::StringBase& a_stringRecordData)
     : DpTestComponentBase(compName),
       u32RecordData(u32RecordData),
       dataRecordData(dataRecordData),
       u8ArrayRecordData(u8ArrayRecordData),
       u32ArrayRecordData(u32ArrayRecordData),
       dataArrayRecordData(dataArrayRecordData),
-      sendTime(Fw::ZERO_TIME) {}
+      stringRecordData(a_stringRecordData),
+      sendTime(Fw::ZERO_TIME) {
+    for (auto& elt : this->stringArrayRecordData) {
+        elt = &a_stringRecordData;
+    }
+}
 
 void DpTest ::init(const NATIVE_INT_TYPE queueDepth, const NATIVE_INT_TYPE instance) {
     DpTestComponentBase::init(queueDepth, instance);
@@ -50,6 +56,8 @@ void DpTest::schedIn_handler(const NATIVE_INT_TYPE portNum, U32 context) {
     this->dpRequest_Container4(CONTAINER_4_DATA_SIZE);
     // Request a buffer for Container 5
     this->dpRequest_Container5(CONTAINER_5_DATA_SIZE);
+    // Request a buffer for Container 6
+    this->dpRequest_Container6(CONTAINER_6_DATA_SIZE);
     // Get a buffer for Container 1
     {
         DpContainer container;
@@ -178,6 +186,37 @@ void DpTest ::dpRecv_Container5_handler(DpContainer& container, Fw::Success::T s
     }
 }
 
+void DpTest ::dpRecv_Container6_handler(DpContainer& container, Fw::Success::T status) {
+    if (status == Fw::Success::SUCCESS) {
+        auto serializeStatus = Fw::FW_SERIALIZE_OK;
+        for (FwSizeType i = 0; i < CONTAINER_6_DATA_SIZE; ++i) {
+            serializeStatus = container.serializeRecord_StringRecord(this->stringRecordData);
+            if (serializeStatus == Fw::FW_SERIALIZE_NO_ROOM_LEFT) {
+                break;
+            }
+            FW_ASSERT(serializeStatus == Fw::FW_SERIALIZE_OK, status);
+        }
+        // Use the time stamp from the time get port
+        this->dpSend(container);
+    }
+}
+
+void DpTest ::dpRecv_Container7_handler(DpContainer& container, Fw::Success::T status) {
+    if (status == Fw::Success::SUCCESS) {
+        auto serializeStatus = Fw::FW_SERIALIZE_OK;
+        for (FwSizeType i = 0; i < CONTAINER_7_DATA_SIZE; ++i) {
+            serializeStatus = container.serializeRecord_StringArrayRecord(
+                this->stringArrayRecordData, FW_NUM_ARRAY_ELEMENTS(this->stringArrayRecordData));
+            if (serializeStatus == Fw::FW_SERIALIZE_NO_ROOM_LEFT) {
+                break;
+            }
+            FW_ASSERT(serializeStatus == Fw::FW_SERIALIZE_OK, status);
+        }
+        // Use the time stamp from the time get port
+        this->dpSend(container);
+    }
+}
+
 // ----------------------------------------------------------------------
 // Private helper functions
 // ----------------------------------------------------------------------

FppTest/dp/DpTest.fpp

@@ -3,6 +3,12 @@ module FppTest {
   @ A component for testing data product code gen
   active component DpTest {
 
+    # ----------------------------------------------------------------------
+    # Constants
+    # ----------------------------------------------------------------------
+
+    constant stringSize = 80
+
     # ----------------------------------------------------------------------
     # Types
     # ----------------------------------------------------------------------
@@ -58,6 +64,12 @@ module FppTest {
     @ Record 5
     product record DataArrayRecord: Data array id 500
 
+    @ Record 6
+    product record StringRecord: string size stringSize id 600
+
+    @ Record 7
+    product record StringArrayRecord: string size stringSize array id 700
+
     # ----------------------------------------------------------------------
     # Containers
     # ----------------------------------------------------------------------
@@ -77,6 +89,12 @@ module FppTest {
     @ Container 5
     product container Container5 id 500 default priority 50
 
+    @ Container 6
+    product container Container6 id 600 default priority 60
+
+    @ Container 7
+    product container Container7 id 700 default priority 70
+
   }
 
 }

FppTest/dp/DpTest.hpp

@@ -10,10 +10,15 @@
 #include <array>
 
 #include "FppTest/dp/DpTestComponentAc.hpp"
+#include "Fw/Types/String.hpp"
 
 namespace FppTest {
 
 class DpTest : public DpTestComponentBase {
+
+    // Friend class for testing
+    friend class Tester;
+
   public:
     // ----------------------------------------------------------------------
     // Constants
@@ -29,6 +34,12 @@ class DpTest : public DpTestComponentBase {
     static constexpr FwSizeType CONTAINER_4_PACKET_SIZE = DpContainer::getPacketSizeForDataSize(CONTAINER_4_DATA_SIZE);
     static constexpr FwSizeType CONTAINER_5_DATA_SIZE = 1000;
     static constexpr FwSizeType CONTAINER_5_PACKET_SIZE = DpContainer::getPacketSizeForDataSize(CONTAINER_5_DATA_SIZE);
+    static constexpr FwSizeType CONTAINER_6_DATA_SIZE = 1000;
+    static constexpr FwSizeType CONTAINER_6_PACKET_SIZE = DpContainer::getPacketSizeForDataSize(CONTAINER_6_DATA_SIZE);
+    static constexpr FwSizeType CONTAINER_7_DATA_SIZE = 1000;
+    static constexpr FwSizeType CONTAINER_7_PACKET_SIZE = DpContainer::getPacketSizeForDataSize(CONTAINER_7_DATA_SIZE);
+
+    static constexpr FwSizeType STRING_ARRAY_RECORD_ARRAY_SIZE = 100;
 
   public:
     // ----------------------------------------------------------------------
@@ -38,19 +49,21 @@ class DpTest : public DpTestComponentBase {
     using U8ArrayRecordData = std::array<U8, 256>;
     using U32ArrayRecordData = std::array<U32, 100>;
     using DataArrayRecordData = std::array<DpTest_Data, 300>;
+    using PtrToConstStringBase = const Fw::StringBase*;
 
   public:
     // ----------------------------------------------------------------------
     // Construction, initialization, and destruction
     // ----------------------------------------------------------------------
 
     //! Construct object DpTest
-    DpTest(const char* const compName,                     //!< The component name
-           U32 u32RecordData,                              //!< The U32Record data
-           U16 dataRecordData,                             //!< The DataRecord data
-           const U8ArrayRecordData& u8ArrayRecordData,     //!< The U8ArrayRecord data
-           const U32ArrayRecordData& u32ArrayRecordData,   //!< The U32ArrayRecord data
-           const DataArrayRecordData& dataArrayRecordData  //!< The DataArrayRecord data
+    DpTest(const char* const compName,                      //!< The component name
+           U32 u32RecordData,                               //!< The U32Record data
+           U16 dataRecordData,                              //!< The DataRecord data
+           const U8ArrayRecordData& u8ArrayRecordData,      //!< The U8ArrayRecord data
+           const U32ArrayRecordData& u32ArrayRecordData,    //!< The U32ArrayRecord data
+           const DataArrayRecordData& dataArrayRecordData,  //!< The DataArrayRecord data
+           const Fw::StringBase& stringRecordData           //!< The StringRecord data
     );
 
     //! Initialize object DpTest
@@ -69,73 +82,82 @@ class DpTest : public DpTestComponentBase {
     //! Set the send time
     void setSendTime(Fw::Time time) { this->sendTime = time; }
 
-    PRIVATE :
-        // ----------------------------------------------------------------------
-        // Handler implementations for user-defined typed input ports
-        // ----------------------------------------------------------------------
-
-        //! Handler implementation for schedIn
-        void
-        schedIn_handler(const NATIVE_INT_TYPE portNum,  //!< The port number
-                        U32 context                     //!< The call order
-                        ) override;
-
-    PRIVATE :
-        // ----------------------------------------------------------------------
-        // Data product handler implementations
-        // ----------------------------------------------------------------------
-
-        //! Receive a data product container of type Container1
-        //! \return Serialize status
-        void
-        dpRecv_Container1_handler(DpContainer& container,  //!< The container
-                                  Fw::Success::T           //!< The container status
-                                  ) override;
+  private:
+    // ----------------------------------------------------------------------
+    // Handler implementations for user-defined typed input ports
+    // ----------------------------------------------------------------------
+
+    //! Handler implementation for schedIn
+    void schedIn_handler(const NATIVE_INT_TYPE portNum,  //!< The port number
+                         U32 context                     //!< The call order
+                         ) final;
+
+  private:
+    // ----------------------------------------------------------------------
+    // Data product handler implementations
+    // ----------------------------------------------------------------------
+
+    //! Receive a data product container of type Container1
+    //! \return Serialize status
+    void dpRecv_Container1_handler(DpContainer& container,  //!< The container
+                                   Fw::Success::T           //!< The container status
+                                   ) final;
 
     //! Receive a data product container of type Container2
     //! \return Serialize status
     void dpRecv_Container2_handler(DpContainer& container,  //!< The container
                                    Fw::Success::T           //!< The container status
-                                   ) override;
+                                   ) final;
 
     //! Receive a data product container of type Container3
     //! \return Serialize status
     void dpRecv_Container3_handler(DpContainer& container,  //!< The container
                                    Fw::Success::T           //!< The container status
-                                   ) override;
+                                   ) final;
 
     //! Receive a data product container of type Container4
     //! \return Serialize status
     void dpRecv_Container4_handler(DpContainer& container,  //!< The container
                                    Fw::Success::T           //!< The container status
-                                   ) override;
+                                   ) final;
 
     //! Receive a data product container of type Container5
     //! \return Serialize status
     void dpRecv_Container5_handler(DpContainer& container,  //!< The container
                                    Fw::Success::T           //!< The container status
-                                   ) override;
+                                   ) final;
 
-    PRIVATE :
-        // ----------------------------------------------------------------------
-        // Private helper functions
-        // ----------------------------------------------------------------------
+    //! Receive a data product container of type Container6
+    //! \return Serialize status
+    void dpRecv_Container6_handler(DpContainer& container,  //!< The container
+                                   Fw::Success::T           //!< The container status
+                                   ) final;
+
+    //! Receive a data product container of type Container7
+    //! \return Serialize status
+    void dpRecv_Container7_handler(DpContainer& container,  //!< The container
+                                   Fw::Success::T           //!< The container status
+                                   ) final;
+
+  private:
+    // ----------------------------------------------------------------------
+    // Private helper functions
+    // ----------------------------------------------------------------------
 
-        //! Check a container for validity
-        void
-        checkContainer(const DpContainer& container,  //!< The container
-                       FwDpIdType localId,            //!< The expected local id
-                       FwSizeType size,               //!< The expected size
-                       FwDpPriorityType priority      //!< The expected priority
-        ) const;
+    //! Check a container for validity
+    void checkContainer(const DpContainer& container,  //!< The container
+                        FwDpIdType localId,            //!< The expected local id
+                        FwSizeType size,               //!< The expected size
+                        FwDpPriorityType priority      //!< The expected priority
+    ) const;
 
-    PRIVATE :
-        // ----------------------------------------------------------------------
-        // Private member variables
-        // ----------------------------------------------------------------------
+  private:
+    // ----------------------------------------------------------------------
+    // Private member variables
+    // ----------------------------------------------------------------------
 
-        //! U32Record data
-        const U32 u32RecordData;
+    //! U32Record data
+    const U32 u32RecordData;
 
     //! DataRecord data
     const U16 dataRecordData;
@@ -149,6 +171,12 @@ class DpTest : public DpTestComponentBase {
     //! DataArrayRecord data
     const DataArrayRecordData& dataArrayRecordData;
 
+    //! StringRecord data
+    const Fw::StringBase& stringRecordData;
+
+    //! StringArrayRecord data
+    PtrToConstStringBase stringArrayRecordData[STRING_ARRAY_RECORD_ARRAY_SIZE];
+
     //! Send time for testing
     Fw::Time sendTime;
 };

FppTest/dp/test/ut/TestMain.cpp

@@ -74,6 +74,30 @@ TEST(productRecvIn, Container5_FAILURE) {
     tester.productRecvIn_Container5_FAILURE();
 }
 
+TEST(productRecvIn, Container6_SUCCESS) {
+    COMMENT("Receive Container6 SUCCESS");
+    Tester tester;
+    tester.productRecvIn_Container6_SUCCESS();
+}
+
+TEST(productRecvIn, Container6_FAILURE) {
+    COMMENT("Receive Container6 FAILURE");
+    Tester tester;
+    tester.productRecvIn_Container6_FAILURE();
+}
+
+TEST(productRecvIn, Container7_SUCCESS) {
+    COMMENT("Receive Container7 SUCCESS");
+    Tester tester;
+    tester.productRecvIn_Container7_SUCCESS();
+}
+
+TEST(productRecvIn, Container7_FAILURE) {
+    COMMENT("Receive Container7 FAILURE");
+    Tester tester;
+    tester.productRecvIn_Container7_FAILURE();
+}
+
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);
     STest::Random::seed();