Skip to content

Fix #394: Stop projects before starting them #412

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

Merged
merged 1 commit into from
Jan 7, 2024
Merged

Fix #394: Stop projects before starting them #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions src/engine/internal/engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,7 @@ void Engine::compile()

void Engine::start()
{
// NOTE: Running scripts should be deleted, but this method will probably be removed anyway
/*if (m_running)
finalize();*/

deleteClones();
stop();

m_eventLoopMutex.lock();
m_timer->reset();
Expand Down
65 changes: 44 additions & 21 deletions test/engine/engine_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,6 @@ TEST(EngineTest, WhenKeyPressed)
Project p("when_key_pressed.sb3");
ASSERT_TRUE(p.load());

p.run();

auto engine = p.engine();

Stage *stage = engine->stage();
Expand All @@ -400,12 +398,12 @@ TEST(EngineTest, WhenKeyPressed)

// space
engine->setKeyState("space", true);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
engine->setKeyState("space", false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
Expand All @@ -422,12 +420,12 @@ TEST(EngineTest, WhenKeyPressed)

// right arrow
engine->setKeyState("right arrow", true);
p.run();
engine->step();

ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
engine->setKeyState("right arrow", false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
Expand All @@ -444,12 +442,12 @@ TEST(EngineTest, WhenKeyPressed)

// right arrow - key object
engine->setKeyState(KeyEvent("right arrow"), true);
p.run();
engine->step();

ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 2);
engine->setKeyState("right arrow", false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
Expand All @@ -466,12 +464,12 @@ TEST(EngineTest, WhenKeyPressed)

// any key
engine->setAnyKeyPressed(true);
p.run();
engine->step();

ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 4);
engine->setAnyKeyPressed(false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
Expand All @@ -488,12 +486,12 @@ TEST(EngineTest, WhenKeyPressed)

// a
engine->setKeyState("a", true);
p.run();
engine->step();

ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 1);
engine->setKeyState("a", false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
Expand All @@ -510,12 +508,12 @@ TEST(EngineTest, WhenKeyPressed)

// x
engine->setKeyState("x", true);
p.run();
engine->step();

ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 1);
engine->setKeyState("x", false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
Expand All @@ -532,12 +530,12 @@ TEST(EngineTest, WhenKeyPressed)

// 4
engine->setKeyState("4", true);
p.run();
engine->step();

ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 1);
engine->setKeyState("4", false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
Expand All @@ -555,15 +553,15 @@ TEST(EngineTest, WhenKeyPressed)
// multiple
engine->setKeyState("space", true);
engine->setKeyState("x", true);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 2);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 2);
engine->setKeyState("space", false);
engine->setKeyState("x", false);
p.run();
engine->step();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 2);
Expand Down Expand Up @@ -1392,17 +1390,42 @@ TEST(EngineTest, ResetRunningHats)
engine->setKeyState(KeyEvent(KeyEvent::Type::Space), false);
engine->setKeyState(KeyEvent(KeyEvent::Type::Space), true);
engine->setKeyState(KeyEvent(KeyEvent::Type::Space), false);
engine->run();
engine->step();

ASSERT_VAR(stage, "test");
ASSERT_EQ(GET_VAR(stage, "test")->value().toInt(), 1);

engine->run();
engine->step();
ASSERT_EQ(GET_VAR(stage, "test")->value().toInt(), 1);

engine->setKeyState(KeyEvent(KeyEvent::Type::Space), true);
engine->setKeyState(KeyEvent(KeyEvent::Type::Space), false);
engine->run();
engine->step();

ASSERT_EQ(GET_VAR(stage, "test")->value().toInt(), 2);
}

TEST(EngineTest, StopBeforeStarting)
{
// Regtest for #394
Project p("regtest_projects/394_stop_before_starting.sb3");
ASSERT_TRUE(p.load());

auto engine = p.engine();

Stage *stage = engine->stage();
ASSERT_TRUE(stage);

engine->broadcast(0);
engine->step();

ASSERT_VAR(stage, "test");
ASSERT_FALSE(GET_VAR(stage, "test")->value().toBool());

GET_VAR(stage, "test")->setValue(true);
engine->broadcast(0);
engine->start();
engine->step();
ASSERT_VAR(stage, "test");
ASSERT_TRUE(GET_VAR(stage, "test")->value().toBool());
}
Binary file added test/regtest_projects/394_stop_before_starting.sb3
View file
Open in desktop
Binary file not shown.