From 909a81bc877362b7bc3ed79c895a2591bed089c3 Mon Sep 17 00:00:00 2001 From: phosit Date: Mon, 24 Jul 2023 08:19:19 +0000 Subject: [PATCH] Correct syntax mistakes made in b7d776175b Accepted By: @vladislavbelov Differential Revision: https://code.wildfiregames.com/D5068 This was SVN commit r27781. --- source/network/tests/test_FSM.h | 110 ++++++++++++++++---------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/source/network/tests/test_FSM.h b/source/network/tests/test_FSM.h index eaae766394..0dba20590b 100644 --- a/source/network/tests/test_FSM.h +++ b/source/network/tests/test_FSM.h @@ -29,13 +29,13 @@ class TestFSM : public CxxTest::TestSuite }; template - static bool editGlobal(void* state, const CFsmEvent*) + static bool IncrementGlobal(void* state, const CFsmEvent*) { ++std::get(reinterpret_cast(state)->occurCount); return true; } - static bool editParam(void*, CFsmEvent* event) + static bool IncrementParam(void*, CFsmEvent* event) { ++*reinterpret_cast(event->GetParamRef()); return true; @@ -43,16 +43,16 @@ class TestFSM : public CxxTest::TestSuite enum class State : unsigned int { - zero, - one, - two + ZERO, + ONE, + TWO }; enum class Instruction : unsigned int { - toZero, - toOne, - toTwo + TO_ZERO, + TO_ONE, + TO_TWO }; public: @@ -73,7 +73,7 @@ public: // state one const auto cond = await nextInstruction(); - if (cond == instruction::toOne) + if (cond == instruction::TO_ONE) { //state two await nextInstruction(); @@ -81,42 +81,42 @@ public: } */ - FSMObject.AddTransition(static_cast(State::zero), - static_cast(Instruction::toOne), static_cast(State::one), - reinterpret_cast(&editGlobal<1>), static_cast(&globalState)); - FSMObject.AddTransition(static_cast(State::one), - static_cast(Instruction::toTwo), static_cast(State::two), - reinterpret_cast(&editGlobal<2>), static_cast(&globalState)); - FSMObject.AddTransition(static_cast(State::one), - static_cast(Instruction::toZero), static_cast(State::zero), - reinterpret_cast(&editGlobal<0>), static_cast(&globalState)); - FSMObject.AddTransition(static_cast(State::two), - static_cast(Instruction::toZero), static_cast(State::zero), - reinterpret_cast(&editGlobal<0>), static_cast(&globalState)); + FSMObject.AddTransition(static_cast(State::ZERO), + static_cast(Instruction::TO_ONE), static_cast(State::ONE), + reinterpret_cast(&IncrementGlobal<1>), static_cast(&globalState)); + FSMObject.AddTransition(static_cast(State::ONE), + static_cast(Instruction::TO_TWO), static_cast(State::TWO), + reinterpret_cast(&IncrementGlobal<2>), static_cast(&globalState)); + FSMObject.AddTransition(static_cast(State::ONE), + static_cast(Instruction::TO_ZERO), static_cast(State::ZERO), + reinterpret_cast(&IncrementGlobal<0>), static_cast(&globalState)); + FSMObject.AddTransition(static_cast(State::TWO), + static_cast(Instruction::TO_ZERO), static_cast(State::ZERO), + reinterpret_cast(&IncrementGlobal<0>), static_cast(&globalState)); - FSMObject.SetFirstState(static_cast(State::zero)); + FSMObject.SetFirstState(static_cast(State::ZERO)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toOne), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ONE), nullptr)); TS_ASSERT_EQUALS(std::get<1>(globalState.occurCount), 1); - TS_ASSERT_EQUALS(FSMObject.GetCurrState(), static_cast(State::one)); + TS_ASSERT_EQUALS(FSMObject.GetCurrState(), static_cast(State::ONE)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toTwo), nullptr)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toZero), nullptr)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toOne), nullptr)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toZero), nullptr)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toOne), nullptr)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toZero), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_TWO), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ZERO), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ONE), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ZERO), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ONE), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ZERO), nullptr)); TS_ASSERT_EQUALS(std::get<0>(globalState.occurCount), 3); TS_ASSERT_EQUALS(std::get<1>(globalState.occurCount), 3); TS_ASSERT_EQUALS(std::get<2>(globalState.occurCount), 1); // Some transitions do not exist. - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toZero), nullptr)); - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toTwo), nullptr)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toOne), nullptr)); - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toOne), nullptr)); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toTwo), nullptr)); - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toTwo), nullptr)); + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_ZERO), nullptr)); + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_TWO), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ONE), nullptr)); + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_ONE), nullptr)); + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_TWO), nullptr)); + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_TWO), nullptr)); TS_ASSERT_EQUALS(std::get<0>(globalState.occurCount), 3); TS_ASSERT_EQUALS(std::get<1>(globalState.occurCount), 4); TS_ASSERT_EQUALS(std::get<2>(globalState.occurCount), 2); @@ -128,33 +128,33 @@ public: CFsm FSMObject; // Equal to the FSM in test_global. - FSMObject.AddTransition(static_cast(State::zero), - static_cast(Instruction::toOne), static_cast(State::one), - reinterpret_cast(&editParam), nullptr); - FSMObject.AddTransition(static_cast(State::one), - static_cast(Instruction::toTwo), static_cast(State::two), - reinterpret_cast(&editParam), nullptr); - FSMObject.AddTransition(static_cast(State::one), - static_cast(Instruction::toZero), static_cast(State::zero), - reinterpret_cast(&editParam), nullptr); - FSMObject.AddTransition(static_cast(State::two), - static_cast(Instruction::toZero), static_cast(State::zero), - reinterpret_cast(&editParam), nullptr); + FSMObject.AddTransition(static_cast(State::ZERO), + static_cast(Instruction::TO_ONE), static_cast(State::ONE), + reinterpret_cast(&IncrementParam), nullptr); + FSMObject.AddTransition(static_cast(State::ONE), + static_cast(Instruction::TO_TWO), static_cast(State::TWO), + reinterpret_cast(&IncrementParam), nullptr); + FSMObject.AddTransition(static_cast(State::ONE), + static_cast(Instruction::TO_ZERO), static_cast(State::ZERO), + reinterpret_cast(&IncrementParam), nullptr); + FSMObject.AddTransition(static_cast(State::TWO), + static_cast(Instruction::TO_ZERO), static_cast(State::ZERO), + reinterpret_cast(&IncrementParam), nullptr); - FSMObject.SetFirstState(static_cast(State::zero)); + FSMObject.SetFirstState(static_cast(State::ZERO)); // Some transitions do not exist. - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toZero), + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_ZERO), static_cast(&std::get<0>(globalState.occurCount)))); - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toTwo), + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_TWO), static_cast(&std::get<2>(globalState.occurCount)))); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toOne), + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_ONE), static_cast(&std::get<1>(globalState.occurCount)))); - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toOne), + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_ONE), static_cast(&std::get<1>(globalState.occurCount)))); - TS_ASSERT(FSMObject.Update(static_cast(Instruction::toTwo), + TS_ASSERT(FSMObject.Update(static_cast(Instruction::TO_TWO), static_cast(&std::get<2>(globalState.occurCount)))); - TS_ASSERT(!FSMObject.Update(static_cast(Instruction::toTwo), + TS_ASSERT(!FSMObject.Update(static_cast(Instruction::TO_TWO), static_cast(&std::get<2>(globalState.occurCount)))); TS_ASSERT_EQUALS(std::get<0>(globalState.occurCount), 0); TS_ASSERT_EQUALS(std::get<1>(globalState.occurCount), 1);