ScriptBuilder: Add addEntityInput() method

Author: adazem009

include/scratchcpp/dev/test/scriptbuilder.h

@@ -4,16 +4,14 @@
 
 #include <vector>
 
-#include "../../global.h"
-#include "../../spimpl.h"
+#include "../../inputvalue.h"
 
 namespace libscratchcpp
 {
 
 class IExtension;
 class IEngine;
 class Target;
-class Entity;
 class List;
 
 } // namespace libscratchcpp
@@ -45,6 +43,7 @@ class LIBSCRATCHCPP_EXPORT ScriptBuilder
         void addDropdownInput(const std::string &name, const std::string &selectedValue);
         void addDropdownField(const std::string &name, const std::string &selectedValue);
 
+        void addEntityInput(const std::string &name, const std::string &entityName, InputValue::Type entityType, std::shared_ptr<Entity> entity);
         void addEntityField(const std::string &name, std::shared_ptr<Entity> entity);
 
         std::shared_ptr<Block> currentBlock();

src/dev/test/scriptbuilder.cpp

@@ -3,6 +3,7 @@
 #include <scratchcpp/dev/test/scriptbuilder.h>
 #include <scratchcpp/block.h>
 #include <scratchcpp/input.h>
+#include <scratchcpp/inputvalue.h>
 #include <scratchcpp/field.h>
 #include <scratchcpp/dev/compilerconstant.h>
 #include <scratchcpp/dev/executablecode.h>
@@ -152,6 +153,20 @@ void ScriptBuilder::addDropdownField(const std::string &name, const std::string
     impl->lastBlock->addField(field);
 }
 
+/*! Adds an input pointing to an entity (variable, list, broadcast, etc.) */
+void ScriptBuilder::addEntityInput(const std::string &name, const std::string &entityName, InputValue::Type entityType, std::shared_ptr<Entity> entity)
+{
+    if (!impl->lastBlock)
+        return;
+
+    entity->setId(std::to_string(impl->blockId++));
+    auto input = std::make_shared<Input>(name, Input::Type::Shadow);
+    input->setPrimaryValue(entityName);
+    input->primaryValue()->setValuePtr(entity);
+    input->primaryValue()->setType(entityType);
+    impl->lastBlock->addInput(input);
+}
+
 /*! Adds a field pointing to an entity (variable, list, broadcast, etc.) */
 void ScriptBuilder::addEntityField(const std::string &name, std::shared_ptr<Entity> entity)
 {

test/dev/test_api/scriptbuilder_test.cpp

@@ -162,19 +162,35 @@ TEST_F(ScriptBuilderTest, AddDropdownField)
     ASSERT_EQ(testing::internal::GetCapturedStdout(), "hello\n");
 }
 
+TEST_F(ScriptBuilderTest, AddEntityInput)
+{
+    auto broadcast = std::make_shared<Broadcast>("", "");
+    m_engine->setBroadcasts({ broadcast });
+
+    m_builder->addBlock("test_simple");
+    m_builder->addEntityInput("BROADCAST", "test", InputValue::Type::Broadcast, broadcast);
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_simple");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "BROADCAST");
+    ASSERT_EQ(block->inputAt(0)->primaryValue()->valuePtr(), broadcast);
+    ASSERT_EQ(block->inputAt(0)->primaryValue()->type(), InputValue::Type::Broadcast);
+}
+
 TEST_F(ScriptBuilderTest, AddEntityField)
 {
     auto broadcast = std::make_shared<Broadcast>("", "");
     m_engine->setBroadcasts({ broadcast });
 
-    m_builder->addBlock("test_print_field");
-    m_builder->addEntityField("STRING", broadcast);
+    m_builder->addBlock("test_simple");
+    m_builder->addEntityField("BROADCAST", broadcast);
     auto block = m_builder->currentBlock();
     ASSERT_TRUE(block);
-    ASSERT_EQ(block->opcode(), "test_print_field");
+    ASSERT_EQ(block->opcode(), "test_simple");
     ASSERT_TRUE(block->inputs().empty());
     ASSERT_EQ(block->fields().size(), 1);
-    ASSERT_EQ(block->fieldAt(0)->name(), "STRING");
+    ASSERT_EQ(block->fieldAt(0)->name(), "BROADCAST");
     ASSERT_EQ(block->fieldAt(0)->valuePtr(), broadcast);
 }