ScratchConfiguration: Lookup graphic effects case insensitive

Author: adazem009

src/scratchconfiguration.cpp

@@ -2,7 +2,7 @@
 
 #include <scratchcpp/scratchconfiguration.h>
 #include <scratchcpp/igraphicseffect.h>
-#include <iostream>
+#include <algorithm>
 
 #include "scratchconfiguration_p.h"
 
@@ -44,12 +44,21 @@ void ScratchConfiguration::removeGraphicsEffect(const std::string &name)
 /*! Returns the graphics effect with the given name, or nullptr if it isn't registered. */
 IGraphicsEffect *ScratchConfiguration::getGraphicsEffect(const std::string &name)
 {
-    auto it = getImpl()->graphicsEffects.find(name);
+    // Effect names are case insensitive
+    std::string lower = name;
+    std::transform(lower.begin(), lower.end(), lower.begin(), [](char c) { return std::tolower(c); });
 
-    if (it == getImpl()->graphicsEffects.cend())
-        return nullptr;
-    else
-        return it->second.get();
+    const auto &effects = getImpl()->graphicsEffects;
+
+    for (const auto &[currentName, effect] : effects) {
+        std::string current = currentName;
+        std::transform(current.begin(), current.end(), current.begin(), [](char c) { return std::tolower(c); });
+
+        if (current == lower)
+            return effect.get();
+    }
+
+    return nullptr;
 }
 
 /*! Returns the version string of the library. */

test/scratchconfiguration/scratchconfiguration_test.cpp

@@ -68,3 +68,21 @@ TEST_F(ScratchConfigurationTest, GraphicsEffects)
     ScratchConfiguration::removeGraphicsEffect("effect1");
     ASSERT_EQ(ScratchConfiguration::getGraphicsEffect("effect1"), nullptr);
 }
+
+TEST_F(ScratchConfigurationTest, GraphicsEffects_CaseInsensitive)
+{
+    auto effect1 = std::make_shared<GraphicsEffectMock>();
+    auto effect2 = std::make_shared<GraphicsEffectMock>();
+
+    EXPECT_CALL(*effect1, name()).WillOnce(Return("eFfEct1"));
+    EXPECT_CALL(*effect2, name()).WillOnce(Return("eFFeCT2"));
+    ScratchConfiguration::registerGraphicsEffect(effect1);
+    ScratchConfiguration::registerGraphicsEffect(effect2);
+
+    ASSERT_EQ(ScratchConfiguration::getGraphicsEffect("EFFECT1"), effect1.get());
+    ASSERT_EQ(ScratchConfiguration::getGraphicsEffect("effEct2"), effect2.get());
+    ASSERT_EQ(ScratchConfiguration::getGraphicsEffect("effect3"), nullptr);
+
+    ScratchConfiguration::removeGraphicsEffect("effect1");
+    ScratchConfiguration::removeGraphicsEffect("effect2");
+}