Skip to content

Commit a8b8307

Browse files
authored
Rename AreAllCharactersWhitelisted to AreAllCharactersAllowlisted (#921)
* Rename AreAllCharactersWhitelisted to AreAllCharactersAllowlisted
1 parent c12498e commit a8b8307

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

lib/api/CorrelationVector.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55
#include "CorrelationVector.hpp"
6-
#include "utils/StringUtils.hpp" // for SplitString and AreAllCharactersWhitelisted
6+
#include "utils/StringUtils.hpp" // for SplitString and AreAllCharactersAllowlisted
77

88
#include <vector>
99
#include <random>
@@ -246,14 +246,14 @@ namespace MAT_NS_BEGIN
246246
return false;
247247
}
248248

249-
if (!StringUtils::AreAllCharactersWhitelisted(parts[i], s_base64CharSet))
249+
if (!StringUtils::AreAllCharactersAllowlisted(parts[i], s_base64CharSet))
250250
{
251251
return false;
252252
}
253253
}
254254

255255
// all other character groups must be non-empty, decimal digits
256-
if (i != 0 && (parts[i].length() == 0 || !StringUtils::AreAllCharactersWhitelisted(parts[i], s_base10CharSet)))
256+
if (i != 0 && (parts[i].length() == 0 || !StringUtils::AreAllCharactersAllowlisted(parts[i], s_base10CharSet)))
257257
{
258258
return false;
259259
}

lib/utils/StringUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ namespace MAT_NS_BEGIN
3131
}
3232
}
3333

34-
bool StringUtils::AreAllCharactersWhitelisted(const string& stringToTest, const string& whitelist)
34+
bool StringUtils::AreAllCharactersAllowlisted(const string& stringToTest, const string& allowlist)
3535
{
36-
return (stringToTest.find_first_not_of(whitelist) == string::npos);
36+
return (stringToTest.find_first_not_of(allowlist) == string::npos);
3737
}
3838

3939
#ifdef __clang__

lib/utils/StringUtils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace MAT_NS_BEGIN
1717
namespace StringUtils
1818
{
1919
void SplitString(const std::string& s, const char separator, std::vector<std::string>& parts);
20-
bool AreAllCharactersWhitelisted(const std::string& stringToTest, const std::string& whitelist);
20+
bool AreAllCharactersAllowlisted(const std::string& stringToTest, const std::string& allowlist);
2121
}
2222

2323
std::string toString(char const* value);

tests/unittests/StringUtilsTests.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ TEST(StringUtilsTests, SplitString)
6969
ASSERT_EQ(parts.size() > 5 ? parts[5] : "null", "");
7070
}
7171

72-
TEST(StringUtilsTests, AreAllCharactersWhitelisted)
72+
TEST(StringUtilsTests, AreAllCharactersAllowlisted)
7373
{
7474
// testing method
75-
// bool AreAllCharactersWhitelisted(const std::string& stringToTest, const std::string& whitelist);
75+
// bool AreAllCharactersAllowlisted(const std::string& stringToTest, const std::string& allowlist);
7676

7777
string allAsciiChars;
7878

@@ -81,29 +81,29 @@ TEST(StringUtilsTests, AreAllCharactersWhitelisted)
8181
allAsciiChars += ((char)i);
8282
}
8383

84-
// any string is whitelisted against the full list of characters
85-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted(allAsciiChars, allAsciiChars));
86-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("", allAsciiChars));
87-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("a", allAsciiChars));
88-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("aaaaaaaaaaa", allAsciiChars));
89-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted(string(10000, ' '), allAsciiChars));
90-
91-
// any non-empty string is NOT whitelisted against an empty list of characters
92-
EXPECT_FALSE(StringUtils::AreAllCharactersWhitelisted(allAsciiChars, ""));
93-
EXPECT_FALSE(StringUtils::AreAllCharactersWhitelisted("a", ""));
94-
EXPECT_FALSE(StringUtils::AreAllCharactersWhitelisted("aaaaaaaaaaa", ""));
95-
EXPECT_FALSE(StringUtils::AreAllCharactersWhitelisted(string(10000, ' '), ""));
96-
97-
// empty string is whitelisted against any whitelist of characters
98-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("", allAsciiChars));
99-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("", ""));
100-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("", "a"));
101-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("", "aaaaaaaaaaa"));
102-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("", string(10000, ' ')));
84+
// any string is allowed against the full list of characters
85+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted(allAsciiChars, allAsciiChars));
86+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("", allAsciiChars));
87+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("a", allAsciiChars));
88+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("aaaaaaaaaaa", allAsciiChars));
89+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted(string(10000, ' '), allAsciiChars));
90+
91+
// any non-empty string is NOT allowed against an empty list of characters
92+
EXPECT_FALSE(StringUtils::AreAllCharactersAllowlisted(allAsciiChars, ""));
93+
EXPECT_FALSE(StringUtils::AreAllCharactersAllowlisted("a", ""));
94+
EXPECT_FALSE(StringUtils::AreAllCharactersAllowlisted("aaaaaaaaaaa", ""));
95+
EXPECT_FALSE(StringUtils::AreAllCharactersAllowlisted(string(10000, ' '), ""));
96+
97+
// empty string is allowed against any list of characters
98+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("", allAsciiChars));
99+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("", ""));
100+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("", "a"));
101+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("", "aaaaaaaaaaa"));
102+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("", string(10000, ' ')));
103103

104104
// a few more positive and negative tests
105-
EXPECT_TRUE(StringUtils::AreAllCharactersWhitelisted("abc123", "abcdef123456"));
106-
EXPECT_FALSE(StringUtils::AreAllCharactersWhitelisted("abc123", "abcdef23456"));
105+
EXPECT_TRUE(StringUtils::AreAllCharactersAllowlisted("abc123", "abcdef123456"));
106+
EXPECT_FALSE(StringUtils::AreAllCharactersAllowlisted("abc123", "abcdef23456"));
107107
}
108108

109109
TEST(StringUtilsTests, ToString)

0 commit comments

Comments
 (0)