@@ -8,7 +8,7 @@ using namespace libscratchcpp;
88namespace scratchcpprender
99{
1010
11- using ScriptMap = std::unordered_map<std::shared_ptr< Block> , std::shared_ptr<Script>>;
11+ using ScriptMap = std::unordered_map<Block * , std::shared_ptr<Script>>;
1212
1313class EngineMock : public IEngine
1414{
@@ -18,7 +18,7 @@ class EngineMock : public IEngine
1818
1919 MOCK_METHOD (void , start, (), (override ));
2020 MOCK_METHOD (void , stop, (), (override ));
21- MOCK_METHOD (Thread *, startScript, (std::shared_ptr< Block> , Target *), (override ));
21+ MOCK_METHOD (Thread *, startScript, (Block * , Target *), (override ));
2222 MOCK_METHOD (void , broadcast, (int , Thread *, bool ), (override ));
2323 MOCK_METHOD (void , broadcastByPtr, (Broadcast *, Thread *, bool ), (override ));
2424 MOCK_METHOD (void , startBackdropScripts, (Broadcast *, Thread *, bool ), (override ));
@@ -68,6 +68,8 @@ class EngineMock : public IEngine
6868
6969 MOCK_METHOD (void , clickTarget, (Target * target), (override ));
7070
71+ MOCK_METHOD (const StringPtr *, answer, (), (const , override ));
72+
7173 MOCK_METHOD (unsigned int , stageWidth, (), (const , override ));
7274 MOCK_METHOD (void , setStageWidth, (unsigned int ), (override ));
7375
@@ -86,32 +88,26 @@ class EngineMock : public IEngine
8688
8789 MOCK_METHOD (ITimer *, timer, (), (const , override ));
8890
89- MOCK_METHOD (unsigned int , functionIndex, (BlockFunc), (override ));
90- MOCK_METHOD (const std::vector<BlockFunc> &, blockFunctions, (), (const , override ));
91-
9291 MOCK_METHOD (void , addCompileFunction, (IExtension *, const std::string &, BlockComp), (override ));
9392 MOCK_METHOD (void , addHatPredicateCompileFunction, (IExtension *, const std::string &, HatPredicateCompileFunc), (override ));
9493 MOCK_METHOD (void , addMonitorNameFunction, (IExtension *, const std::string &, MonitorNameFunc), (override ));
9594 MOCK_METHOD (void , addMonitorChangeFunction, (IExtension *, const std::string &, MonitorChangeFunc), (override ));
9695 MOCK_METHOD (void , addHatBlock, (IExtension *, const std::string &), (override ));
97- MOCK_METHOD (void , addInput, (IExtension *, const std::string &, int ), (override ));
98- MOCK_METHOD (void , addField, (IExtension *, const std::string &, int ), (override ));
99- MOCK_METHOD (void , addFieldValue, (IExtension *, const std::string &, int ), (override ));
10096
10197 MOCK_METHOD (const std::vector<std::shared_ptr<Broadcast>> &, broadcasts, (), (const , override ));
10298 MOCK_METHOD (void , setBroadcasts, (const std::vector<std::shared_ptr<Broadcast>> &), (override ));
10399 MOCK_METHOD (std::shared_ptr<Broadcast>, broadcastAt, (int ), (const , override ));
104100 MOCK_METHOD (std::vector<int >, findBroadcasts, (const std::string &), (const , override ));
105101 MOCK_METHOD (int , findBroadcastById, (const std::string &), (const , override ));
106102
107- MOCK_METHOD (void , addWhenTouchingObjectScript, (std::shared_ptr< Block> ), (override ));
108- MOCK_METHOD (void , addGreenFlagScript, (std::shared_ptr< Block> ), (override ));
109- MOCK_METHOD (void , addBroadcastScript, (std::shared_ptr< Block> , Field *, Broadcast *), (override ));
110- MOCK_METHOD (void , addBackdropChangeScript, (std::shared_ptr< Block> , Field *), (override ));
111- MOCK_METHOD (void , addCloneInitScript, (std::shared_ptr< Block> ), (override ));
112- MOCK_METHOD (void , addKeyPressScript, (std::shared_ptr< Block> , Field *), (override ));
113- MOCK_METHOD (void , addTargetClickScript, (std::shared_ptr< Block> ), (override ));
114- MOCK_METHOD (void , addWhenGreaterThanScript, (std::shared_ptr< Block> ), (override ));
103+ MOCK_METHOD (void , addWhenTouchingObjectScript, (Block * ), (override ));
104+ MOCK_METHOD (void , addGreenFlagScript, (Block * ), (override ));
105+ MOCK_METHOD (void , addBroadcastScript, (Block * , Field *, Broadcast *), (override ));
106+ MOCK_METHOD (void , addBackdropChangeScript, (Block * , Field *), (override ));
107+ MOCK_METHOD (void , addCloneInitScript, (Block * ), (override ));
108+ MOCK_METHOD (void , addKeyPressScript, (Block * , Field *), (override ));
109+ MOCK_METHOD (void , addTargetClickScript, (Block * ), (override ));
110+ MOCK_METHOD (void , addWhenGreaterThanScript, (Block * ), (override ));
115111
116112 MOCK_METHOD (const std::vector<std::shared_ptr<Target>> &, targets, (), (const , override ));
117113 MOCK_METHOD (void , setTargets, (const std::vector<std::shared_ptr<Target>> &), (override ));
@@ -129,8 +125,8 @@ class EngineMock : public IEngine
129125
130126 MOCK_METHOD (const std::vector<std::shared_ptr<Monitor>> &, monitors, (), (const , override ));
131127 MOCK_METHOD (void , setMonitors, (const std::vector<std::shared_ptr<Monitor>> &), (override ));
132- MOCK_METHOD (Monitor *, createVariableMonitor, (std::shared_ptr<Variable>, const std::string &, const std::string &, int , BlockComp ), (override ));
133- MOCK_METHOD (Monitor *, createListMonitor, (std::shared_ptr<List>, const std::string &, const std::string &, int , BlockComp ), (override ));
128+ MOCK_METHOD (Monitor *, createVariableMonitor, (std::shared_ptr<Variable>, const std::string &, const std::string &), (override ));
129+ MOCK_METHOD (Monitor *, createListMonitor, (std::shared_ptr<List>, const std::string &, const std::string &), (override ));
134130 MOCK_METHOD (sigslot::signal<Monitor *> &, monitorAdded, (), (override ));
135131 MOCK_METHOD ((sigslot::signal<Monitor *, IMonitorHandler *> &), monitorRemoved, (), (override ));
136132
0 commit comments