#6131: Move string algorithm to string/predicate.h, add unit test

codereader · Oct 26, 2022 · 2762372 · 2762372
1 parent 62ed8fb
commit 2762372
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/libs/string/predicate.h b/libs/string/predicate.h
@@ -2,6 +2,7 @@
 
 #include <string>
 #include <cstring>
+#include <cctype>
 
 namespace string
 {
@@ -233,4 +234,21 @@ inline bool iends_with(const std::string& input, const TestStringType& test)
 	return ends_with(input, test, detail::isEqualNoCase);
 }
 
+/**
+ * Returns true if the given inpit string is consisting of alphanumeric characters only.
+ * Returns false if the input string is an empty string.
+ */
+inline bool isAlphaNumeric(const std::string& input)
+{
+    for (const auto c : input)
+    {
+        if (!::isalpha(c) && !::isdigit(c))
+        {
+            return false;
+        }
+    }
+
+    return !input.empty();
+}
+
 }
diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -26,7 +26,7 @@
 #include "wxutil/dialog/MessageBox.h"
 #include "messages/TextureChanged.h"
 #include "messages/ClearConsole.h"
-#include "string/string.h"
+#include "string/predicate.h"
 #include "scene/Group.h"
 #include "command/ExecutionNotPossible.h"
 
@@ -329,12 +329,9 @@ void UserInterfaceModule::registerControl(const IUserControl::Ptr& control)
     }
 
     // Check the name for validity
-    for (const auto c : control->getControlName())
+    if (!string::isAlphaNumeric(control->getControlName()))
     {
-        if (!::isalpha(c) && !::isdigit(c))
-        {
-            throw std::invalid_argument("Control name " + control->getControlName() + " contains invalid characters, only alphanumerics are allowed");
-        }
+        throw std::invalid_argument("Control name " + control->getControlName() + " contains invalid characters, only alphanumerics are allowed");
     }
 
     // Add a command shortcut toggling this control

diff --git a/test/Basic.cpp b/test/Basic.cpp
@@ -33,6 +33,26 @@ TEST(BasicTest, StringILessFunctor)
     EXPECT_TRUE(!less("BLEH", "blah"));
 }
 
+TEST(BasicTest, StringIsAlphaNumeric)
+{
+    EXPECT_FALSE(string::isAlphaNumeric(""));
+
+    EXPECT_TRUE(string::isAlphaNumeric("abc"));
+    EXPECT_TRUE(string::isAlphaNumeric("ABC"));
+    EXPECT_TRUE(string::isAlphaNumeric("12"));
+    EXPECT_TRUE(string::isAlphaNumeric("0"));
+    EXPECT_TRUE(string::isAlphaNumeric("abc12"));
+    EXPECT_TRUE(string::isAlphaNumeric("abcdefghijklmnopqrstuvwxyz123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+
+    EXPECT_FALSE(string::isAlphaNumeric("abc test"));
+    EXPECT_FALSE(string::isAlphaNumeric("abc\ntest"));
+    EXPECT_FALSE(string::isAlphaNumeric("abc\ttest"));
+    EXPECT_FALSE(string::isAlphaNumeric("abc\rtest"));
+    EXPECT_FALSE(string::isAlphaNumeric("$abc"));
+    EXPECT_FALSE(string::isAlphaNumeric("/abc"));
+    EXPECT_FALSE(string::isAlphaNumeric("test&afff"));
+}
+
 TEST(PathTests, GetFileExtension)
 {
     EXPECT_EQ(os::getExtension(""), "");