Fixing UT constants to use correct types

LeStarch · Feb 14, 2025 · 9acb2bd · 9acb2bd
1 parent a5c853b
commit 9acb2bd
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 43 deletions.
diff --git a/Drv/StreamCrossover/test/ut/StreamCrossoverTester.hpp b/Drv/StreamCrossover/test/ut/StreamCrossoverTester.hpp
@@ -22,9 +22,9 @@ namespace Drv {
 
     public:
       // Maximum size of histories storing events, telemetry, and port outputs
-      static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+      static const U32 MAX_HISTORY_SIZE = 10;
       // Instance ID supplied to the component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+      static const FwEnumStoreType TEST_INSTANCE_ID = 0;
 
       //! Construct object StreamCrossoverTester
       //!

diff --git a/Drv/TcpClient/test/ut/TcpClientTester.hpp b/Drv/TcpClient/test/ut/TcpClientTester.hpp
@@ -25,11 +25,11 @@ namespace Drv {
     public TcpClientGTestBase
   {
       // Maximum size of histories storing events, telemetry, and port outputs
-      static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 1000;
+      static const U32 MAX_HISTORY_SIZE = 1000;
       // Instance ID supplied to the component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+      static const FwEnumStoreType TEST_INSTANCE_ID = 0;
       // Queue depth supplied to component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 100;
+      static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 100;
 
       // ----------------------------------------------------------------------
       // Construction and destruction

diff --git a/Drv/TcpServer/test/ut/TcpServerTester.hpp b/Drv/TcpServer/test/ut/TcpServerTester.hpp
@@ -25,11 +25,11 @@ namespace Drv {
     public TcpServerGTestBase
   {
       // Maximum size of histories storing events, telemetry, and port outputs
-      static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 1000;
+      static const U32 MAX_HISTORY_SIZE = 1000;
       // Instance ID supplied to the component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+      static const FwEnumStoreType TEST_INSTANCE_ID = 0;
       // Queue depth supplied to component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 100;
+      static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 100;
 
       // ----------------------------------------------------------------------
       // Construction and destruction

diff --git a/Drv/Udp/test/ut/UdpTester.hpp b/Drv/Udp/test/ut/UdpTester.hpp
@@ -25,11 +25,11 @@ namespace Drv {
     public UdpGTestBase
   {
       // Maximum size of histories storing events, telemetry, and port outputs
-      static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 1000;
+      static const U32 MAX_HISTORY_SIZE = 1000;
       // Instance ID supplied to the component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+      static const FwEnumStoreType TEST_INSTANCE_ID = 0;
       // Queue depth supplied to component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 100;
+      static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 100;
 
       // ----------------------------------------------------------------------
       // Construction and destruction

diff --git a/FppTest/component/active/test/ut/Tester.hpp b/FppTest/component/active/test/ut/Tester.hpp
@@ -27,11 +27,11 @@ class Tester : public ActiveTestGTestBase {
 
   public:
     // Maximum size of histories storing events, telemetry, and port outputs
-    static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 100;
+    static const U32 MAX_HISTORY_SIZE = 100;
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
     // Queue depth supplied to component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+    static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
     //! Construct object Tester
     //!

diff --git a/FppTest/component/empty/test/ut/Tester.hpp b/FppTest/component/empty/test/ut/Tester.hpp
@@ -17,9 +17,9 @@ class Tester : public EmptyGTestBase {
 
   public:
     // Maximum size of histories storing events, telemetry, and port outputs
-    static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+    static const U32 MAX_HISTORY_SIZE = 10;
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
 
     //! Construct object Tester
     //!

diff --git a/FppTest/component/passive/test/ut/Tester.hpp b/FppTest/component/passive/test/ut/Tester.hpp
@@ -25,11 +25,11 @@ class Tester : public PassiveTestGTestBase {
 
   public:
     // Maximum size of histories storing events, telemetry, and port outputs
-    static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 100;
+    static const U32 MAX_HISTORY_SIZE = 100;
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
     // Queue depth supplied to component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+    static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
     //! Construct object Tester
     //!

diff --git a/FppTest/component/queued/test/ut/Tester.hpp b/FppTest/component/queued/test/ut/Tester.hpp
@@ -26,11 +26,11 @@ class Tester : public QueuedTestGTestBase {
 
   public:
     // Maximum size of histories storing events, telemetry, and port outputs
-    static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 100;
+    static const U32 MAX_HISTORY_SIZE = 100;
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
     // Queue depth supplied to component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+    static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
     //! Construct object Tester
     //!

diff --git a/Ref/SignalGen/test/ut/SignalGenTester.hpp b/Ref/SignalGen/test/ut/SignalGenTester.hpp
@@ -27,11 +27,11 @@ namespace Ref {
 
     public:
       // Maximum size of histories storing events, telemetry, and port outputs
-      static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+      static const U32 MAX_HISTORY_SIZE = 10;
       // Instance ID supplied to the component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+      static const FwEnumStoreType TEST_INSTANCE_ID = 0;
       // Queue depth supplied to component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+      static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
       //! Construct object SignalGenTester
       //!

diff --git a/Svc/CmdSplitter/test/ut/CmdSplitterTester.hpp b/Svc/CmdSplitter/test/ut/CmdSplitterTester.hpp
@@ -19,9 +19,9 @@ class CmdSplitterTester : public CmdSplitterGTestBase {
 
   public:
     // Maximum size of histories storing events, telemetry, and port outputs
-    static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+    static const U32 MAX_HISTORY_SIZE = 10;
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
 
     //! Construct object CmdSplitterTester
     //!

diff --git a/Svc/ComQueue/test/ut/ComQueueTester.hpp b/Svc/ComQueue/test/ut/ComQueueTester.hpp
@@ -22,10 +22,10 @@ class ComQueueTester : public ComQueueGTestBase {
     // ----------------------------------------------------------------------
 
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
 
     // Queue depth supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+    static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
   private:
     // ----------------------------------------------------------------------

diff --git a/Svc/DpCatalog/test/ut/DpCatalogTester.hpp b/Svc/DpCatalog/test/ut/DpCatalogTester.hpp
@@ -23,13 +23,13 @@ namespace Svc {
         // ----------------------------------------------------------------------
 
         // Maximum size of histories storing events, telemetry, and port outputs
-        static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 100;
+        static const U32 MAX_HISTORY_SIZE = 100;
 
         // Instance ID supplied to the component instance under test
-        static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+        static const FwEnumStoreType TEST_INSTANCE_ID = 0;
 
         // Queue depth supplied to the component instance under test
-        static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+        static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
     public:
 

diff --git a/Svc/DpManager/test/ut/DpManagerTester.hpp b/Svc/DpManager/test/ut/DpManagerTester.hpp
@@ -20,11 +20,11 @@ class DpManagerTester : public DpManagerGTestBase {
     // ----------------------------------------------------------------------
 
     // Maximum size of histories storing events, telemetry, and port outputs
-    static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+    static const U32 MAX_HISTORY_SIZE = 10;
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
     // Queue depth supplied to component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+    static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
     //! Construct object DpManagerTester
     DpManagerTester();

diff --git a/Svc/DpWriter/test/ut/DpWriterTester.hpp b/Svc/DpWriter/test/ut/DpWriterTester.hpp
@@ -20,13 +20,13 @@ class DpWriterTester : public DpWriterGTestBase {
     // ----------------------------------------------------------------------
 
     // Maximum size of histories storing events, telemetry, and port outputs
-    static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+    static const U32 MAX_HISTORY_SIZE = 10;
 
     // Instance ID supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+    static const FwEnumStoreType TEST_INSTANCE_ID = 0;
 
     // Queue depth supplied to the component instance under test
-    static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+    static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
   public:
     // ----------------------------------------------------------------------

diff --git a/Svc/PolyDb/test/ut/PolyDbTester.hpp b/Svc/PolyDb/test/ut/PolyDbTester.hpp
@@ -23,10 +23,10 @@ namespace Svc {
       // ----------------------------------------------------------------------
 
       // Maximum size of histories storing events, telemetry, and port outputs
-      static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+      static const U32 MAX_HISTORY_SIZE = 10;
 
       // Instance ID supplied to the component instance under test
-      static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+      static const FwEnumStoreType TEST_INSTANCE_ID = 0;
 
     public:
 

diff --git a/Svc/SeqDispatcher/test/ut/SeqDispatcherTester.hpp b/Svc/SeqDispatcher/test/ut/SeqDispatcherTester.hpp
@@ -19,11 +19,11 @@ class SeqDispatcherTester : public SeqDispatcherGTestBase {
 
  public:
   // Maximum size of histories storing events, telemetry, and port outputs
-  static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10;
+  static const U32 MAX_HISTORY_SIZE = 10;
   // Instance ID supplied to the component instance under test
-  static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0;
+  static const FwEnumStoreType TEST_INSTANCE_ID = 0;
   // Queue depth supplied to component instance under test
-  static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10;
+  static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10;
 
   //! Construct object SeqDispatcherTester
   //!