Skip to content

Commit ec94941

Browse files
committed
Update random backdrop tests
1 parent 67dd84f commit ec94941

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

test/blocks/looks_blocks_test.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@ TEST_F(LooksBlocksTest, SwitchBackdropToImpl)
19921992
LooksBlocks::rng = &rng;
19931993

19941994
EXPECT_CALL(m_engineMock, startBackdropScripts(stage.costumeAt(3)->broadcast(), &thread, false));
1995-
EXPECT_CALL(rng, randint(0, 5)).WillOnce(Return(3));
1995+
EXPECT_CALL(rng, randintExcept(0, 5, 0)).WillOnce(Return(3));
19961996
stage.setCostumeIndex(0);
19971997
vm->setBytecode(bytecode15);
19981998
vm->run();
@@ -2001,7 +2001,7 @@ TEST_F(LooksBlocksTest, SwitchBackdropToImpl)
20012001
ASSERT_EQ(stage.costumeIndex(), 3);
20022002

20032003
EXPECT_CALL(m_engineMock, startBackdropScripts(stage.costumeAt(5)->broadcast(), &thread, false));
2004-
EXPECT_CALL(rng, randint(0, 5)).WillOnce(Return(5));
2004+
EXPECT_CALL(rng, randintExcept(0, 5, 3)).WillOnce(Return(5));
20052005
vm->reset();
20062006
vm->run();
20072007

@@ -2011,7 +2011,7 @@ TEST_F(LooksBlocksTest, SwitchBackdropToImpl)
20112011
stage.addCostume(std::make_shared<Costume>("random backdrop", "b7", "svg"));
20122012

20132013
EXPECT_CALL(m_engineMock, startBackdropScripts(stage.costumeAt(6)->broadcast(), &thread, false));
2014-
EXPECT_CALL(rng, randint).Times(0);
2014+
EXPECT_CALL(rng, randintExcept).Times(0);
20152015
vm->reset();
20162016
vm->run();
20172017

@@ -2337,7 +2337,7 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
23372337
LooksBlocks::rng = &rng;
23382338

23392339
EXPECT_CALL(m_engineMock, startBackdropScripts(stage.costumeAt(3)->broadcast(), &thread, true));
2340-
EXPECT_CALL(rng, randint(0, 5)).WillOnce(Return(3));
2340+
EXPECT_CALL(rng, randintExcept(0, 5, 0)).WillOnce(Return(3));
23412341
stage.setCostumeIndex(0);
23422342
vm->resolvePromise();
23432343
vm->setBytecode(bytecode15);
@@ -2349,7 +2349,7 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
23492349
ASSERT_EQ(stage.costumeIndex(), 3);
23502350

23512351
EXPECT_CALL(m_engineMock, startBackdropScripts(stage.costumeAt(5)->broadcast(), &thread, true));
2352-
EXPECT_CALL(rng, randint(0, 5)).WillOnce(Return(5));
2352+
EXPECT_CALL(rng, randintExcept(0, 5, 3)).WillOnce(Return(5));
23532353
vm->reset();
23542354
vm->run();
23552355
vm->resolvePromise();
@@ -2361,7 +2361,7 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
23612361
stage.addCostume(std::make_shared<Costume>("random backdrop", "b7", "svg"));
23622362

23632363
EXPECT_CALL(m_engineMock, startBackdropScripts(stage.costumeAt(6)->broadcast(), &thread, true));
2364-
EXPECT_CALL(rng, randint).Times(0);
2364+
EXPECT_CALL(rng, randintExcept).Times(0);
23652365
vm->reset();
23662366
vm->run();
23672367
vm->resolvePromise();
@@ -2488,16 +2488,17 @@ TEST_F(LooksBlocksTest, RandomBackdrop)
24882488
RandomGeneratorMock rng;
24892489
LooksBlocks::rng = &rng;
24902490

2491-
EXPECT_CALL(rng, randint).Times(0);
2491+
EXPECT_CALL(rng, randintExcept).Times(0);
24922492
vm->run();
24932493

24942494
ASSERT_EQ(vm->registerCount(), 0);
24952495

24962496
stage.addCostume(std::make_shared<Costume>("backdrop1", "b1", "svg"));
24972497
stage.addCostume(std::make_shared<Costume>("backdrop2", "b2", "svg"));
24982498
stage.addCostume(std::make_shared<Costume>("backdrop3", "b3", "svg"));
2499+
stage.setCostumeIndex(0);
24992500

2500-
EXPECT_CALL(rng, randint(0, 2)).WillOnce(Return(1));
2501+
EXPECT_CALL(rng, randintExcept(0, 2, 0)).WillOnce(Return(1));
25012502
EXPECT_CALL(m_engineMock, startBackdropScripts(stage.costumeAt(1)->broadcast(), &thread, false));
25022503
vm->reset();
25032504
vm->run();

0 commit comments

Comments
 (0)