Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReadHandler] Removal of test flags #28421

Merged
merged 6 commits into from
Aug 3, 2023
Merged

[ReadHandler] Removal of test flags #28421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d00fdce
Removed reportScheduler test flags and made TestReadInteractin.cpp wa…
lpbeliveau-silabs Jul 26, 2023
c7fb1d1
Restyled by clang-format
restyled-commits Jul 31, 2023
1f56ddb
Added a driveAndServiceIO after waiting for max in test where we shou…
lpbeliveau-silabs Aug 1, 2023
146cc01
Moved ctx.GetIOContext().DriveIO(); after each tests to garantee this…
lpbeliveau-silabs Aug 1, 2023
5c605c3
Implemented a mock clock in TestReadInteraction to reduce wait loops
lpbeliveau-silabs Aug 2, 2023
e7fe784
Removed more loops and added comment on loop left in the code
lpbeliveau-silabs Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 1 addition & 48 deletions src/app/reporting/ReportScheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,6 @@ class ReportScheduler : public ReadHandler::Observer, public ICDStateObserver
class ReadHandlerNode : public TimerContext
{
public:
#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
/// Test flags to allow TestReadInteraction to simulate expiration of the minimal and maximal intervals without
/// waiting
enum class TestFlags : uint8_t{
MinIntervalElapsed = (1 << 0),
MaxIntervalElapsed = (1 << 1),
};
void SetTestFlags(TestFlags aFlag, bool aValue) { mFlags.Set(aFlag, aValue); }
bool GetTestFlags(TestFlags aFlag) const { return mFlags.Has(aFlag); }
#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST

ReadHandlerNode(ReadHandler * aReadHandler, TimerDelegate * aTimerDelegate, ReportScheduler * aScheduler) :
mTimerDelegate(aTimerDelegate), mScheduler(aScheduler)
{
Expand All @@ -93,29 +82,12 @@ class ReportScheduler : public ReadHandler::Observer, public ICDStateObserver
{
Timestamp now = mTimerDelegate->GetCurrentMonotonicTimestamp();

#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
return (mReadHandler->IsGeneratingReports() && (now >= mMinTimestamp || mFlags.Has(TestFlags::MinIntervalElapsed)) &&
(mReadHandler->IsDirty() || (now >= mMaxTimestamp || mFlags.Has(TestFlags::MaxIntervalElapsed)) ||
now >= mSyncTimestamp));
#else
return (mReadHandler->IsGeneratingReports() &&
(now >= mMinTimestamp && (mReadHandler->IsDirty() || now >= mMaxTimestamp || now >= mSyncTimestamp)));
#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
}

bool IsEngineRunScheduled() const { return mEngineRunScheduled; }
void SetEngineRunScheduled(bool aEngineRunScheduled)
{
mEngineRunScheduled = aEngineRunScheduled;
#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
// If the engine becomes unscheduled, this means a run just took place so we reset the test flags
if (!mEngineRunScheduled)
{
mFlags.Set(TestFlags::MinIntervalElapsed, false);
mFlags.Set(TestFlags::MaxIntervalElapsed, false);
}
#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
}
void SetEngineRunScheduled(bool aEngineRunScheduled) { mEngineRunScheduled = aEngineRunScheduled; }

void SetIntervalTimeStamps(ReadHandler * aReadHandler)
{
Expand Down Expand Up @@ -146,9 +118,6 @@ class ReportScheduler : public ReadHandler::Observer, public ICDStateObserver
System::Clock::Timestamp GetSyncTimestamp() const { return mSyncTimestamp; }

private:
#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
BitFlags<TestFlags> mFlags;
#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
TimerDelegate * mTimerDelegate;
ReadHandler * mReadHandler;
ReportScheduler * mScheduler;
Expand Down Expand Up @@ -180,22 +149,6 @@ class ReportScheduler : public ReadHandler::Observer, public ICDStateObserver
size_t GetNumReadHandlers() const { return mNodesPool.Allocated(); }

#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
void RunNodeCallbackForHandler(const ReadHandler * aReadHandler)
{
ReadHandlerNode * node = FindReadHandlerNode(aReadHandler);
node->TimerFired();
}
void SetFlagsForHandler(const ReadHandler * aReadHandler, ReadHandlerNode::TestFlags aFlag, bool aValue)
{
ReadHandlerNode * node = FindReadHandlerNode(aReadHandler);
node->SetTestFlags(aFlag, aValue);
}

bool CheckFlagsForHandler(const ReadHandler * aReadHandler, ReadHandlerNode::TestFlags aFlag)
{
ReadHandlerNode * node = FindReadHandlerNode(aReadHandler);
return node->GetTestFlags(aFlag);
}
Timestamp GetMinTimestampForHandler(const ReadHandler * aReadHandler)
{
ReadHandlerNode * node = FindReadHandlerNode(aReadHandler);
Expand Down
Loading