Update FPP to v2.1.0a11 (nasa#2745)

* Code updates for FPP v2.1.0a11 * Fix link in data products docs * Remove uses of new To keep the leak checker happy * Revise string test * Replace F' with F Prime in data products docs
kevin-f-ortega · Jun 4, 2024 · ca08ac9 · ca08ac9
1 parent 5170217
commit ca08ac9
Show file tree

Hide file tree

Showing 47 changed files with 423 additions and 318 deletions.
diff --git a/FppTest/array/FormatTest.cpp b/FppTest/array/FormatTest.cpp
@@ -11,19 +11,19 @@
 // ======================================================================
 
 #include "FppTest/array/FormatBoolArrayAc.hpp"
-#include "FppTest/array/FormatU8ArrayAc.hpp"
-#include "FppTest/array/FormatU16DecArrayAc.hpp"
-#include "FppTest/array/FormatU32OctArrayAc.hpp"
-#include "FppTest/array/FormatU64HexArrayAc.hpp"
-#include "FppTest/array/FormatI8ArrayAc.hpp"
-#include "FppTest/array/FormatI16DecArrayAc.hpp"
-#include "FppTest/array/FormatI32OctArrayAc.hpp"
-#include "FppTest/array/FormatI64HexArrayAc.hpp"
+#include "FppTest/array/FormatCharArrayAc.hpp"
 #include "FppTest/array/FormatF32eArrayAc.hpp"
 #include "FppTest/array/FormatF32fArrayAc.hpp"
 #include "FppTest/array/FormatF64gArrayAc.hpp"
+#include "FppTest/array/FormatI16DecArrayAc.hpp"
+#include "FppTest/array/FormatI32OctArrayAc.hpp"
+#include "FppTest/array/FormatI64HexArrayAc.hpp"
+#include "FppTest/array/FormatI8ArrayAc.hpp"
 #include "FppTest/array/FormatStringArrayAc.hpp"
-#include "FppTest/array/FormatCharArrayAc.hpp"
+#include "FppTest/array/FormatU16DecArrayAc.hpp"
+#include "FppTest/array/FormatU32OctArrayAc.hpp"
+#include "FppTest/array/FormatU64HexArrayAc.hpp"
+#include "FppTest/array/FormatU8ArrayAc.hpp"
 #include "FppTest/utils/Utils.hpp"
 
 #include "gtest/gtest.h"
@@ -243,11 +243,11 @@ TEST_F(FormatTest, F64G) {
 }
 
 TEST_F(FormatTest, String) {
-    FormatString::StringSize80 testVals[FormatString::SIZE];
-    char buf[80];
+    Fw::ExternalString testVals[FormatString::SIZE];
+    char buf[FormatString::SIZE][FormatString::ELEMENT_BUFFER_SIZE];
     for (U32 i = 0; i < FormatString::SIZE; i++) {
-        FppTest::Utils::setString(buf, sizeof(buf));
-        testVals[i] = buf;   
+        testVals[i].setBuffer(&buf[i][0], sizeof buf[i]);
+        FppTest::Utils::setString(&buf[i][0], sizeof buf[i]);
     }
 
     FormatString a(testVals);

diff --git a/FppTest/array/README.md b/FppTest/array/README.md
@@ -2,11 +2,11 @@
 
 This directory contains unit tests for the FPP array code generator.
 
-* ArrayToStringTest: Tests array toString() and ostream operator functions
-* FormatTest: Tests FPP format strings
+* `ArrayToStringTest`: Tests array `toString()` and `ostream` operator functions
+* `FormatTest`: Tests FPP format strings
 
 To use this directory, you must have installed F Prime, and you must be inside 
 the F Prime Python virtual environment.
 
 * To build the tests, run `fprime-util build --ut`.
-* To run the tests, run `fprime-util check`.
+* To run the tests, run `fprime-util check`.
diff --git a/FppTest/array/main.cpp b/FppTest/array/main.cpp
@@ -14,12 +14,11 @@
 #include "FppTest/array/StringArrayAc.hpp"
 #include "FppTest/array/StructArrayAc.hpp"
 #include "FppTest/array/Uint32ArrayArrayAc.hpp"
-#include "FppTest/array/String100ArrayAc.hpp"
-
 #include "FppTest/typed_tests/ArrayTest.hpp"
 #include "FppTest/typed_tests/StringTest.hpp"
 #include "FppTest/utils/Utils.hpp"
-
+#include "Fw/Types/ExternalString.hpp"
+#include "Fw/Types/StringTemplate.hpp"
 #include "STest/Random/Random.hpp"
 #include "gtest/gtest.h"
 
@@ -56,13 +55,26 @@ void FppTest::Array::setTestVals<Enum>(E (&a)[Enum::SIZE]) {
     }
 }
 
+static char stringDefaultValsBuffer[::String::SIZE][::String::ELEMENT_BUFFER_SIZE];
+
+template<>
+void FppTest::Array::setDefaultVals<String>
+    (Fw::ExternalString (&a)[::String::SIZE]) {
+    for (U32 i = 0; i < ::String::SIZE; i++) {
+        char *const buffer = &stringDefaultValsBuffer[i][0];
+        a[i].setBuffer(buffer, ::String::ELEMENT_BUFFER_SIZE);
+    }
+}
+
+static char stringTestValsBuffer[::String::SIZE][::String::ELEMENT_BUFFER_SIZE];
+
 template<>
 void FppTest::Array::setTestVals<String>
-    (::String::StringSize80 (&a)[::String::SIZE]) {
-    char buf[80];
+    (Fw::ExternalString (&a)[::String::SIZE]) {
     for (U32 i = 0; i < ::String::SIZE; i++) {
-        FppTest::Utils::setString(buf, sizeof(buf));
-        a[i] = buf;
+        char *const buffer = &stringTestValsBuffer[i][0];
+        a[i].setBuffer(buffer, ::String::ELEMENT_BUFFER_SIZE);
+        FppTest::Utils::setString(buffer, ::String::ELEMENT_BUFFER_SIZE, 1);
     }
 }
 
@@ -97,7 +109,7 @@ Enum FppTest::Array::getMultiElementConstructedArray<Enum>
 
 template<>
 ::String FppTest::Array::getMultiElementConstructedArray<::String>
-    (::String::StringSize80 (&a)[::String::SIZE]) {
+    (Fw::ExternalString (&a)[::String::SIZE]) {
         return ::String(a[0], a[1], a[2]);
 }
 
@@ -116,28 +128,23 @@ Uint32Array FppTest::Array::getMultiElementConstructedArray<Uint32Array>
 // Specializations for serialized size
 template <>
 U32 FppTest::Array::getSerializedSize<::String>
-    (::String::StringSize80 (&a)[::String::SIZE]) {
+    (Fw::ExternalString (&a)[::String::SIZE]) {
     U32 serializedSize = 0;
 
     for (U32 i = 0; i < ::String::SIZE; i++) {
-        serializedSize += a[i].length() + sizeof(FwBuffSizeType);   
+        serializedSize += a[i].serializedSize();
     }
 
     return serializedSize;
 }
 
 // Instantiate string tests for arrays
 using StringTestImplementations = ::testing::Types<
-    String::StringSize80,
-    String100::StringSize100
+    Fw::StringTemplate<80>,
+    Fw::StringTemplate<100>
 >;
 INSTANTIATE_TYPED_TEST_SUITE_P(Array, StringTest, StringTestImplementations);
 
-template<>
-U32 FppTest::String::getSize<String100::StringSize100>() {
-    return 100;
-}
-
 int main(int argc, char* argv[]) {
     ::testing::InitGoogleTest(&argc, argv);
     STest::Random::seed();

diff --git a/FppTest/array/string.fpp b/FppTest/array/string.fpp
@@ -1,3 +1 @@
 array String = [3] string
-
-array String100 = [3] string size 100
diff --git a/FppTest/component/README.md b/FppTest/component/README.md
@@ -5,5 +5,14 @@ This directory contains unit tests for the FPP component code generator.
 To use this directory, you must have installed F Prime, and you must be inside 
 the F Prime Python virtual environment.
 
+The following subdirectories contain tests that you can run:
+
+* `active`: Active component tests
+* `passive`: Passive component tests
+* `queued`: Queued component tests
+* `empty`: Basic tests of an empty component
+
+In any of these directories, you can do the following:
+
 * To build the tests, run `fprime-util build --ut`.
 * To run the tests, run `fprime-util check`.
diff --git a/FppTest/component/active/ActiveTest.cpp b/FppTest/component/active/ActiveTest.cpp
@@ -104,10 +104,10 @@
   void ActiveTest ::
     stringArgsAsync_handler(
         const NATIVE_INT_TYPE portNum,
-        const str80String &str80,
-        str80RefString &str80Ref,
-        const str100String &str100,
-        str100RefString &str100Ref
+        const Fw::StringBase &str80,
+        Fw::StringBase &str80Ref,
+        const Fw::StringBase &str100,
+        Fw::StringBase &str100Ref
     )
   {
     this->stringArgsOut_out(
@@ -332,10 +332,10 @@
   void ActiveTest ::
     stringArgsGuarded_handler(
         const NATIVE_INT_TYPE portNum,
-        const str80String &str80,
-        str80RefString &str80Ref,
-        const str100String &str100,
-        str100RefString &str100Ref
+        const Fw::StringBase &str80,
+        Fw::StringBase &str80Ref,
+        const Fw::StringBase &str100,
+        Fw::StringBase &str100Ref
     )
   {
     this->stringArgsOut_out(
@@ -350,10 +350,10 @@
   void ActiveTest ::
     stringArgsSync_handler(
         const NATIVE_INT_TYPE portNum,
-        const str80String &str80,
-        str80RefString &str80Ref,
-        const str100String &str100,
-        str100RefString &str100Ref
+        const Fw::StringBase &str80,
+        Fw::StringBase &str80Ref,
+        const Fw::StringBase &str100,
+        Fw::StringBase &str100Ref
     )
   {
     this->stringArgsOut_out(

diff --git a/FppTest/component/active/ActiveTest.hpp b/FppTest/component/active/ActiveTest.hpp
@@ -203,28 +203,28 @@ class ActiveTest :
     //! Handler implementation for stringArgsAsync
     void stringArgsAsync_handler(
         NATIVE_INT_TYPE portNum, //!< The port number
-        const StringArgsPortStrings::StringSize80& str80, //!< A string of size 80
-        StringArgsPortStrings::StringSize80& str80Ref,
-        const StringArgsPortStrings::StringSize100& str100, //!< A string of size 100
-        StringArgsPortStrings::StringSize100& str100Ref
+        const Fw::StringBase& str80, //!< A string of size 80
+        Fw::StringBase& str80Ref,
+        const Fw::StringBase& str100, //!< A string of size 100
+        Fw::StringBase& str100Ref
     );
 
     //! Handler implementation for stringArgsGuarded
     void stringArgsGuarded_handler(
         NATIVE_INT_TYPE portNum, //!< The port number
-        const StringArgsPortStrings::StringSize80& str80, //!< A string of size 80
-        StringArgsPortStrings::StringSize80& str80Ref,
-        const StringArgsPortStrings::StringSize100& str100, //!< A string of size 100
-        StringArgsPortStrings::StringSize100& str100Ref
+        const Fw::StringBase& str80, //!< A string of size 80
+        Fw::StringBase& str80Ref,
+        const Fw::StringBase& str100, //!< A string of size 100
+        Fw::StringBase& str100Ref
     );
 
     //! Handler implementation for stringArgsSync
     void stringArgsSync_handler(
         NATIVE_INT_TYPE portNum, //!< The port number
-        const StringArgsPortStrings::StringSize80& str80, //!< A string of size 80
-        StringArgsPortStrings::StringSize80& str80Ref,
-        const StringArgsPortStrings::StringSize100& str100, //!< A string of size 100
-        StringArgsPortStrings::StringSize100& str100Ref
+        const Fw::StringBase& str80, //!< A string of size 80
+        Fw::StringBase& str80Ref,
+        const Fw::StringBase& str100, //!< A string of size 100
+        Fw::StringBase& str100Ref
     );
 
     //! Handler implementation for structArgsAsync

diff --git a/FppTest/component/active/test/ut/Tester.hpp b/FppTest/component/active/test/ut/Tester.hpp
@@ -76,7 +76,7 @@ class Tester : public ActiveTestGTestBase {
                                    FormalParamArray& aRef         /*!<
                                        An array ref
                                        */
-    );
+    ) final;
 
     //! Handler for from_arrayReturnOut
     //!
@@ -87,7 +87,7 @@ class Tester : public ActiveTestGTestBase {
                                                  FormalParamArray& aRef         /*!<
                                                      An array ref
                                                      */
-    );
+    ) final;
 
     //! Handler for from_enumArgsOut
     //!
@@ -98,7 +98,7 @@ class Tester : public ActiveTestGTestBase {
                                   FormalParamEnum& enRef         /*!<
                                       An enum ref
                                       */
-    );
+    ) final;
 
     //! Handler for from_enumReturnOut
     //!
@@ -109,17 +109,17 @@ class Tester : public ActiveTestGTestBase {
                                                FormalParamEnum& enRef         /*!<
                                                    An enum ref
                                                    */
-    );
+    ) final;
 
     //! Handler for from_noArgsOut
     //!
     void from_noArgsOut_handler(const NATIVE_INT_TYPE portNum /*!< The port number*/
-    );
+    ) final;
 
     //! Handler for from_noArgsReturnOut
     //!
     bool from_noArgsReturnOut_handler(const NATIVE_INT_TYPE portNum /*!< The port number*/
-    );
+    ) final;
 
     //! Handler for from_primitiveArgsOut
     //!
@@ -129,7 +129,7 @@ class Tester : public ActiveTestGTestBase {
                                        F32 f32,
                                        F32& f32Ref,
                                        bool b,
-                                       bool& bRef);
+                                       bool& bRef) final;
 
     //! Handler for from_primitiveReturnOut
     //!
@@ -139,7 +139,7 @@ class Tester : public ActiveTestGTestBase {
                                         F32 f32,
                                         F32& f32Ref,
                                         bool b,
-                                        bool& bRef);
+                                        bool& bRef) final;
 
     //! Handler for from_prmGetIn
     //!
@@ -150,7 +150,7 @@ class Tester : public ActiveTestGTestBase {
                                          Fw::ParamBuffer& val           /*!<
                                                Buffer containing serialized parameter value
                                                */
-    );
+    ) final;
 
     //! Handler for from_prmGetIn
     //!
@@ -161,19 +161,7 @@ class Tester : public ActiveTestGTestBase {
                                Fw::ParamBuffer& val           /*!<
                                      Buffer containing serialized parameter value
                                      */
-    );
-
-    //! Handler for from_stringArgsOut
-    //!
-    void from_stringArgsOut_handler(const NATIVE_INT_TYPE portNum, /*!< The port number*/
-                                    const str80String& str80,      /*!<
-                                     A string of size 80
-                                     */
-                                    str80RefString& str80Ref,
-                                    const str100String& str100, /*!<
-                                A string of size 100
-                                */
-                                    str100RefString& str100Ref);
+    ) final;
 
     //! Handler for from_structArgsOut
     //!
@@ -184,7 +172,7 @@ class Tester : public ActiveTestGTestBase {
                                     FormalParamStruct& sRef        /*!<
                                        A struct ref
                                        */
-    );
+    ) final;
 
     //! Handler for from_structReturnOut
     //!
@@ -195,7 +183,7 @@ class Tester : public ActiveTestGTestBase {
                                                    FormalParamStruct& sRef        /*!<
                                                       A struct ref
                                                       */
-    );
+    ) final;
 
   PRIVATE:
     // ----------------------------------------------------------------------
@@ -206,7 +194,7 @@ class Tester : public ActiveTestGTestBase {
     //!
     void from_serialOut_handler(NATIVE_INT_TYPE portNum,        /*!< The port number*/
                                 Fw::SerializeBufferBase& Buffer /*!< The serialization buffer*/
-    );
+    ) final;
 
   public:
     // ----------------------------------------------------------------------

diff --git a/FppTest/component/passive/.gitignore b/FppTest/component/passive/.gitignore
@@ -0,0 +1,5 @@
+FppTest_component_passive_ut_exe
+cached
+seed
+seed-history
+show-rules
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		array String = [3] string

		array String100 = [3] string size 100