Implement monitor methods

Author: adazem009

include/scratchcpp/imonitorhandler.h

@@ -17,8 +17,7 @@ class LIBSCRATCHCPP_EXPORT IMonitorHandler
 
         virtual void init(Monitor *monitor) = 0;
 
-        // TODO: Add onValueChanged()
-        // virtual void onValueChanged(const VirtualMachine *vm) = 0;
+        virtual void onValueChanged(const Value &value) = 0;
         virtual void onXChanged(int x) = 0;
         virtual void onYChanged(int y) = 0;
         virtual void onVisibleChanged(bool visible) = 0;

include/scratchcpp/monitor.h

@@ -56,8 +56,7 @@ class LIBSCRATCHCPP_EXPORT Monitor : public Entity
 
         const std::string &opcode() const;
 
-        // TODO: Add updateValue()
-        // void updateValue(const VirtualMachine *vm);
+        void updateValue(const Value &value);
 
         void setValueChangeFunction(MonitorChangeFunc f);
         void changeValue(const Value &newValue);

src/scratch/monitor.cpp

@@ -115,16 +115,15 @@ const std::string &Monitor::opcode() const
     return impl->block->opcode();
 }
 
-// TODO: Add updateValue()
 /*!
  * Notifies the monitor's interface about value change.
  * The interaface is supposed to read it from the VirtualMachine.
  */
-/*void Monitor::updateValue(const VirtualMachine *vm)
+void Monitor::updateValue(const Value &value)
 {
     if (impl->iface)
-        impl->iface->onValueChanged(vm);
-}*/
+        impl->iface->onValueChanged(value);
+}
 
 /*!
  * Sets the function which is called to change the monitor's value.
@@ -145,10 +144,8 @@ void Monitor::changeValue(const Value &newValue)
     if (impl->changeFunc)
         impl->changeFunc(impl->block.get(), newValue);
 
-    if (impl->iface) {
-        // TODO: Implement this
-        // impl->iface->onValueChanged(...);
-    }
+    if (impl->iface)
+        impl->iface->onValueChanged(newValue);
 }
 
 /*! Returns the monitor's width. */

test/mocks/monitorhandlermock.h

@@ -10,8 +10,7 @@ class MonitorHandlerMock : public IMonitorHandler
     public:
         MOCK_METHOD(void, init, (Monitor *), (override));
 
-        // TODO: Add onValueChanged()
-        // MOCK_METHOD(void, onValueChanged, (const VirtualMachine *), (override));
+        MOCK_METHOD(void, onValueChanged, (const Value &), (override));
         MOCK_METHOD(void, onXChanged, (int), (override));
         MOCK_METHOD(void, onYChanged, (int), (override));
         MOCK_METHOD(void, onVisibleChanged, (bool), (override));

test/scratch_classes/monitor_test.cpp

@@ -12,7 +12,6 @@
 using namespace libscratchcpp;
 
 using ::testing::Return;
-using ::testing::SaveArg;
 using ::testing::_;
 
 static const int PADDING = 5;
@@ -111,26 +110,20 @@ TEST(MonitorTest, Sprite)
     ASSERT_EQ(block->target(), nullptr);
 }
 
-/*TEST(MonitorTest, UpdateValue)
+TEST(MonitorTest, UpdateValue)
 {
     Monitor monitor("", "");
-    VirtualMachine vm1, vm2;
     monitor.updateValue(nullptr);
-    monitor.updateValue(&vm1);
+    monitor.updateValue("test");
 
     MonitorHandlerMock handler;
     EXPECT_CALL(handler, init);
     monitor.setInterface(&handler);
 
-    EXPECT_CALL(handler, onValueChanged(&vm1));
-    monitor.updateValue(&vm1);
-
-    EXPECT_CALL(handler, onValueChanged(nullptr));
-    monitor.updateValue(nullptr);
-
-    EXPECT_CALL(handler, onValueChanged(&vm2));
-    monitor.updateValue(&vm2);
-}*/
+    Value v = 123;
+    EXPECT_CALL(handler, onValueChanged(v));
+    monitor.updateValue(v);
+}
 
 TEST(MonitorTest, ChangeValue)
 {
@@ -141,20 +134,14 @@ TEST(MonitorTest, ChangeValue)
     EXPECT_CALL(handler, init);
     monitor.setInterface(&handler);
 
-    /*const VirtualMachine *vm = nullptr;
-    EXPECT_CALL(handler, onValueChanged(_)).WillOnce(SaveArg<0>(&vm));*/
-    monitor.changeValue(0.25);
-    /*ASSERT_TRUE(vm);
-    ASSERT_EQ(vm->registerCount(), 1);
-    ASSERT_EQ(vm->getInput(0, 1)->toDouble(), 0.25);*/
+    Value v = "test";
+    EXPECT_CALL(handler, onValueChanged(v));
+    monitor.changeValue(v);
 
     monitor.setValueChangeFunction([](Block *block, const Value &newValue) { std::cout << block->opcode() + " " + newValue.toString() << std::endl; });
-    // EXPECT_CALL(handler, onValueChanged(_)).WillOnce(SaveArg<0>(&vm));
+    EXPECT_CALL(handler, onValueChanged(v));
     testing::internal::CaptureStdout();
-    monitor.changeValue("test");
-    /*ASSERT_TRUE(vm);
-    ASSERT_EQ(vm->registerCount(), 1);
-    ASSERT_EQ(vm->getInput(0, 1)->toString(), "test");*/
+    monitor.changeValue(v);
     ASSERT_EQ(testing::internal::GetCapturedStdout(), "test_block test\n");
 }