Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected order of access specifiers in MockCommand class (#436)

Browse Source
This commit is contained in:
Tyler Veness
2017-01-02 00:44:35 -08:00
committed by Peter Johnson
parent 64eab1f7b3
commit 4b6dc9583a
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wpilibcIntegrationTests/include/command/MockCommand.h
View File

@@ -12,21 +12,6 @@
namespace frc {
class MockCommand : public Command {
private:
int32_t m_initializeCount;
int32_t m_executeCount;
int32_t m_isFinishedCount;
bool m_hasFinished;
int32_t m_endCount;
int32_t m_interruptedCount;
protected:
virtual void Initialize();
virtual void Execute();
virtual bool IsFinished();
virtual void End();
virtual void Interrupted();
public:
MockCommand();
int32_t GetInitializeCount() { return m_initializeCount; }
@@ -41,6 +26,21 @@ class MockCommand : public Command {
int32_t GetInterruptedCount() { return m_interruptedCount; }
bool HasInterrupted();
protected:
void Initialize() override;
void Execute() override;
bool IsFinished() override;
void End() override;
void Interrupted() override;
private:
int32_t m_initializeCount;
int32_t m_executeCount;
int32_t m_isFinishedCount;
bool m_hasFinished;
int32_t m_endCount;
int32_t m_interruptedCount;
};
} // namespace frc

12
wpilibcIntegrationTests/src/command/MockCommand.cpp
View File

@@ -18,6 +18,12 @@ MockCommand::MockCommand() {
m_interruptedCount = 0;
}
bool MockCommand::HasInitialized() { return GetInitializeCount() > 0; }
bool MockCommand::HasEnd() { return GetEndCount() > 0; }
bool MockCommand::HasInterrupted() { return GetInterruptedCount() > 0; }
void MockCommand::Initialize() { ++m_initializeCount; }
void MockCommand::Execute() { ++m_executeCount; }
@@ -30,9 +36,3 @@ bool MockCommand::IsFinished() {
void MockCommand::End() { ++m_endCount; }
void MockCommand::Interrupted() { ++m_interruptedCount; }
bool MockCommand::HasInitialized() { return GetInitializeCount() > 0; }
bool MockCommand::HasEnd() { return GetEndCount() > 0; }
bool MockCommand::HasInterrupted() { return GetInterruptedCount() > 0; }