PRIVATE->private and PROTECTED->protected updates in multiple Svc subdirectories (nasa#3446)

Svc/ActiveLogger/ActiveLoggerImpl.hpp

@@ -18,8 +18,8 @@ namespace Svc {
         public:
             ActiveLoggerImpl(const char* compName); //!< constructor
             virtual ~ActiveLoggerImpl(); //!< destructor
-        PROTECTED:
-        PRIVATE:
+        protected:
+        private:
             void LogRecv_handler(FwIndexType portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args);
             void loqQueue_internalInterfaceHandler(FwEventIdType id, const Fw::Time &timeTag, const Fw::LogSeverity& severity, const Fw::LogBuffer &args);
 

Svc/ActiveRateGroup/ActiveRateGroup.hpp

@@ -29,6 +29,9 @@ namespace Svc {
     //!
 
     class ActiveRateGroup final : public ActiveRateGroupComponentBase {
+
+        friend class ActiveRateGroupImplTester;
+
         public:
             static constexpr FwIndexType CONNECTION_COUNT_MAX = NUM_RATEGROUPMEMBEROUT_OUTPUT_PORTS;
 
@@ -58,7 +61,7 @@ namespace Svc {
 
             ~ActiveRateGroup();
 
-        PRIVATE:
+        private:
 
             //!  \brief Input cycle port handler
             //!

Svc/ActiveTextLogger/ActiveTextLogger.hpp

@@ -23,6 +23,8 @@ namespace Svc {
 
     class ActiveTextLogger final : public ActiveTextLoggerComponentBase {
 
+        friend class ActiveTextLoggerTester;
+
         public:
 
             //!  \brief Component constructor
@@ -52,7 +54,7 @@ namespace Svc {
             bool set_log_file(const char* fileName, const U32 maxSize, const U32 maxBackups = 10);
 
 
-        PRIVATE:
+        private:
 
         // ----------------------------------------------------------------------
         // Prohibit Copying

Svc/BufferManager/BufferManagerComponentImpl.hpp

@@ -56,6 +56,8 @@ namespace Svc
     class BufferManagerComponentImpl final : public BufferManagerComponentBase
     {
 
+    friend class BufferManagerTester;
+
     public:
 
         // ----------------------------------------------------------------------
@@ -98,7 +100,7 @@ namespace Svc
         //!
         ~BufferManagerComponentImpl();
 
-    PRIVATE :
+    private :
 
         // ----------------------------------------------------------------------
         // Handler implementations for user-defined typed input ports

Svc/ChronoTime/ChronoTime.hpp

@@ -24,7 +24,7 @@ class ChronoTime final : public ChronoTimeComponentBase {
     //! Destroy ChronoTime object
     ~ChronoTime();
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------

Svc/CmdDispatcher/CommandDispatcherImpl.hpp

@@ -30,6 +30,9 @@ namespace Svc {
     //! as the port that submitted the command, the command status will be returned.
 
     class CommandDispatcherImpl final : public CommandDispatcherComponentBase {
+
+        friend class CommandDispatcherImplTester;
+
         public:
             //!  \brief Command Dispatcher constructor
             //!
@@ -43,8 +46,8 @@ namespace Svc {
             //!
             //!  The destructor for this component is empty
             virtual ~CommandDispatcherImpl();
-        PROTECTED:
-        PRIVATE:
+        protected:
+        private:
             //!  \brief component command status handler
             //!
             //!  The command status handler is called when a component

Svc/CmdSplitter/CmdSplitter.hpp

@@ -31,7 +31,7 @@ class CmdSplitter final : public CmdSplitterComponentBase {
     //!
     void configure(const FwOpcodeType remoteBaseOpcode /*!< Base remote opcode*/);
 
-  PRIVATE:
+  private:
 
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports

Svc/ComQueue/ComQueue.hpp

@@ -187,15 +187,15 @@ class ComQueue final : public ComQueueComponentBase {
     //! Send a chosen Fw::Buffer
     //!
     void sendBuffer(Fw::Buffer& buffer,     //!< Reference to buffer to send
-                    FwIndexType queueIndex  //!< Index of the queue emitting the message  
+                    FwIndexType queueIndex  //!< Index of the queue emitting the message
     );
 
     //! Process the queues to select the next priority message
     //!
     void processQueue();
 
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Member variables
     // ----------------------------------------------------------------------

Svc/DpManager/DpManager.hpp

@@ -57,7 +57,7 @@ class DpManager final : public DpManagerComponentBase {
     //! Destroy the DpManager
     ~DpManager();
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------
@@ -86,7 +86,7 @@ class DpManager final : public DpManagerComponentBase {
                          U32 context                     //!< The call order
                          ) final;
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for commands
     // ----------------------------------------------------------------------
@@ -98,7 +98,7 @@ class DpManager final : public DpManagerComponentBase {
                                          U32 cmdSeq            //!< The command sequence number
                                          ) override;
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Private helper functions
     // ----------------------------------------------------------------------
@@ -111,7 +111,7 @@ class DpManager final : public DpManagerComponentBase {
                           Fw::Buffer& buffer    //!< The buffer (output)
     );
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Private member variables
     // ----------------------------------------------------------------------

Svc/DpWriter/DpWriter.hpp

@@ -18,6 +18,9 @@
 namespace Svc {
 
 class DpWriter final : public DpWriterComponentBase {
+
+  friend class DpWriterTester;
+
   public:
     // ----------------------------------------------------------------------
     // Construction, initialization, and destruction
@@ -36,7 +39,7 @@ class DpWriter final : public DpWriterComponentBase {
     void configure(const Fw::StringBase& dpFileNamePrefix  //!< The file name prefix for writing DP files
     );
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------
@@ -53,7 +56,7 @@ class DpWriter final : public DpWriterComponentBase {
                          U32 context                     //!< The call order
                          ) final;
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for commands
     // ----------------------------------------------------------------------
@@ -65,7 +68,7 @@ class DpWriter final : public DpWriterComponentBase {
                                          U32 cmdSeq            //!< The command sequence number
                                          ) final;
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Private helper functions
     // ----------------------------------------------------------------------
@@ -93,7 +96,7 @@ class DpWriter final : public DpWriterComponentBase {
                           FwSizeType packetSize                //!< The packet size
     );
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Private member variables
     // ----------------------------------------------------------------------

Svc/FatalHandler/FatalHandlerComponentImpl.hpp

@@ -37,7 +37,7 @@ namespace Svc {
       //!
       ~FatalHandlerComponentImpl();
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Handler implementations for user-defined typed input ports

Svc/GenericHub/GenericHubComponentImpl.hpp

@@ -46,7 +46,7 @@ class GenericHubComponentImpl final : public GenericHubComponentBase {
     //!
     ~GenericHubComponentImpl();
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------

Svc/Health/HealthComponentImpl.hpp

@@ -31,6 +31,8 @@ namespace Svc {
 
     class HealthImpl final : public HealthComponentBase {
 
+        friend class HealthTester;
+
         public:
             //!  \brief struct for ping entry
             //!
@@ -77,14 +79,14 @@ namespace Svc {
             //!  The destructor for HealthImpl is empty
             ~HealthImpl();
 
-        PROTECTED:
+        protected:
 
             //!  \brief additional checks function
             //!
             //!  Does additional checks based on the platform
             virtual void doOtherChecks();
 
-        PRIVATE:
+        private:
 
             //!  \brief ping return handler
             //!

Svc/LinuxTimer/LinuxTimerComponentImpl.hpp

@@ -44,7 +44,7 @@ namespace Svc {
       //! Quit timer
       void quit();
 
-    PRIVATE:
+    private:
 
       Os::Mutex m_mutex; //!< mutex for quit flag
 

Svc/OsTime/OsTime.hpp

@@ -32,7 +32,7 @@ class OsTime final : public OsTimeComponentBase {
     //! future Os::RawTime readings
     void set_epoch(const Fw::Time& fw_time, const Os::RawTime& os_time);
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------
@@ -49,7 +49,7 @@ class OsTime final : public OsTimeComponentBase {
                           const Fw::Time& fw_time,
                           const Os::RawTime& os_time) override;
 
-    
+
     //! Handler implementation for command SetCurrentTime
     void SetCurrentTime_cmdHandler(FwOpcodeType opCode, //!< The opcode
                                    U32 cmdSeq, //!< The command sequence number

Svc/PassiveRateGroup/PassiveRateGroup.hpp

@@ -53,7 +53,7 @@ class PassiveRateGroup final : public PassiveRateGroupComponentBase {
     //!  The destructor of the class is empty
     ~PassiveRateGroup();
 
-  PRIVATE:
+  private:
     //!  \brief Input cycle port handler
     //!
     //!  The cycle port handler calls each component in the rate group in turn,

Svc/RateGroupDriver/RateGroupDriver.hpp

@@ -31,6 +31,8 @@ namespace Svc {
 
     class RateGroupDriver final : public RateGroupDriverComponentBase {
 
+        friend class RateGroupDriverImplTester;
+
         public:
             //! Size of the divider table, provided as a constants to users passing the table in
             static const FwIndexType DIVIDER_SIZE = NUM_CYCLEOUT_OUTPUT_PORTS;
@@ -41,7 +43,7 @@ namespace Svc {
                 //! Initializes divisor and offset to 0 (unused)
                 Divider() : divisor(0), offset(0)
                 {}
-                //! Initializes divisor and offset to passed-in pair 
+                //! Initializes divisor and offset to passed-in pair
                 Divider(FwSizeType divisorIn, FwSizeType offsetIn) :
                     divisor(divisorIn), offset(offsetIn)
                 {}
@@ -76,7 +78,7 @@ namespace Svc {
 
             ~RateGroupDriver();
 
-        PRIVATE:
+        private:
 
             //! downcall for input port
             //! NOTE: This port can execute in ISR context.

Svc/SeqDispatcher/SeqDispatcher.hpp

@@ -30,7 +30,7 @@ class SeqDispatcher final : public SeqDispatcherComponentBase {
     //!
     ~SeqDispatcher();
 
-  PROTECTED:
+  protected:
 
     //! Handler for input port seqDoneIn
     void
@@ -50,7 +50,7 @@ class SeqDispatcher final : public SeqDispatcherComponentBase {
                           const Fw::StringBase& fileName //!< The sequence file
     );
 
-  PRIVATE:
+  private:
 
     // number of sequences dispatched (successful or otherwise)
     U32 m_dispatchedCount = 0;
@@ -71,8 +71,8 @@ class SeqDispatcher final : public SeqDispatcherComponentBase {
 
     FwIndexType getNextAvailableSequencerIdx();
 
-    void runSequence(FwIndexType sequencerIdx, 
-                     const Fw::StringBase& fileName, 
+    void runSequence(FwIndexType sequencerIdx,
+                     const Fw::StringBase& fileName,
                      Fw::Wait block);
 
     // ----------------------------------------------------------------------

Svc/StaticMemory/StaticMemoryComponentImpl.hpp

@@ -19,6 +19,9 @@
 namespace Svc {
 
 class StaticMemoryComponentImpl final : public StaticMemoryComponentBase {
+
+  friend class StaticMemoryTester;
+
   public:
     // ----------------------------------------------------------------------
     // Construction, initialization, and destruction
@@ -33,7 +36,7 @@ class StaticMemoryComponentImpl final : public StaticMemoryComponentBase {
     //!
     ~StaticMemoryComponentImpl();
 
-  PRIVATE:
+  private:
 
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports

Svc/SystemResources/SystemResources.hpp

@@ -37,7 +37,7 @@ class SystemResources final : public SystemResourcesComponentBase {
 
     typedef void (SystemResourcesComponentBase::*cpuTlmFunc)(F32, Fw::Time) const;
 
-    PRIVATE :
+    private :
 
         // ----------------------------------------------------------------------
         // Handler implementations for user-defined typed input ports

Svc/TlmChan/TlmChan.hpp

@@ -20,15 +20,18 @@
 namespace Svc {
 
 class TlmChan final : public TlmChanComponentBase {
+
+  friend class TlmChanTester;
+
   public:
     TlmChan(const char* compName);
     virtual ~TlmChan();
 
-  PROTECTED:
+  protected:
     // can be overridden for alternate algorithms
     virtual FwChanIdType doHash(FwChanIdType id);
 
-  PRIVATE:
+  private:
     // Port functions
     void TlmRecv_handler(FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val);
     Fw::TlmValid TlmGet_handler(FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val);

Svc/TlmPacketizer/TlmPacketizer.hpp

@@ -38,7 +38,7 @@ class TlmPacketizer final : public TlmPacketizerComponentBase {
     //!
     ~TlmPacketizer(void);
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------