birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated StringFunc::Tokenize to support returning a list of string_view instead of string, which should be more efficient. string is still supported as well, but users should prefer the string_view version.

Browse Source 
Testing:
Updated unit tests.
Reprocessed Atom material assets.
Ran AtomSampleViewer material screenshot test.
Opened, edited, saved materail in the Material Editor.
Opened a level, edited material property overrides, saved and reloaded.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
This commit is contained in:
santorac
2021-09-30 01:08:54 -07:00
parent a7c1bf2ec5
commit f0e8af72ae
3 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/StringFunc.cpp
+25 -6
View File
@@ -199,7 +199,7 @@ namespace AZ
TEST_F(StringFuncTest, Tokenize_SingleDelimeter_Empty)
{
AZStd::string input = "";
AZStd::vector<AZStd::string> tokens;
AZStd::vector<AZStd::string_view> tokens;
AZ::StringFunc::Tokenize(input.c_str(), tokens, ' ');
ASSERT_EQ(tokens.size(), 0);
}
@@ -207,7 +207,7 @@ namespace AZ
TEST_F(StringFuncTest, Tokenize_SingleDelimeter)
{
AZStd::string input = "a b,c";
AZStd::vector<AZStd::string> tokens;
AZStd::vector<AZStd::string_view> tokens;
AZ::StringFunc::Tokenize(input.c_str(), tokens, ' ');
ASSERT_EQ(tokens.size(), 2);
@@ -218,7 +218,7 @@ namespace AZ
TEST_F(StringFuncTest, Tokenize_MultiDelimeter_Empty)
{
AZStd::string input = "";
AZStd::vector<AZStd::string> tokens;
AZStd::vector<AZStd::string_view> tokens;
AZ::StringFunc::Tokenize(input.c_str(), tokens, " ,");
ASSERT_EQ(tokens.size(), 0);
}
@@ -226,7 +226,7 @@ namespace AZ
TEST_F(StringFuncTest, Tokenize_MultiDelimeters)
{
AZStd::string input = " -a +b +c -d-e";
AZStd::vector<AZStd::string> tokens;
AZStd::vector<AZStd::string_view> tokens;
AZ::StringFunc::Tokenize(input.c_str(), tokens, "-+");
ASSERT_EQ(tokens.size(), 5);
@@ -240,7 +240,7 @@ namespace AZ
TEST_F(StringFuncTest, Tokenize_SubstringDelimeters_Empty)
{
AZStd::string input = "";
AZStd::vector<AZStd::string> tokens;
AZStd::vector<AZStd::string_view> tokens;
AZStd::vector<AZStd::string_view> delimeters = {" -", " +"};
AZ::StringFunc::Tokenize(input.c_str(), tokens, delimeters);
ASSERT_EQ(tokens.size(), 0);
@@ -249,7 +249,7 @@ namespace AZ
TEST_F(StringFuncTest, Tokenize_SubstringDelimeters)
{
AZStd::string input = " -a +b +c -d-e";
AZStd::vector<AZStd::string> tokens;
AZStd::vector<AZStd::string_view> tokens;
AZStd::vector<AZStd::string_view> delimeters = { " -", " +" };
AZ::StringFunc::Tokenize(input.c_str(), tokens, delimeters);
@@ -259,6 +259,25 @@ namespace AZ
ASSERT_TRUE(tokens[2] == "c");
ASSERT_TRUE(tokens[3] == "d-e"); // Test for something like a guid, which contain typical separator characters
}
TEST_F(StringFuncTest, Tokenize_MultiDelimeters_String)
{
// Test with AZStd::string for backward compatibility. The functions
// use to only work with AZStd::string, and now they are templatized
// to support both AZStd::string and AZStd::string_view (the latter
// being perferred for performance).
AZStd::string input = " -a +b +c -d-e";
AZStd::vector<AZStd::string> tokens;
AZ::StringFunc::Tokenize(input.c_str(), tokens, "-+");
ASSERT_EQ(tokens.size(), 5);
ASSERT_TRUE(tokens[0] == "a ");
ASSERT_TRUE(tokens[1] == "b ");
ASSERT_TRUE(tokens[2] == "c ");
ASSERT_TRUE(tokens[3] == "d");
ASSERT_TRUE(tokens[4] == "e");
}
TEST_F(StringFuncTest, TokenizeVisitor_EmptyString_DoesNotInvokeVisitor)
{