Skip to content

Commit a587677

Browse files
bocchinobocchino
authored
Fix FppTest (#4410)
* Fix regression in FppTest * Rename SerializeBufferBase to LinearBufferBase * Revise FppTest Add missing tests to CMakeLists
1 parent a46fccf commit a587677

File tree

10 files changed

+43
-42
lines changed

10 files changed

+43
-42
lines changed

‎FppTestProject/FppTest/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ set(MOD_DEPS
2424
${PROJECT_NAME}/state_machine/external_instance
2525
${PROJECT_NAME}/state_machine/internal/initial
2626
${PROJECT_NAME}/state_machine/internal/state
27+
${PROJECT_NAME}/state_machine/internal_instance/choice
2728
${PROJECT_NAME}/state_machine/internal_instance/initial
2829
${PROJECT_NAME}/state_machine/internal_instance/state
2930
${PROJECT_NAME}/struct

‎FppTestProject/FppTest/component/active/test/ut/ActiveTestTester.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ class ActiveTestTester : public ActiveTestGTestBase {
8282

8383
//! Handler for from_serialOut
8484
//!
85-
void from_serialOut_handler(FwIndexType portNum, //!< The port number
86-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
85+
void from_serialOut_handler(FwIndexType portNum, //!< The port number
86+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
8787
) final;
8888

8989
public:

‎FppTestProject/FppTest/component/passive/PassiveTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ PassiveTest ::~PassiveTest() {}
2222
// Handler implementations for user-defined serial input ports
2323
// ----------------------------------------------------------------------
2424

25-
void PassiveTest ::serialGuarded_handler(FwIndexType portNum, //!< The port number
26-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
25+
void PassiveTest ::serialGuarded_handler(FwIndexType portNum, //!< The port number
26+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
2727
) {
2828
this->serializeStatus = this->serialOut_out(portNum, Buffer);
2929
}
3030

31-
void PassiveTest ::serialSync_handler(FwIndexType portNum, //!< The port number
32-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
31+
void PassiveTest ::serialSync_handler(FwIndexType portNum, //!< The port number
32+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
3333
) {
3434
this->serializeStatus = this->serialOut_out(portNum, Buffer);
3535
}

‎FppTestProject/FppTest/component/passive/PassiveTest.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ class PassiveTest : public PassiveTestComponentBase {
3232
// ----------------------------------------------------------------------
3333

3434
//! Handler implementation for serialGuarded
35-
void serialGuarded_handler(FwIndexType portNum, //!< The port number
36-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
35+
void serialGuarded_handler(FwIndexType portNum, //!< The port number
36+
Fw::LinearBufferBase& buffer //!< The serialization buffer
3737
) override;
3838

3939
//! Handler implementation for serialSync
40-
void serialSync_handler(FwIndexType portNum, //!< The port number
41-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
40+
void serialSync_handler(FwIndexType portNum, //!< The port number
41+
Fw::LinearBufferBase& buffer //!< The serialization buffer
4242
) override;
4343

4444
private:

‎FppTestProject/FppTest/component/passive/test/ut/PassiveTestTester.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ class PassiveTestTester : public PassiveTestGTestBase {
7171

7272
//! Handler for from_serialOut
7373
//!
74-
void from_serialOut_handler(FwIndexType portNum, //!< The port number
75-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
74+
void from_serialOut_handler(FwIndexType portNum, //!< The port number
75+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
7676
);
7777

7878
public:

‎FppTestProject/FppTest/component/queued/QueuedTest.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,38 @@ QueuedTest ::~QueuedTest() {}
2929
// Handler implementations for user-defined serial input ports
3030
// ----------------------------------------------------------------------
3131

32-
void QueuedTest ::serialAsync_handler(FwIndexType portNum, //!< The port number
33-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
32+
void QueuedTest ::serialAsync_handler(FwIndexType portNum, //!< The port number
33+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
3434
) {
3535
this->serializeStatus = this->serialOut_out(portNum, Buffer);
3636
}
3737

38-
void QueuedTest ::serialAsyncAssert_handler(FwIndexType portNum, //!< The port number
39-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
38+
void QueuedTest ::serialAsyncAssert_handler(FwIndexType portNum, //!< The port number
39+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
4040
) {
4141
this->serializeStatus = this->serialOut_out(SerialPortIndex::ENUM, Buffer);
4242
}
4343

44-
void QueuedTest ::serialAsyncBlockPriority_handler(FwIndexType portNum, //!< The port number
45-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
44+
void QueuedTest ::serialAsyncBlockPriority_handler(FwIndexType portNum, //!< The port number
45+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
4646
) {
4747
this->serializeStatus = this->serialOut_out(SerialPortIndex::ARRAY, Buffer);
4848
}
4949

50-
void QueuedTest ::serialAsyncDropPriority_handler(FwIndexType portNum, //!< The port number
51-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
50+
void QueuedTest ::serialAsyncDropPriority_handler(FwIndexType portNum, //!< The port number
51+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
5252
) {
5353
this->serializeStatus = this->serialOut_out(SerialPortIndex::STRUCT, Buffer);
5454
}
5555

56-
void QueuedTest ::serialGuarded_handler(FwIndexType portNum, //!< The port number
57-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
56+
void QueuedTest ::serialGuarded_handler(FwIndexType portNum, //!< The port number
57+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
5858
) {
5959
this->serializeStatus = this->serialOut_out(portNum, Buffer);
6060
}
6161

62-
void QueuedTest ::serialSync_handler(FwIndexType portNum, //!< The port number
63-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
62+
void QueuedTest ::serialSync_handler(FwIndexType portNum, //!< The port number
63+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
6464
) {
6565
this->serializeStatus = this->serialOut_out(portNum, Buffer);
6666
}

‎FppTestProject/FppTest/component/queued/QueuedTest.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ class QueuedTest : public QueuedTestComponentBase {
3838
// ----------------------------------------------------------------------
3939

4040
//! Handler implementation for serialAsync
41-
void serialAsync_handler(FwIndexType portNum, //!< The port number
42-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
41+
void serialAsync_handler(FwIndexType portNum, //!< The port number
42+
Fw::LinearBufferBase& buffer //!< The serialization buffer
4343
) override;
4444

4545
//! Handler implementation for serialAsyncAssert
46-
void serialAsyncAssert_handler(FwIndexType portNum, //!< The port number
47-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
46+
void serialAsyncAssert_handler(FwIndexType portNum, //!< The port number
47+
Fw::LinearBufferBase& buffer //!< The serialization buffer
4848
) override;
4949

5050
//! Handler implementation for serialAsyncBlockPriority
51-
void serialAsyncBlockPriority_handler(FwIndexType portNum, //!< The port number
52-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
51+
void serialAsyncBlockPriority_handler(FwIndexType portNum, //!< The port number
52+
Fw::LinearBufferBase& buffer //!< The serialization buffer
5353
) override;
5454

5555
//! Handler implementation for serialAsyncDropPriority
56-
void serialAsyncDropPriority_handler(FwIndexType portNum, //!< The port number
57-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
56+
void serialAsyncDropPriority_handler(FwIndexType portNum, //!< The port number
57+
Fw::LinearBufferBase& buffer //!< The serialization buffer
5858
) override;
5959

6060
//! Handler implementation for serialGuarded
61-
void serialGuarded_handler(FwIndexType portNum, //!< The port number
62-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
61+
void serialGuarded_handler(FwIndexType portNum, //!< The port number
62+
Fw::LinearBufferBase& buffer //!< The serialization buffer
6363
) override;
6464

6565
//! Handler implementation for serialSync
66-
void serialSync_handler(FwIndexType portNum, //!< The port number
67-
Fw::SerializeBufferBase& buffer //!< The serialization buffer
66+
void serialSync_handler(FwIndexType portNum, //!< The port number
67+
Fw::LinearBufferBase& buffer //!< The serialization buffer
6868
) override;
6969

7070
private:

‎FppTestProject/FppTest/component/tests/TesterHandlers.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ FormalParamStruct Tester ::from_structReturnOut_handler(const FwIndexType portNu
128128
// Handlers for serial from ports
129129
// ----------------------------------------------------------------------
130130

131-
void Tester ::from_serialOut_handler(FwIndexType portNum, //!< The port number
132-
Fw::SerializeBufferBase& Buffer //!< The serialization buffer
131+
void Tester ::from_serialOut_handler(FwIndexType portNum, //!< The port number
132+
Fw::LinearBufferBase& Buffer //!< The serialization buffer
133133
) {
134134
Fw::SerializeStatus status;
135135

‎FppTestProject/FppTest/state_machine/internal_instance/choice/ChoiceToChoiceTester.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool ChoiceToChoiceTester ::FppTest_SmChoice_ChoiceToChoice_guard_g2(
7373

7474
void ChoiceToChoiceTester ::smChoiceChoiceToChoice_stateMachineOverflowHook(SmId smId,
7575
FwEnumStoreType signal,
76-
Fw::SerializeBufferBase& buffer) {
76+
Fw::SerialBufferBase& buffer) {
7777
this->m_hookCalled = true;
7878
ASSERT_EQ(smId, SmId::smChoiceChoiceToChoice);
7979
ASSERT_EQ(static_cast<SmChoice_ChoiceToChoice::Signal>(signal), SmChoice_ChoiceToChoice::Signal::s);

‎FppTestProject/FppTest/state_machine/internal_instance/choice/ChoiceToChoiceTester.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ class ChoiceToChoiceTester : public ChoiceToChoiceComponentBase {
107107
// ----------------------------------------------------------------------
108108

109109
//! Overflow hook implementation for smChoiceChoiceToChoice
110-
void smChoiceChoiceToChoice_stateMachineOverflowHook(SmId smId, //!< The state machine ID
111-
FwEnumStoreType signal, //!< The signal
112-
Fw::SerializeBufferBase& buffer //!< The message buffer
110+
void smChoiceChoiceToChoice_stateMachineOverflowHook(SmId smId, //!< The state machine ID
111+
FwEnumStoreType signal, //!< The signal
112+
Fw::SerialBufferBase& buffer //!< The message buffer
113113
) override;
114114

115115
public:

0 commit comments

Comments
 (0)