@@ -8,7 +8,7 @@ using namespace libscratchcpp;
8
8
namespace scratchcpprender
9
9
{
10
10
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>>;
12
12
13
13
class EngineMock : public IEngine
14
14
{
@@ -18,7 +18,7 @@ class EngineMock : public IEngine
18
18
19
19
MOCK_METHOD (void , start, (), (override ));
20
20
MOCK_METHOD (void , stop, (), (override ));
21
- MOCK_METHOD (Thread *, startScript, (std::shared_ptr< Block> , Target *), (override ));
21
+ MOCK_METHOD (Thread *, startScript, (Block * , Target *), (override ));
22
22
MOCK_METHOD (void , broadcast, (int , Thread *, bool ), (override ));
23
23
MOCK_METHOD (void , broadcastByPtr, (Broadcast *, Thread *, bool ), (override ));
24
24
MOCK_METHOD (void , startBackdropScripts, (Broadcast *, Thread *, bool ), (override ));
@@ -68,6 +68,8 @@ class EngineMock : public IEngine
68
68
69
69
MOCK_METHOD (void , clickTarget, (Target * target), (override ));
70
70
71
+ MOCK_METHOD (const StringPtr *, answer, (), (const , override ));
72
+
71
73
MOCK_METHOD (unsigned int , stageWidth, (), (const , override ));
72
74
MOCK_METHOD (void , setStageWidth, (unsigned int ), (override ));
73
75
@@ -86,32 +88,26 @@ class EngineMock : public IEngine
86
88
87
89
MOCK_METHOD (ITimer *, timer, (), (const , override ));
88
90
89
- MOCK_METHOD (unsigned int , functionIndex, (BlockFunc), (override ));
90
- MOCK_METHOD (const std::vector<BlockFunc> &, blockFunctions, (), (const , override ));
91
-
92
91
MOCK_METHOD (void , addCompileFunction, (IExtension *, const std::string &, BlockComp), (override ));
93
92
MOCK_METHOD (void , addHatPredicateCompileFunction, (IExtension *, const std::string &, HatPredicateCompileFunc), (override ));
94
93
MOCK_METHOD (void , addMonitorNameFunction, (IExtension *, const std::string &, MonitorNameFunc), (override ));
95
94
MOCK_METHOD (void , addMonitorChangeFunction, (IExtension *, const std::string &, MonitorChangeFunc), (override ));
96
95
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 ));
100
96
101
97
MOCK_METHOD (const std::vector<std::shared_ptr<Broadcast>> &, broadcasts, (), (const , override ));
102
98
MOCK_METHOD (void , setBroadcasts, (const std::vector<std::shared_ptr<Broadcast>> &), (override ));
103
99
MOCK_METHOD (std::shared_ptr<Broadcast>, broadcastAt, (int ), (const , override ));
104
100
MOCK_METHOD (std::vector<int >, findBroadcasts, (const std::string &), (const , override ));
105
101
MOCK_METHOD (int , findBroadcastById, (const std::string &), (const , override ));
106
102
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 ));
115
111
116
112
MOCK_METHOD (const std::vector<std::shared_ptr<Target>> &, targets, (), (const , override ));
117
113
MOCK_METHOD (void , setTargets, (const std::vector<std::shared_ptr<Target>> &), (override ));
@@ -129,8 +125,8 @@ class EngineMock : public IEngine
129
125
130
126
MOCK_METHOD (const std::vector<std::shared_ptr<Monitor>> &, monitors, (), (const , override ));
131
127
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 ));
134
130
MOCK_METHOD (sigslot::signal<Monitor *> &, monitorAdded, (), (override ));
135
131
MOCK_METHOD ((sigslot::signal<Monitor *, IMonitorHandler *> &), monitorRemoved, (), (override ));
136
132
0 commit comments