Set variable and list owner

Author: adazem009

src/scratch/target.cpp

@@ -42,6 +42,8 @@ int Target::addVariable(std::shared_ptr<Variable> variable)
         return it - impl->variables.begin();
 
     impl->variables.push_back(variable);
+    variable->setTarget(this);
+
     return impl->variables.size() - 1;
 }
 
@@ -93,6 +95,8 @@ int Target::addList(std::shared_ptr<List> list)
         return it - impl->lists.begin();
 
     impl->lists.push_back(list);
+    list->setTarget(this);
+
     return impl->lists.size() - 1;
 }
 

test/scratch_classes/sprite_test.cpp

@@ -69,6 +69,7 @@ TEST(SpriteTest, Clone)
         ASSERT_EQ(clone->variableAt(1)->id(), "b");
         ASSERT_EQ(clone->variableAt(1)->name(), "var2");
         ASSERT_EQ(clone->variableAt(1)->value().toString(), "world");
+        ASSERT_EQ(clone->variableAt(1)->target(), clone);
 
         ASSERT_EQ(clone->lists().size(), 2);
         ASSERT_NE(clone->lists(), root->lists());
@@ -78,6 +79,7 @@ TEST(SpriteTest, Clone)
         ASSERT_EQ(clone->listAt(1)->id(), "d");
         ASSERT_EQ(clone->listAt(1)->name(), "list2");
         ASSERT_EQ(*clone->listAt(1), std::deque<Value>({ "test" }));
+        ASSERT_EQ(clone->listAt(1)->target(), clone);
 
         ASSERT_EQ(clone->currentCostume(), 2);
         ASSERT_EQ(clone->layerOrder(), 5);

test/scratch_classes/target_test.cpp

@@ -38,6 +38,10 @@ TEST(TargetTest, Variables)
     ASSERT_EQ(target.addVariable(v3), 2);
     ASSERT_EQ(target.addVariable(v2), 1); // add existing variable
 
+    ASSERT_EQ(v1->target(), &target);
+    ASSERT_EQ(v2->target(), &target);
+    ASSERT_EQ(v3->target(), &target);
+
     ASSERT_EQ(target.variables(), std::vector<std::shared_ptr<Variable>>({ v1, v2, v3 }));
     ASSERT_EQ(target.variableAt(0), v1);
     ASSERT_EQ(target.variableAt(1), v2);
@@ -68,6 +72,10 @@ TEST(TargetTest, Lists)
     ASSERT_EQ(target.addList(l3), 2);
     ASSERT_EQ(target.addList(l2), 1); // add existing list
 
+    ASSERT_EQ(l1->target(), &target);
+    ASSERT_EQ(l2->target(), &target);
+    ASSERT_EQ(l3->target(), &target);
+
     ASSERT_EQ(target.lists(), std::vector<std::shared_ptr<List>>({ l1, l2, l3 }));
     ASSERT_EQ(target.listAt(0), l1);
     ASSERT_EQ(target.listAt(1), l2);