Reverting FPPTest to correctly working build

FppTest/component/active/CMakeLists.txt

@@ -35,7 +35,7 @@ set(UT_SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/port_types.fpp"
   "${CMAKE_CURRENT_LIST_DIR}/port_index_enums.fpp"
   "${CMAKE_CURRENT_LIST_DIR}/fpp_types.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/activeTester.cpp"
+  "${CMAKE_CURRENT_LIST_DIR}/test/ut/Tester.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/TestMain.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/Tests.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/TesterHandlers.cpp"

FppTest/component/active/test/ut/activeTester.cpp → FppTest/component/active/test/ut/Tester.cpp

@@ -5,14 +5,14 @@
 // ======================================================================
 
 #include "STest/Pick/Pick.hpp"
-#include "activeTester.hpp"
+#include "test/ut/Tester.hpp"
 
 // ----------------------------------------------------------------------
 // Construction and destruction
 // ----------------------------------------------------------------------
 
-activeTester ::activeTester()
-    : ActiveTestGTestBase("Tester", activeTester::MAX_HISTORY_SIZE),
+Tester ::Tester()
+    : ActiveTestGTestBase("Tester", Tester::MAX_HISTORY_SIZE),
       component("ActiveTest"),
       primitiveBuf(primitiveData, sizeof(primitiveData)),
       stringBuf(stringData, sizeof(stringData)),
@@ -26,14 +26,14 @@ activeTester ::activeTester()
     this->connectAsyncPorts();
 }
 
-activeTester ::~activeTester() {}
+Tester ::~Tester() {}
 
-void activeTester ::initComponents() {
+void Tester ::initComponents() {
     this->init();
-    this->component.init(activeTester::TEST_INSTANCE_QUEUE_DEPTH, activeTester::TEST_INSTANCE_ID);
+    this->component.init(Tester::TEST_INSTANCE_QUEUE_DEPTH, Tester::TEST_INSTANCE_ID);
 }
 
-Fw::ParamValid activeTester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
+Fw::ParamValid Tester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
     val.resetSer();
 
     Fw::SerializeStatus status;
@@ -78,7 +78,7 @@ Fw::ParamValid activeTester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNu
     return prmValid;
 }
 
-void activeTester ::from_prmSetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
+void Tester ::from_prmSetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
     Fw::SerializeStatus status;
     U32 id_base = component.getIdBase();
 

FppTest/component/active/test/ut/activeTester.hpp → FppTest/component/active/test/ut/Tester.hpp

@@ -19,7 +19,7 @@
 #include "FppTest/component/tests/TlmTests.hpp"
 #include "FppTest/component/types/FormalParamTypes.hpp"
 
-class activeTester : public ActiveTestGTestBase {
+class Tester : public ActiveTestGTestBase {
     // ----------------------------------------------------------------------
     // Construction and destruction
     // ----------------------------------------------------------------------
@@ -32,13 +32,13 @@ class activeTester : public ActiveTestGTestBase {
     // Queue depth supplied to component instance under test
     static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
 
-    //! Construct object activeTester
+    //! Construct object Tester
     //!
-    activeTester();
+    Tester();
 
-    //! Destroy object activeTester
+    //! Destroy object Tester
     //!
-    ~activeTester();
+    ~Tester();
 
   public:
     // ----------------------------------------------------------------------

FppTest/component/empty/CMakeLists.txt

@@ -29,8 +29,8 @@ set(UT_MOD_DEPS
 # UT_SOURCE_FILES: Sources for unit test
 set(UT_SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/empty.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/emptyTester.cpp"
+  "${CMAKE_CURRENT_LIST_DIR}/test/ut/Tester.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/test/ut/TesterHelpers.cpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/emptyTestMain.cpp"
+  "${CMAKE_CURRENT_LIST_DIR}/test/ut/TestMain.cpp"
 )
 register_fprime_ut()

FppTest/component/empty/test/ut/emptyTestMain.cpp → FppTest/component/empty/test/ut/TestMain.cpp

@@ -2,10 +2,10 @@
 // TestMain.cpp
 // ----------------------------------------------------------------------
 
-#include "emptyTester.hpp"
+#include "Tester.hpp"
 
 TEST(Nominal, ToDo) {
-    emptyTester tester;
+    Tester tester;
     tester.test();
 }
 

FppTest/component/empty/test/ut/emptyTester.cpp → FppTest/component/empty/test/ut/Tester.cpp

@@ -4,23 +4,23 @@
 // \brief  cpp file for Empty test harness implementation class
 // ======================================================================
 
-#include "emptyTester.hpp"
+#include "Tester.hpp"
 
 // ----------------------------------------------------------------------
 // Construction and destruction
 // ----------------------------------------------------------------------
 
-emptyTester ::emptyTester() : EmptyGTestBase("Tester", emptyTester::MAX_HISTORY_SIZE), component("Empty") {
+Tester ::Tester() : EmptyGTestBase("Tester", Tester::MAX_HISTORY_SIZE), component("Empty") {
     this->initComponents();
     this->connectPorts();
 }
 
-emptyTester ::~emptyTester() {}
+Tester ::~Tester() {}
 
 // ----------------------------------------------------------------------
 // Tests
 // ----------------------------------------------------------------------
 
-void emptyTester ::test() {
+void Tester ::test() {
     // Nothing else to test in an empty component
 }

FppTest/component/empty/test/ut/emptyTester.hpp → FppTest/component/empty/test/ut/Tester.hpp

@@ -10,7 +10,7 @@
 #include "EmptyGTestBase.hpp"
 #include "FppTest/component/empty/Empty.hpp"
 
-class emptyTester : public EmptyGTestBase {
+class Tester : public EmptyGTestBase {
     // ----------------------------------------------------------------------
     // Construction and destruction
     // ----------------------------------------------------------------------
@@ -21,13 +21,13 @@ class emptyTester : public EmptyGTestBase {
     // Instance ID supplied to the component instance under test
     static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
 
-    //! Construct object emptyTester
+    //! Construct object Tester
     //!
-    emptyTester();
+    Tester();
 
-    //! Destroy object emptyTester
+    //! Destroy object Tester
     //!
-    ~emptyTester();
+    ~Tester();
 
   public:
     // ----------------------------------------------------------------------

FppTest/component/empty/test/ut/TesterHelpers.cpp

@@ -6,15 +6,15 @@
 // NOTE: this file was automatically generated
 //
 // ======================================================================
-#include "emptyTester.hpp"
+#include "Tester.hpp"
 
 // ----------------------------------------------------------------------
 // Helper methods
 // ----------------------------------------------------------------------
 
-void emptyTester ::connectPorts() {}
+void Tester ::connectPorts() {}
 
-void emptyTester ::initComponents() {
+void Tester ::initComponents() {
     this->init();
-    this->component.init(emptyTester::TEST_INSTANCE_ID);
+    this->component.init(Tester::TEST_INSTANCE_ID);
 }

FppTest/component/passive/CMakeLists.txt

@@ -29,7 +29,7 @@ set(UT_MOD_DEPS
 # UT_SOURCE_FILES: Sources for unit test
 set(UT_SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/passive.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/passiveTester.cpp"
+  "${CMAKE_CURRENT_LIST_DIR}/test/ut/Tester.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/TestMain.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/Tests.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/TesterHandlers.cpp"

FppTest/component/passive/test/ut/passiveTester.cpp → FppTest/component/passive/test/ut/Tester.cpp

@@ -5,14 +5,14 @@
 // ======================================================================
 
 #include "STest/Pick/Pick.hpp"
-#include "passiveTester.hpp"
+#include "test/ut/Tester.hpp"
 
 // ----------------------------------------------------------------------
 // Construction and destruction
 // ----------------------------------------------------------------------
 
-passiveTester ::passiveTester()
-    : PassiveTestGTestBase("Tester", passiveTester::MAX_HISTORY_SIZE),
+Tester ::Tester()
+    : PassiveTestGTestBase("Tester", Tester::MAX_HISTORY_SIZE),
       component("PassiveTest"),
       primitiveBuf(primitiveData, sizeof(primitiveData)),
       stringBuf(stringData, sizeof(stringData)),
@@ -25,14 +25,14 @@ passiveTester ::passiveTester()
     this->connectPorts();
 }
 
-passiveTester ::~passiveTester() {}
+Tester ::~Tester() {}
 
-void passiveTester ::initComponents() {
+void Tester ::initComponents() {
     this->init();
-    this->component.init(passiveTester::TEST_INSTANCE_ID);
+    this->component.init(Tester::TEST_INSTANCE_ID);
 }
 
-Fw::ParamValid passiveTester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
+Fw::ParamValid Tester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
     val.resetSer();
 
     Fw::SerializeStatus status;
@@ -77,7 +77,7 @@ Fw::ParamValid passiveTester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portN
     return prmValid;
 }
 
-void passiveTester ::from_prmSetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
+void Tester ::from_prmSetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
     Fw::SerializeStatus status;
     U32 id_base = component.getIdBase();
 

FppTest/component/passive/test/ut/passiveTester.hpp → FppTest/component/passive/test/ut/Tester.hpp

@@ -18,7 +18,7 @@
 #include "FppTest/component/types/FormalParamTypes.hpp"
 #include "PassiveTestGTestBase.hpp"
 
-class passiveTester : public PassiveTestGTestBase {
+class Tester : public PassiveTestGTestBase {
     // ----------------------------------------------------------------------
     // Construction and destruction
     // ----------------------------------------------------------------------
@@ -31,13 +31,13 @@ class passiveTester : public PassiveTestGTestBase {
     // Queue depth supplied to component instance under test
     static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
 
-    //! Construct object passiveTester
+    //! Construct object Tester
     //!
-    passiveTester();
+    Tester();
 
-    //! Destroy object passiveTester
+    //! Destroy object Tester
     //!
-    ~passiveTester();
+    ~Tester();
 
   public:
     // ----------------------------------------------------------------------

FppTest/component/queued/CMakeLists.txt

@@ -29,7 +29,7 @@ set(UT_MOD_DEPS
 # UT_SOURCE_FILES: Sources for unit test
 set(UT_SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/queued.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/queuedTester.cpp"
+  "${CMAKE_CURRENT_LIST_DIR}/test/ut/Tester.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/TestMain.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/Tests.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/../tests/TesterHandlers.cpp"

FppTest/component/queued/test/ut/queuedTester.cpp → FppTest/component/queued/test/ut/Tester.cpp

@@ -5,14 +5,14 @@
 // ======================================================================
 
 #include "STest/Pick/Pick.hpp"
-#include "queuedTester.hpp"
+#include "test/ut/Tester.hpp"
 
 // ----------------------------------------------------------------------
 // Construction and destruction
 // ----------------------------------------------------------------------
 
-queuedTester ::queuedTester()
-    : QueuedTestGTestBase("Tester", queuedTester::MAX_HISTORY_SIZE),
+Tester ::Tester()
+    : QueuedTestGTestBase("Tester", Tester::MAX_HISTORY_SIZE),
       component("QueuedTest"),
       primitiveBuf(primitiveData, sizeof(primitiveData)),
       stringBuf(stringData, sizeof(stringData)),
@@ -26,14 +26,14 @@ queuedTester ::queuedTester()
     this->connectAsyncPorts();
 }
 
-queuedTester ::~queuedTester() {}
+Tester ::~Tester() {}
 
-void queuedTester ::initComponents() {
+void Tester ::initComponents() {
     this->init();
-    this->component.init(queuedTester::TEST_INSTANCE_QUEUE_DEPTH, queuedTester::TEST_INSTANCE_ID);
+    this->component.init(Tester::TEST_INSTANCE_QUEUE_DEPTH, Tester::TEST_INSTANCE_ID);
 }
 
-Fw::ParamValid queuedTester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
+Fw::ParamValid Tester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
     val.resetSer();
 
     Fw::SerializeStatus status;
@@ -78,7 +78,7 @@ Fw::ParamValid queuedTester ::from_prmGetIn_handler(const NATIVE_INT_TYPE portNu
     return prmValid;
 }
 
-void queuedTester ::from_prmSetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
+void Tester ::from_prmSetIn_handler(const NATIVE_INT_TYPE portNum, FwPrmIdType id, Fw::ParamBuffer& val) {
     Fw::SerializeStatus status;
     U32 id_base = component.getIdBase();
 

FppTest/component/queued/test/ut/queuedTester.hpp → FppTest/component/queued/test/ut/Tester.hpp

@@ -19,7 +19,7 @@
 #include "FppTest/component/types/FormalParamTypes.hpp"
 #include "QueuedTestGTestBase.hpp"
 
-class queuedTester : public QueuedTestGTestBase {
+class Tester : public QueuedTestGTestBase {
     // ----------------------------------------------------------------------
     // Construction and destruction
     // ----------------------------------------------------------------------
@@ -32,13 +32,13 @@ class queuedTester : public QueuedTestGTestBase {
     // Queue depth supplied to component instance under test
     static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
 
-    //! Construct object queuedTester
+    //! Construct object Tester
     //!
-    queuedTester();
+    Tester();
 
-    //! Destroy object queuedTester
+    //! Destroy object Tester
     //!
-    ~queuedTester();
+    ~Tester();
 
   public:
     // ----------------------------------------------------------------------

FppTest/component/queued/test/ut/TesterHelpers.cpp

@@ -6,13 +6,13 @@
 // NOTE: this file was automatically generated
 //
 // ======================================================================
-#include "queuedTester.hpp"
+#include "Tester.hpp"
 
 // ----------------------------------------------------------------------
 // Helper methods
 // ----------------------------------------------------------------------
 
-void queuedTester ::connectPorts() {
+void Tester ::connectPorts() {
     // arrayArgsAsyncBlockPriority
     this->connect_to_arrayArgsAsyncBlockPriority(0, this->component.get_arrayArgsAsyncBlockPriority_InputPort(0));
 
@@ -222,7 +222,7 @@ void queuedTester ::connectPorts() {
     this->connect_to_serialSync(0, this->component.get_serialSync_InputPort(0));
 }
 
-void queuedTester ::initComponents() {
+void Tester ::initComponents() {
     this->init();
-    this->component.init(queuedTester::TEST_INSTANCE_QUEUE_DEPTH, queuedTester::TEST_INSTANCE_ID);
+    this->component.init(Tester::TEST_INSTANCE_QUEUE_DEPTH, Tester::TEST_INSTANCE_ID);
 }