ScriptBuilder: Add currentBlock() method

Author: adazem009

include/scratchcpp/dev/test/scriptbuilder.h

@@ -44,6 +44,8 @@ class LIBSCRATCHCPP_EXPORT ScriptBuilder
         void addDropdownInput(const std::string &name, const std::string &selectedValue);
         void addDropdownField(const std::string &name, const std::string &selectedValue);
 
+        std::shared_ptr<Block> currentBlock() const;
+
         void build();
         void run();
 

src/dev/test/scriptbuilder.cpp

@@ -153,6 +153,12 @@ void ScriptBuilder::addDropdownField(const std::string &name, const std::string
     impl->blocks.back()->addField(field);
 }
 
+/*! Returns the current block (can be used e. g. with a custom Compiler instance). */
+std::shared_ptr<Block> ScriptBuilder::currentBlock() const
+{
+    return impl->lastBlock;
+}
+
 /*! Builds and compiles the script. */
 void ScriptBuilder::build()
 {

test/dev/test_api/scriptbuilder_test.cpp

@@ -4,6 +4,8 @@
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/value.h>
 #include <scratchcpp/block.h>
+#include <scratchcpp/input.h>
+#include <scratchcpp/field.h>
 #include <scratchcpp/list.h>
 
 #include "../../common.h"
@@ -32,7 +34,13 @@ class ScriptBuilderTest : public testing::Test
 
 TEST_F(ScriptBuilderTest, AddBlock)
 {
+    ASSERT_EQ(m_builder->currentBlock(), nullptr);
+
     m_builder->addBlock("test_simple");
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_simple");
+
     m_builder->build();
 
     testing::internal::CaptureStdout();
@@ -44,8 +52,20 @@ TEST_F(ScriptBuilderTest, AddValueInput)
 {
     m_builder->addBlock("test_print");
     m_builder->addValueInput("STRING", 10);
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "STRING");
+
     m_builder->addBlock("test_print");
     m_builder->addValueInput("STRING", "Hello world");
+    block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "STRING");
+
     m_builder->build();
 
     testing::internal::CaptureStdout();
@@ -57,6 +77,12 @@ TEST_F(ScriptBuilderTest, AddNullInput)
 {
     m_builder->addBlock("test_print");
     m_builder->addNullInput("STRING");
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "STRING");
+
     m_builder->build();
 
     testing::internal::CaptureStdout();
@@ -67,8 +93,14 @@ TEST_F(ScriptBuilderTest, AddNullInput)
 TEST_F(ScriptBuilderTest, AddObscuredInput)
 {
     m_builder->addBlock("test_print");
-    auto block = std::make_shared<Block>("", "test_teststr");
-    m_builder->addObscuredInput("STRING", block);
+    auto valueBlock = std::make_shared<Block>("", "test_teststr");
+    m_builder->addObscuredInput("STRING", valueBlock);
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "STRING");
+
     m_builder->build();
 
     testing::internal::CaptureStdout();
@@ -80,6 +112,12 @@ TEST_F(ScriptBuilderTest, AddNullObscuredInput)
 {
     m_builder->addBlock("test_print");
     m_builder->addNullObscuredInput("STRING");
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "STRING");
+
     m_builder->build();
 
     testing::internal::CaptureStdout();
@@ -91,6 +129,12 @@ TEST_F(ScriptBuilderTest, AddDropdownInput)
 {
     m_builder->addBlock("test_print_dropdown");
     m_builder->addDropdownInput("STRING", "hello");
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print_dropdown");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "STRING");
+
     m_builder->build();
 
     testing::internal::CaptureStdout();
@@ -102,6 +146,13 @@ TEST_F(ScriptBuilderTest, AddDropdownField)
 {
     m_builder->addBlock("test_print_field");
     m_builder->addDropdownField("STRING", "hello");
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print_field");
+    ASSERT_TRUE(block->inputs().empty());
+    ASSERT_EQ(block->fields().size(), 1);
+    ASSERT_EQ(block->fieldAt(0)->name(), "STRING");
+
     m_builder->build();
 
     testing::internal::CaptureStdout();
@@ -112,10 +163,18 @@ TEST_F(ScriptBuilderTest, AddDropdownField)
 TEST_F(ScriptBuilderTest, ReporterBlocks)
 {
     m_builder->addReporterBlock("test_teststr");
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_teststr");
     m_builder->captureBlockReturnValue();
 
     m_builder->addReporterBlock("test_input");
     m_builder->addValueInput("INPUT", -93.4);
+    block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_input");
+    ASSERT_EQ(block->inputs().size(), 1);
+    ASSERT_EQ(block->inputAt(0)->name(), "INPUT");
     m_builder->captureBlockReturnValue();
 
     m_builder->build();