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

Fix warning on TestStateMachine #23744

Merged
merged 3 commits into from
Nov 25, 2022
Merged

Fix warning on TestStateMachine #23744

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8df846c
Fix warning on TestStateMachine
cecille Nov 24, 2022
ba365d9
Merge branch 'master' into state_machine_test
cecille Nov 24, 2022
8f76443
Merge branch 'master' into state_machine_test
cecille Nov 24, 2022
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
29 changes: 18 additions & 11 deletions src/lib/support/tests/TestStateMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <lib/support/StateMachine.h>
#include <lib/support/UnitTestRegistration.h>
#include <lib/support/Variant.h>
#include <nlunit-test.h>

namespace {
Expand Down Expand Up @@ -64,28 +65,31 @@ struct BaseState
void LogTransition(const char * previous) { mMock.LogTransition(previous); }
const char * GetName() { return mName; }

chip::StateMachine::Context<Event> & mCtx;
Context * mCtx;
const char * mName;
MockState & mMock;
};

struct State1 : public BaseState
{
State1(Context & ctx, MockState & mock) : BaseState{ ctx, "State1", mock } {}
State1(Context * ctx, MockState & mock) : BaseState{ ctx, "State1", mock } {}
};

struct State2 : public BaseState
{
State2(Context & ctx, MockState & mock) : BaseState{ ctx, "State2", mock } {}
State2(Context * ctx, MockState & mock) : BaseState{ ctx, "State2", mock } {}
};

struct State3 : public BaseState
{
State3(Context & ctx, MockState & mock) : BaseState{ ctx, "State3", mock } {}
State3(Context * ctx, MockState & mock) : BaseState{ ctx, "State3", mock } {}
void Enter()
{
BaseState::Enter();
this->mCtx.Dispatch(Event::Create<Event5>());
if (this->mCtx)
{
this->mCtx->Dispatch(Event::Create<Event5>());
}
}
};

Expand All @@ -95,12 +99,12 @@ using State = chip::StateMachine::VariantState<State3, State2, State1>;

struct StateFactory
{
Context & mCtx;
Context * mCtx;
MockState ms1{ 0, 0, 0, nullptr };
MockState ms2{ 0, 0, 0, nullptr };
MockState ms3{ 0, 0, 0, nullptr };

StateFactory(Context & ctx) : mCtx(ctx) {}
StateFactory(Context * ctx) : mCtx(ctx) {}

auto CreateState1() { return State::Create<State1>(mCtx, ms1); }
auto CreateState2() { return State::Create<State2>(mCtx, ms2); }
Expand All @@ -109,9 +113,9 @@ struct StateFactory

struct Transitions
{
Context & mCtx;
Context * mCtx;
StateFactory mFactory;
Transitions(Context & ctx) : mCtx(ctx), mFactory(ctx) {}
Transitions(Context * ctx) : mCtx(ctx), mFactory(ctx) {}

using OptState = chip::StateMachine::Optional<State>;
State GetInitState() { return mFactory.CreateState1(); }
Expand All @@ -128,7 +132,10 @@ struct Transitions
if (state.Is<State1>() && event.Is<Event4>())
{
// legal - Dispatches event without transition
mCtx.Dispatch(Event::Create<Event2>());
if (mCtx)
{
mCtx->Dispatch(Event::Create<Event2>());
}
return {};
}
if (state.Is<State2>() && event.Is<Event4>())
Expand All @@ -155,7 +162,7 @@ class SimpleStateMachine
Transitions mTransitions;
chip::StateMachine::StateMachine<State, Event, Transitions> mStateMachine;

SimpleStateMachine() : mTransitions(mStateMachine), mStateMachine(mTransitions) {}
SimpleStateMachine() : mTransitions(&mStateMachine), mStateMachine(mTransitions) {}
~SimpleStateMachine() {}
};

Expand Down