DataProduct Catalog Runtime Insertion

.github/actions/spelling/expect.txt

@@ -631,7 +631,7 @@ strnlen
 subgrouping
 subhist
 subhistory
-subseconds
+subsecond
 subtopology
 suppr
 suseconds

.gitignore

@@ -4,6 +4,8 @@ build-artifacts/
 gtest/
 docs-cache/
 CMakePresets.json
+/DpTest*/
+/Testing/
 
 AutoXML/
 test_harness/src/test_harness-C/application.out
@@ -26,6 +28,7 @@ RemoteSystemsTempFiles
 *.stackdump
 Dict
 *.core
+*.swp
 
 **/coverage/
 *.gcov
@@ -58,6 +61,7 @@ test_harness/.autotools
 core
 
 *.swp4
+*dpState.dat
 
 *AppDictionary.xml
 *TopologyAppID.csv

Fw/Types/StringUtils.cpp

@@ -49,7 +49,7 @@
         return -1;
     }
     // Confirm that the output type can hold the range of valid results
-    FW_ASSERT(static_cast<FwSignedSizeType>(source_size - sub_size) <= std::numeric_limits<FwSignedSizeType>::max());
+    FW_ASSERT(source_size - sub_size <= static_cast<FwSizeType>(std::numeric_limits<FwSignedSizeType>::max()));
 
     // Loop from zero to source_size - sub_size (inclusive)
     for (FwSizeType source_index = 0;
@@ -73,3 +73,56 @@
     // if we make it here, no matches were found
     return -1;
 }
+
+FwSignedSizeType Fw::StringUtils::substring_find_last(const CHAR* source_string,
+                                                      FwSizeType source_size,
+                                                      const CHAR* sub_string,
+                                                      FwSizeType sub_size) {
+    FW_ASSERT(source_string != nullptr);
+    FW_ASSERT(sub_string != nullptr);
+
+    FwSizeType match_index = 0;
+
+    // zero size sub-strings should always match
+    if ((source_size > 0) && (0 == sub_size)) {
+        match_index = source_size - 1;
+
+        // Ensure we can represent the match_index in a signed num
+        FW_ASSERT(static_cast<FwSizeType>(static_cast<FwSignedSizeType>(match_index)) == match_index);
+
+        return static_cast<FwSignedSizeType>(match_index);
+    }
+
+    // Cannot find a substring larger than the source
+    if (source_size < sub_size) {
+        return -1;
+    }
+    // Confirm that the output type can hold the range of valid results
+    FW_ASSERT(source_size - sub_size <= static_cast<FwSizeType>(std::numeric_limits<FwSignedSizeType>::max()));
+
+    // Loop from source_size - sub_size to zero (inclusive)
+    for (FwSizeType ii = 0; ii <= (source_size - sub_size); ii++) {
+        const FwSizeType source_index = (source_size - sub_size) - ii;
+
+        // if the current character matches
+        for (FwSizeType sub_index = 0; sub_index < sub_size; sub_index++) {
+            // Prevent read overrun
+            FW_ASSERT((source_index + sub_index) < source_size);
+            // if there is a mismatch, go to next character
+            if (source_string[source_index + sub_index] != sub_string[sub_index]) {
+                break;
+            } else if (sub_index == (sub_size - 1)) {
+                // if we matched all the way to the end of the substring
+                match_index = source_index;
+
+                // Ensure the result converts properly
+                FW_ASSERT(static_cast<FwSizeType>(static_cast<FwSignedSizeType>(match_index)) == match_index);
+
+                return static_cast<FwSignedSizeType>(match_index);
+            }
+        }
+    }
+
+    // if we make it here, no matches were found
+    return -1;
+}

Fw/Types/StringUtils.hpp

@@ -52,6 +52,20 @@ FwSignedSizeType substring_find(const CHAR* source_string,
                                 const CHAR* sub_string,
                                 FwSizeType sub_size);
 
+/**
+ * \brief find the last occurrence of a substring
+ *
+ * \param source_string: string to search for the substring
+ * \param source_size: the size of the source string
+ * \param substring: string to search for
+ * \param sub_size: the size of the string to search for
+ * \return index of substring, -1 if not found
+ */
+FwSignedSizeType substring_find_last(const CHAR* source_string,
+                                     FwSizeType source_size,
+                                     const CHAR* sub_string,
+                                     FwSizeType sub_size);
+
 enum StringToNumberStatus {
     SUCCESSFUL_CONVERSION,  //!< Output should be valid
     NULL_INPUT,             //!< A null string was supplied

Fw/Types/test/ut/TypesTest.cpp

@@ -1373,6 +1373,12 @@ TEST(Nominal, sub_string_match_partway_1) {
     ASSERT_EQ(Fw::StringUtils::substring_find(source_string, 6, sub_string, 3), 2);
 }
 
+TEST(Nominal, sub_string_match_partway_first) {
+    const char* source_string = "abc123c123";
+    const char* sub_string = "c12";
+    ASSERT_EQ(Fw::StringUtils::substring_find(source_string, 10, sub_string, 3), 2);
+}
+
 TEST(OffNominal, sub_string_partial_match_begin) {
     const char* source_string = "abc123";
     const char* sub_string = "ab1";
@@ -1409,6 +1415,72 @@ TEST(OffNominal, sub_string_substring_zero_size) {
     ASSERT_EQ(Fw::StringUtils::substring_find(source_string, 6, sub_string, 0), 0);
 }
 
+TEST(OffNominal, sub_string_last_no_match) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "456";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), -1);
+}
+
+TEST(Nominal, sub_string_last_match_begin) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "abc";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), 0);
+}
+
+TEST(Nominal, sub_string_last_match_end) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "123";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), 3);
+}
+
+TEST(Nominal, sub_string_last_match_partway_1) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "c12";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), 2);
+}
+
+TEST(Nominal, sub_string_last_match_partway_last) {
+    const char* source_string = "abc123c123";
+    const char* sub_string_last = "c12";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 10, sub_string_last, 3), 6);
+}
+
+TEST(OffNominal, sub_string_last_partial_match_begin) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "ab1";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), -1);
+}
+
+TEST(OffNominal, sub_string_last_partial_match_middle) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "c13";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), -1);
+}
+
+TEST(OffNominal, sub_string_last_partial_match_end) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "234";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), -1);
+}
+
+TEST(Nominal, sub_string_last_exact_match) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "abc123";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 3), 0);
+}
+
+TEST(OffNominal, sub_string_last_source_zero_size) {
+    const char* source_string = "";
+    const char* sub_string_last = "234";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 0, sub_string_last, 3), -1);
+}
+
+TEST(OffNominal, sub_string_last_substring_zero_size) {
+    const char* source_string = "abc123";
+    const char* sub_string_last = "";
+    ASSERT_EQ(Fw::StringUtils::substring_find_last(source_string, 6, sub_string_last, 0), 5);
+}
+
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();

Svc/DpCatalog/.gitignore

@@ -0,0 +1,2 @@
+/DpTest*/
+dpState.dat

Svc/DpCatalog/CMakeLists.txt

@@ -2,35 +2,30 @@
 ####
 # F prime CMakeLists.txt:
 #
-# SOURCE_FILES: combined list of source and autocoding files
-# MOD_DEPS: (optional) module dependencies
-#
 # Note: using PROJECT_NAME as EXECUTABLE_NAME
 ####
-
-set(SOURCE_FILES
-  "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.cpp"
+register_fprime_module(
+  AUTOCODER_INPUTS
+    "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.fpp"
+  SOURCES
+    "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.cpp"
+  HEADERS
+    "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.hpp"
 )
-
-set(HEADER_FILES
-  "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.hpp"
-)
-
-
-register_fprime_module()
 ### UTs ###
-set(UT_MOD_DEPS
+register_fprime_ut(
+  AUTOCODER_INPUTS
+    "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.fpp"
+  SOURCES
+    "${CMAKE_CURRENT_LIST_DIR}/test/ut/DpCatalogTester.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/test/ut/DpCatalogTestMain.cpp"
+  DEPENDS
     STest
+  UT_AUTO_HELPERS
 )
-set(UT_SOURCE_FILES
-  "${CMAKE_CURRENT_LIST_DIR}/DpCatalog.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/DpCatalogTester.cpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/DpCatalogTesterHelpers.cpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/DpCatalogTestMain.cpp"
-)
-register_fprime_ut()
+
 set (UT_TARGET_NAME "${FPRIME_CURRENT_MODULE}_ut_exe")
 if (TARGET "${UT_TARGET_NAME}")
-    target_compile_options("${UT_TARGET_NAME}" PRIVATE -Wno-conversion)
+  target_compile_options("${UT_TARGET_NAME}" PRIVATE -Wno-conversion)
 endif()
+