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 Sprite unit test undefined behavior (gmock) #1183

Merged
merged 7 commits into from
Jan 2, 2025
Merged

Fix Sprite unit test undefined behavior (gmock) #1183

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a2fa33
Split off `SpriteCompleteSignal` test fixture from `Sprite` test fixture
DanRStevens Jan 2, 2025
87497a4
Split up unit tests for `SpriteCompleteSignal`
DanRStevens Jan 2, 2025
008e940
Re-organize looped unit test to reduce expectations
DanRStevens Jan 2, 2025
d44f1bb
Remove looped unit test
DanRStevens Jan 2, 2025
752c925
Use named `imageSize` constant for more readable code
DanRStevens Jan 2, 2025
eef3d1b
Use named `imageRect` constant for more readable code
DanRStevens Jan 2, 2025
f7f4bb2
Use named `anchorOffset` constant for more readable code
DanRStevens Jan 2, 2025
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
62 changes: 43 additions & 19 deletions test/Resource/Sprite.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ class Sprite : public ::testing::Test {
using Sprite::advanceByTimeDelta;
};

class MockHandler {
public:
MOCK_CONST_METHOD0(MockMethod, void());
};

uint32_t imageBuffer[1 * 1];
NAS2D::Image image{&imageBuffer, 4, {1, 1}};
NAS2D::AnimationSet::Frame frame{image, {{0, 0}, {1, 1}}, {0, 0}, 2};
NAS2D::AnimationSet::Frame frameStop{image, {{0, 0}, {1, 1}}, {0, 0}, 0};
static constexpr NAS2D::Vector imageSize{1, 1};
static constexpr NAS2D::Rectangle imageRect{{0, 0}, imageSize};
static constexpr NAS2D::Vector anchorOffset{0, 0};
uint32_t imageBuffer[imageSize.x * imageSize.y];
NAS2D::Image image{&imageBuffer, 4, imageSize};
NAS2D::AnimationSet::Frame frame{image, imageRect, anchorOffset, 2};
NAS2D::AnimationSet::Frame frameStop{image, imageRect, anchorOffset, 0};
NAS2D::AnimationSet testAnimationSet{{}, {{"defaultAction", {frame}}, {"frameStopAction", {frameStop}}}};
SpriteDerived sprite{testAnimationSet, "defaultAction"};
};
Expand All @@ -42,28 +40,54 @@ TEST_F(Sprite, advanceByTimeDelta) {
EXPECT_EQ(4u, sprite.advanceByTimeDelta(4u));
}

TEST_F(Sprite, animationCompleteSignal) {

class SpriteCompleteSignal : public Sprite {
protected:
class MockHandler {
public:
MOCK_CONST_METHOD0(MockMethod, void());
};

MockHandler handler{};
auto delegate = NAS2D::Delegate{&handler, &MockHandler::MockMethod};
sprite.animationCompleteSignalSource().connect(delegate);
NAS2D::Delegate<void()> delegate{&handler, &MockHandler::MockMethod};

void SetUp() override {
sprite.animationCompleteSignalSource().connect(delegate);
}
};


TEST_F(SpriteCompleteSignal, animationCompleteSignalNone) {
EXPECT_CALL(handler, MockMethod()).Times(0);
sprite.advanceByTimeDelta(0u);
sprite.advanceByTimeDelta(1u);
}

TEST_F(SpriteCompleteSignal, animationCompleteSignalOnceDelta2) {
EXPECT_CALL(handler, MockMethod());
sprite.advanceByTimeDelta(2u);
}

TEST_F(SpriteCompleteSignal, animationCompleteSignalOnceDelta3) {
EXPECT_CALL(handler, MockMethod());
sprite.advanceByTimeDelta(3u);
}

TEST_F(SpriteCompleteSignal, animationCompleteSignalTwice) {
EXPECT_CALL(handler, MockMethod()).Times(2);
sprite.advanceByTimeDelta(4u);
}

for (auto i = 0u; i <= 4u; ++i) {
sprite.play("frameStopAction");
EXPECT_CALL(handler, MockMethod());
sprite.advanceByTimeDelta(i);
EXPECT_CALL(handler, MockMethod()).Times(0);
sprite.advanceByTimeDelta(i);
}
TEST_F(SpriteCompleteSignal, animationCompleteSignalStopFrameDelta0) {
EXPECT_CALL(handler, MockMethod());
sprite.play("frameStopAction");
sprite.advanceByTimeDelta(0u); // Trigger handler
sprite.advanceByTimeDelta(0u); // No additional trigger
}

TEST_F(SpriteCompleteSignal, animationCompleteSignalStopFrameDelta4) {
EXPECT_CALL(handler, MockMethod());
sprite.play("frameStopAction");
sprite.advanceByTimeDelta(4u); // Trigger handler
sprite.advanceByTimeDelta(4u); // No additional trigger
}
Loading