Implement sensing_coloristouchingcolor block

Author: adazem009

src/blocks/sensingblocks.cpp

@@ -33,6 +33,7 @@ void SensingBlocks::registerBlocks(IEngine *engine)
 {
     engine->addCompileFunction(this, "sensing_touchingobject", &compileTouchingObject);
     engine->addCompileFunction(this, "sensing_touchingcolor", &compileTouchingColor);
+    engine->addCompileFunction(this, "sensing_coloristouchingcolor", &compileColorIsTouchingColor);
 }
 
 CompilerValue *SensingBlocks::compileTouchingObject(Compiler *compiler)
@@ -69,6 +70,13 @@ CompilerValue *SensingBlocks::compileTouchingColor(Compiler *compiler)
     return compiler->addTargetFunctionCall("sensing_touchingcolor", Compiler::StaticType::Bool, { Compiler::StaticType::Unknown }, { color });
 }
 
+CompilerValue *SensingBlocks::compileColorIsTouchingColor(Compiler *compiler)
+{
+    CompilerValue *color = compiler->addInput("COLOR");
+    CompilerValue *color2 = compiler->addInput("COLOR2");
+    return compiler->addTargetFunctionCall("sensing_coloristouchingcolor", Compiler::StaticType::Bool, { Compiler::StaticType::Unknown, Compiler::StaticType::Unknown }, { color, color2 });
+}
+
 extern "C" bool sensing_touching_mouse(Target *target)
 {
     IEngine *engine = target->engine();
@@ -112,3 +120,8 @@ extern "C" bool sensing_touchingcolor(Target *target, const ValueData *color)
 {
     return target->touchingColor(value_toRgba(color));
 }
+
+extern "C" bool sensing_coloristouchingcolor(Target *target, const ValueData *color, const ValueData *color2)
+{
+    return target->touchingColor(value_toRgba(color), value_toRgba(color2));
+}

src/blocks/sensingblocks.h

@@ -19,6 +19,7 @@ class SensingBlocks : public IExtension
     private:
         static CompilerValue *compileTouchingObject(Compiler *compiler);
         static CompilerValue *compileTouchingColor(Compiler *compiler);
+        static CompilerValue *compileColorIsTouchingColor(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/blocks/sensing_blocks_test.cpp

@@ -421,3 +421,59 @@ TEST_F(SensingBlocksTest, TouchingColor_Number)
     ASSERT_FALSE(value_toBool(&value));
     value_free(&value);
 }
+
+TEST_F(SensingBlocksTest, ColorIsTouchingColor_StringNumber)
+{
+    auto targetMock = std::make_shared<TargetMock>();
+    targetMock->setEngine(&m_engineMock);
+
+    ScriptBuilder builder(m_extension.get(), m_engine, targetMock);
+    builder.addBlock("sensing_coloristouchingcolor");
+    builder.addValueInput("COLOR", "#00ffff");
+    builder.addValueInput("COLOR2", rgb(255, 54, 23));
+    Block *block = builder.currentBlock();
+
+    Compiler compiler(&m_engineMock, targetMock.get());
+    auto code = compiler.compile(block, Compiler::CodeType::Reporter);
+    Script script(targetMock.get(), block, &m_engineMock);
+    script.setCode(code);
+    Thread thread(targetMock.get(), &m_engineMock, &script);
+
+    EXPECT_CALL(*targetMock, touchingColor(rgb(0, 255, 255), rgb(255, 54, 23))).WillOnce(Return(true));
+    ValueData value = thread.runReporter();
+    ASSERT_TRUE(value_toBool(&value));
+    value_free(&value);
+
+    EXPECT_CALL(*targetMock, touchingColor(rgb(0, 255, 255), rgb(255, 54, 23))).WillOnce(Return(false));
+    value = thread.runReporter();
+    ASSERT_FALSE(value_toBool(&value));
+    value_free(&value);
+}
+
+TEST_F(SensingBlocksTest, ColorIsTouchingColor_NumberString)
+{
+    auto targetMock = std::make_shared<TargetMock>();
+    targetMock->setEngine(&m_engineMock);
+
+    ScriptBuilder builder(m_extension.get(), m_engine, targetMock);
+    builder.addBlock("sensing_coloristouchingcolor");
+    builder.addValueInput("COLOR", rgb(255, 54, 23));
+    builder.addValueInput("COLOR2", "#00ffff");
+    Block *block = builder.currentBlock();
+
+    Compiler compiler(&m_engineMock, targetMock.get());
+    auto code = compiler.compile(block, Compiler::CodeType::Reporter);
+    Script script(targetMock.get(), block, &m_engineMock);
+    script.setCode(code);
+    Thread thread(targetMock.get(), &m_engineMock, &script);
+
+    EXPECT_CALL(*targetMock, touchingColor(rgb(255, 54, 23), rgb(0, 255, 255))).WillOnce(Return(true));
+    ValueData value = thread.runReporter();
+    ASSERT_TRUE(value_toBool(&value));
+    value_free(&value);
+
+    EXPECT_CALL(*targetMock, touchingColor(rgb(255, 54, 23), rgb(0, 255, 255))).WillOnce(Return(false));
+    value = thread.runReporter();
+    ASSERT_FALSE(value_toBool(&value));
+    value_free(&value);
+}