Skip to content

Conversation

@m-aleem
Copy link
Contributor

@m-aleem m-aleem commented Jun 23, 2025

Related Issue(s) #3446
Has Unit Tests (y/n) Yes - Existing
Documentation Included (y/n) N/A

Change Description

I locally updated fprime/cmake/settings.cmake to change -DPROTECTED=protected -DPRIVATE=private. This causes additional build errors beyond all our updates in manual code for PRIVATE->private and PROTECTED->protected due to auto-coded files which use PRIVATE, PROTECTED. This set of changes is associated with fixing Svc/ActiveRateGroup so that the UTs in this directory can build and pass.

Approach in this case was:

  1. mv ActiveRateGroupTester.cpp ActiveRateGroupTestMain.cpp
  2. mv ActiveRateGroupImplTester.hpp ActiveRateGroupTester.hpp
  3. mv ActiveRateGroupImplTester.cpp ActiveRateGroupTester.cpp
  4. Change ActiveRateGroupImplTester to ActiveRateGroupTester where applicable in files content of the files above
  5. Change friend of ActivateRateGroup from ActiveRateGroupImplTester in ActiveRateGroup.hpp to ActiveRateGroupTester (to match friend class name pattern)
  6. Use public (instead of protected/private) methods/members of ActiveRateGroup in ActiveRateGroupTestMain

Rationale

#3446

Future Work

  1. Note that this PR does not include the update to fprime/cmake/settings.cmake itself - this will be done at the end
  2. Note that this PR does not include re-naming the flight code <X>Impl to <X> (separate issue)

public:
ActiveRateGroupImplTester(Svc::ActiveRateGroup& inst);
virtual ~ActiveRateGroupImplTester();
ActiveRateGroupTester(Svc::ActiveRateGroup& inst);

Check warning

Code scanning / CppCheck

Single-parameter constructors should be marked explicit. Warning test

Single-parameter constructors should be marked explicit.
@m-aleem m-aleem closed this Jun 23, 2025
@m-aleem m-aleem reopened this Jun 23, 2025
@m-aleem m-aleem changed the title Updates for Svc/ActiveRateGroup corresponding to UT cmake udpate for protected/private Updates for Svc/ActiveRateGroup corresponding to UT cmake update for protected/private Jun 24, 2025
@m-aleem m-aleem closed this Jun 24, 2025
…protected/private by updating driver name and updating ActiveRateGroupImplTester to ActiveRateGroupTester
@m-aleem m-aleem reopened this Jun 24, 2025
@m-aleem m-aleem marked this pull request as ready for review June 24, 2025 19:36
@m-aleem m-aleem requested a review from LeStarch June 24, 2025 19:36
@LeStarch LeStarch merged commit 07f418b into nasa:devel Jun 25, 2025
50 checks passed
@m-aleem m-aleem deleted the devel-3446-ac branch June 25, 2025 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants