Suppress gmock warnings

Author: adazem009

test/blocks/control_blocks_test.cpp

@@ -752,6 +752,7 @@ TEST_F(ControlBlocksTest, WaitImpl)
 
     std::chrono::steady_clock::time_point startTime(std::chrono::milliseconds(1000));
     EXPECT_CALL(clock, currentSteadyTime()).Times(2).WillRepeatedly(Return(startTime));
+    EXPECT_CALL(m_engineMock, requestRedraw());
     vm.run();
 
     ASSERT_EQ(vm.registerCount(), 0);
@@ -901,8 +902,10 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     vm.setFunctions(functions);
     vm.setConstValues(constValues);
 
+    Sprite *clone1;
     EXPECT_CALL(m_engineMock, targetAt(4)).WillOnce(Return(&sprite));
-    EXPECT_CALL(m_engineMock, initClone).Times(1);
+    EXPECT_CALL(m_engineMock, initClone).WillOnce(SaveArg<0>(&clone1));
+    EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode1);
     vm.run();
@@ -911,6 +914,7 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     ASSERT_EQ(sprite.allChildren().size(), 1);
 
     EXPECT_CALL(m_engineMock, initClone).Times(1);
+    EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode2);
     vm.run();
@@ -919,9 +923,11 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     ASSERT_EQ(sprite.allChildren().size(), 2);
     ASSERT_EQ(sprite.children(), sprite.allChildren());
 
+    Sprite *clone3;
     EXPECT_CALL(m_engineMock, findTarget).WillOnce(Return(4));
     EXPECT_CALL(m_engineMock, targetAt(4)).WillOnce(Return(&sprite));
-    EXPECT_CALL(m_engineMock, initClone).Times(1);
+    EXPECT_CALL(m_engineMock, initClone).WillOnce(SaveArg<0>(&clone3));
+    EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode3);
     vm.run();
@@ -931,13 +937,17 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     ASSERT_EQ(sprite.children(), sprite.allChildren());
 
     EXPECT_CALL(m_engineMock, initClone).Times(1);
+    EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode4);
     vm.run();
 
     ASSERT_EQ(vm.registerCount(), 0);
     ASSERT_EQ(sprite.allChildren().size(), 4);
     ASSERT_EQ(sprite.children(), sprite.allChildren());
+
+    EXPECT_CALL(m_engineMock, deinitClone(clone1));
+    EXPECT_CALL(m_engineMock, deinitClone(clone3));
 }
 
 TEST_F(ControlBlocksTest, StartAsClone)
@@ -980,13 +990,15 @@ TEST_F(ControlBlocksTest, DeleteThisCloneImpl)
 
     Sprite *clone;
     EXPECT_CALL(m_engineMock, initClone(_)).WillOnce(SaveArg<0>(&clone));
+    EXPECT_CALL(m_engineMock, requestRedraw());
     sprite.clone();
     ASSERT_TRUE(clone);
 
     VirtualMachine vm(clone, &m_engineMock, nullptr);
     vm.setFunctions(functions);
 
     EXPECT_CALL(m_engineMock, stopTarget(clone, nullptr)).Times(1);
+    EXPECT_CALL(m_engineMock, deinitClone(clone)).Times(2); // TODO: Is there a double-free?
 
     vm.setBytecode(bytecode);
     vm.run();

test/script/script_test.cpp

@@ -113,6 +113,7 @@ TEST_F(ScriptTest, Start)
     root.addList(list2);
 
     EXPECT_CALL(m_engine, initClone).Times(1);
+    EXPECT_CALL(m_engine, requestRedraw());
     auto clone = root.clone();
 
     Script script4(&root, &m_engine);
@@ -135,4 +136,6 @@ TEST_F(ScriptTest, Start)
     ASSERT_EQ(vm->variables()[1], clone->variableAt(clone->findVariableById("b"))->valuePtr());
     ASSERT_EQ(vm->lists()[0], lists[0]);
     ASSERT_EQ(vm->lists()[1], clone->listAt(clone->findListById("d")).get());
+
+    EXPECT_CALL(m_engine, deinitClone(clone.get()));
 }

test/target_interfaces/ispritehandler_test.cpp

@@ -30,6 +30,7 @@ TEST_F(ISpriteHandlerTest, Clone)
     Sprite *cloneArg;
     EXPECT_CALL(m_engine, initClone(_)).WillOnce(SaveArg<0>(&clone));
     EXPECT_CALL(m_handler, onCloned(_)).WillOnce(SaveArg<0>(&cloneArg));
+    EXPECT_CALL(m_engine, requestRedraw());
 
     m_sprite.clone();
     ASSERT_TRUE(clone);
@@ -46,6 +47,7 @@ TEST_F(ISpriteHandlerTest, Visible)
     m_sprite.setVisible(false);
 
     EXPECT_CALL(m_handler, onVisibleChanged(true)).Times(1);
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setVisible(true);
 }
 
@@ -55,10 +57,12 @@ TEST_F(ISpriteHandlerTest, X)
     EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(m_engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(m_engine, stageHeight()).WillOnce(Return(360));
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setX(189.46);
 
     EXPECT_CALL(m_handler, onXChanged(284.61)).Times(1);
     EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(false));
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setX(284.61);
 }
 
@@ -68,31 +72,37 @@ TEST_F(ISpriteHandlerTest, Y)
     EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(m_engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(m_engine, stageHeight()).WillOnce(Return(360));
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setY(-153.7);
 
     EXPECT_CALL(m_handler, onYChanged(207.08)).Times(1);
     EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(false));
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setY(207.08);
 }
 
 TEST_F(ISpriteHandlerTest, Size)
 {
     EXPECT_CALL(m_handler, onSizeChanged(53.8)).Times(1);
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setSize(53.8);
 }
 
 TEST_F(ISpriteHandlerTest, Direction)
 {
     EXPECT_CALL(m_handler, onDirectionChanged(179.715)).Times(1);
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setDirection(179.715);
 }
 
 TEST_F(ISpriteHandlerTest, RotationStyle)
 {
     EXPECT_CALL(m_handler, onRotationStyleChanged(Sprite::RotationStyle::DoNotRotate)).Times(1);
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setRotationStyle(Sprite::RotationStyle::DoNotRotate);
 
     EXPECT_CALL(m_handler, onRotationStyleChanged(Sprite::RotationStyle::LeftRight)).Times(1);
+    EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setRotationStyle(Sprite::RotationStyle::LeftRight);
 }