@@ -386,8 +386,10 @@ TEST_F(MotionBlocksTest, PointTowardsImpl)
386
386
sprite.setY (std::round (sprite.y ()));
387
387
388
388
for (int i = 0 ; i < positions.size (); i++) {
389
- EXPECT_CALL (rng, randint (-240 , 240 )).WillOnce (Return (std::round (positions[i].first )));
390
- EXPECT_CALL (rng, randint (-180 , 180 )).WillOnce (Return (std::round (positions[i].second )));
389
+ EXPECT_CALL (m_engineMock, stageWidth ()).WillOnce (Return (640 ));
390
+ EXPECT_CALL (m_engineMock, stageHeight ()).WillOnce (Return (500 ));
391
+ EXPECT_CALL (rng, randint (-320 , 320 )).WillOnce (Return (std::round (positions[i].first )));
392
+ EXPECT_CALL (rng, randint (-250 , 250 )).WillOnce (Return (std::round (positions[i].second )));
391
393
392
394
// TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
393
395
vm.setBytecode (bytecode2);
@@ -449,8 +451,10 @@ TEST_F(MotionBlocksTest, PointTowardsImpl)
449
451
sprite.setY (std::round (sprite.y ()));
450
452
451
453
for (int i = 0 ; i < positions.size (); i++) {
452
- EXPECT_CALL (rng, randint (-240 , 240 )).WillOnce (Return (std::round (positions[i].first )));
453
- EXPECT_CALL (rng, randint (-180 , 180 )).WillOnce (Return (std::round (positions[i].second )));
454
+ EXPECT_CALL (m_engineMock, stageWidth ()).WillOnce (Return (640 ));
455
+ EXPECT_CALL (m_engineMock, stageHeight ()).WillOnce (Return (500 ));
456
+ EXPECT_CALL (rng, randint (-320 , 320 )).WillOnce (Return (std::round (positions[i].first )));
457
+ EXPECT_CALL (rng, randint (-250 , 250 )).WillOnce (Return (std::round (positions[i].second )));
454
458
455
459
// TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
456
460
vm.setBytecode (bytecode6);
@@ -590,8 +594,10 @@ TEST_F(MotionBlocksTest, GoToImpl)
590
594
ASSERT_EQ (sprite.y (), 45.2 );
591
595
592
596
// go to (join "_random_" "")
593
- EXPECT_CALL (rng, randint (-240 , 240 )).WillOnce (Return (-158 ));
594
- EXPECT_CALL (rng, randint (-180 , 180 )).WillOnce (Return (65 ));
597
+ EXPECT_CALL (m_engineMock, stageWidth ()).WillOnce (Return (640 ));
598
+ EXPECT_CALL (m_engineMock, stageHeight ()).WillOnce (Return (500 ));
599
+ EXPECT_CALL (rng, randint (-320 , 320 )).WillOnce (Return (-158 ));
600
+ EXPECT_CALL (rng, randint (-250 , 250 )).WillOnce (Return (65 ));
595
601
596
602
vm.setBytecode (bytecode2);
597
603
vm.run ();
@@ -633,8 +639,10 @@ TEST_F(MotionBlocksTest, GoToImpl)
633
639
ASSERT_EQ (sprite.y (), -170.6 );
634
640
635
641
// go to (random position)
636
- EXPECT_CALL (rng, randint (-240 , 240 )).WillOnce (Return (220 ));
637
- EXPECT_CALL (rng, randint (-180 , 180 )).WillOnce (Return (-16 ));
642
+ EXPECT_CALL (m_engineMock, stageWidth ()).WillOnce (Return (640 ));
643
+ EXPECT_CALL (m_engineMock, stageHeight ()).WillOnce (Return (500 ));
644
+ EXPECT_CALL (rng, randint (-320 , 320 )).WillOnce (Return (220 ));
645
+ EXPECT_CALL (rng, randint (-250 , 250 )).WillOnce (Return (-16 ));
638
646
639
647
vm.setBytecode (bytecode6);
640
648
vm.run ();
@@ -869,8 +877,10 @@ TEST_F(MotionBlocksTest, GlideToImpl)
869
877
EXPECT_CALL (m_engineMock, mouseY ()).WillOnce (Return (endY));
870
878
break ;
871
879
case 3 :
872
- EXPECT_CALL (rng, randint (-240 , 240 )).WillOnce (Return (std::round (endX)));
873
- EXPECT_CALL (rng, randint (-180 , 180 )).WillOnce (Return (std::round (endY)));
880
+ EXPECT_CALL (m_engineMock, stageWidth ()).WillOnce (Return (640 ));
881
+ EXPECT_CALL (m_engineMock, stageHeight ()).WillOnce (Return (500 ));
882
+ EXPECT_CALL (rng, randint (-320 , 320 )).WillOnce (Return (std::round (endX)));
883
+ EXPECT_CALL (rng, randint (-250 , 250 )).WillOnce (Return (std::round (endY)));
874
884
default :
875
885
break ;
876
886
}
0 commit comments