Add deinitClone method to ISpriteHandler

Author: adazem009

include/scratchcpp/ispritehandler.h

@@ -17,6 +17,9 @@ class LIBSCRATCHCPP_EXPORT ISpriteHandler
         /*! Called when the interface is set on a sprite. */
         virtual void init(Sprite *sprite) = 0;
 
+        /*! Called when the sprite is deinitialized (if it is a clone). */
+        virtual void deinitClone() = 0;
+
         /*! Called when the sprite clones. */
         virtual void onCloned(Sprite *clone) = 0;
 

src/scratch/sprite.cpp

@@ -101,6 +101,9 @@ void Sprite::deleteClone()
         if (eng)
             eng->deinitClone(shared_from_this());
 
+        if (impl->iface)
+            impl->iface->deinitClone();
+
         assert(impl->cloneSprite);
         impl->cloneDeleted = true;
         impl->cloneSprite->impl->removeClone(this);

test/mocks/spritehandlermock.h

@@ -9,6 +9,7 @@ class SpriteHandlerMock : public ISpriteHandler
 {
     public:
         MOCK_METHOD(void, init, (Sprite *), (override));
+        MOCK_METHOD(void, deinitClone, (), (override));
 
         MOCK_METHOD(void, onCloned, (Sprite *), (override));
 

test/target_interfaces/ispritehandler_test.cpp

@@ -43,9 +43,12 @@ TEST_F(ISpriteHandlerTest, Clone)
     ASSERT_EQ(cloneParam1, clone.get());
     ASSERT_EQ(cloneParam2, clone.get());
 
-    // Engine is used during deletion, so let's just set it to nullptr (this is tested elsewhere)
-    m_sprite.setEngine(nullptr);
-    clone->setEngine(nullptr);
+    SpriteHandlerMock cloneHandler;
+    EXPECT_CALL(cloneHandler, init(clone.get()));
+    clone->setInterface(&cloneHandler);
+    EXPECT_CALL(m_engine, deinitClone(clone));
+    EXPECT_CALL(cloneHandler, deinitClone());
+    clone->deleteClone();
 }
 
 TEST_F(ISpriteHandlerTest, Visible)