Skip to content

Commit ca2852d

Browse files
dchapyshevdchapyshev
committed
Fix build.
1 parent 9fef966 commit ca2852d

File tree

4 files changed

+45
-29
lines changed

4 files changed

+45
-29
lines changed

‎source/base/crypto/password_generator_unittest.cc

+29-14
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,34 @@ namespace base {
2626

2727
namespace {
2828

29-
bool hasLower(const std::string& str)
29+
bool hasLower(const QString& str)
3030
{
31-
return std::any_of(str.begin(), str.end(), islower);
31+
for (int i = 0; i < str.size(); ++i)
32+
{
33+
if (str.at(i).isLower())
34+
return true;
35+
}
36+
return false;
3237
}
3338

34-
bool hasUpper(const std::string& str)
39+
bool hasUpper(const QString& str)
3540
{
36-
return std::any_of(str.begin(), str.end(), isupper);
41+
for (int i = 0; i < str.size(); ++i)
42+
{
43+
if (str.at(i).isUpper())
44+
return true;
45+
}
46+
return false;
3747
}
3848

39-
bool hasDigit(const std::string& str)
49+
bool hasDigit(const QString& str)
4050
{
41-
return std::any_of(str.begin(), str.end(), isdigit);
51+
for (int i = 0; i < str.size(); ++i)
52+
{
53+
if (str.at(i).isDigit())
54+
return true;
55+
}
56+
return false;
4257
}
4358

4459
} // namespace
@@ -56,8 +71,8 @@ TEST(password_generator_test, default_params)
5671
EXPECT_EQ(gen.length(), PasswordGenerator::kDefaultLength);
5772
EXPECT_EQ(gen.characters(), PasswordGenerator::kDefaultCharacters);
5873

59-
std::string res1 = gen.result();
60-
std::string res2 = gen.result();
74+
QString res1 = gen.result();
75+
QString res2 = gen.result();
6176

6277
EXPECT_EQ(res1.length(), PasswordGenerator::kDefaultLength);
6378
EXPECT_EQ(res2.length(), PasswordGenerator::kDefaultLength);
@@ -74,7 +89,7 @@ TEST(password_generator_test, only_lower_case)
7489

7590
for (int i = 0; i < 10; ++i)
7691
{
77-
std::string res = gen.result();
92+
QString res = gen.result();
7893

7994
EXPECT_EQ(res.length(), 5);
8095
EXPECT_TRUE(hasLower(res));
@@ -92,7 +107,7 @@ TEST(password_generator_test, only_upper_case)
92107

93108
for (int i = 0; i < 10; ++i)
94109
{
95-
std::string res = gen.result();
110+
QString res = gen.result();
96111

97112
EXPECT_EQ(res.length(), 5);
98113
EXPECT_TRUE(hasUpper(res));
@@ -110,7 +125,7 @@ TEST(password_generator_test, only_digits)
110125

111126
for (int i = 0; i < 10; ++i)
112127
{
113-
std::string res = gen.result();
128+
QString res = gen.result();
114129

115130
EXPECT_EQ(res.length(), 5);
116131
EXPECT_TRUE(hasDigit(res));
@@ -128,7 +143,7 @@ TEST(password_generator_test, DISABLED_benchmark)
128143

129144
for (int i = 0; i < kIterationCount; ++i)
130145
{
131-
std::string res = gen1.result();
146+
QString res = gen1.result();
132147
EXPECT_EQ(res.length(), 5);
133148
}
134149

@@ -137,7 +152,7 @@ TEST(password_generator_test, DISABLED_benchmark)
137152

138153
for (int i = 0; i < kIterationCount; ++i)
139154
{
140-
std::string res = gen2.result();
155+
QString res = gen2.result();
141156
EXPECT_EQ(res.length(), 10);
142157
}
143158

@@ -146,7 +161,7 @@ TEST(password_generator_test, DISABLED_benchmark)
146161

147162
for (int i = 0; i < kIterationCount; ++i)
148163
{
149-
std::string res = gen3.result();
164+
QString res = gen3.result();
150165
EXPECT_EQ(res.length(), 15);
151166
}
152167
}

‎source/base/crypto/password_hash_unittest.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
#include "base/crypto/password_hash.h"
2020

2121
#include <gtest/gtest.h>
22+
#include <QString>
2223

2324
namespace base {
2425

2526
TEST(PasswordHashTest, Scrypt)
2627
{
2728
struct TestData
2829
{
29-
std::string password;
30+
QString password;
3031
std::string salt;
3132
std::string expected;
3233
} const kTestTable[] =

‎source/base/crypto/srp_math_unittest.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ namespace base {
2525

2626
TEST(srp_math_test, test_vector)
2727
{
28-
std::u16string I = u"alice";
29-
std::u16string p = u"password123";
28+
QString I = "alice";
29+
QString p = "password123";
3030

3131
const uint8_t a_buf[] = { 0x60, 0x97, 0x55, 0x27, 0x03, 0x5C, 0xF2, 0xAD, 0x19, 0x89, 0x80,
3232
0x6F, 0x04, 0x07, 0x21, 0x0B, 0xC8, 0x1E, 0xDC, 0x04, 0xE2, 0x76,

‎source/base/net/ip_util_unittest.cc

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@ TEST(IpUtilTest, Range)
2727
{
2828
struct TestTable
2929
{
30-
std::u16string_view ip;
31-
std::u16string_view network;
32-
std::u16string_view mask;
30+
const char* ip;
31+
const char* network;
32+
const char* mask;
3333
bool expected;
3434
} const kTestTable[] =
3535
{
36-
{ u"192.168.88.1", u"192.168.88.0", u"255.255.255.0", true },
37-
{ u"192.168.88.1", u"192.168.88.2", u"255.255.255.255", false },
38-
{ u"192.168.88.3", u"192.168.88.2", u"255.255.255.255", false },
36+
{ "192.168.88.1", "192.168.88.0", "255.255.255.0", true },
37+
{ "192.168.88.1", "192.168.88.2", "255.255.255.255", false },
38+
{ "192.168.88.3", "192.168.88.2", "255.255.255.255", false },
3939

40-
{ u"100.1.1.22", u"192.168.1.0", u"255.255.255.0", false },
41-
{ u"100.1.1.22", u"100.1.1.22", u"255.255.255.255", true },
42-
{ u"100.1.1.22", u"100.1.1.23", u"255.255.255.255", false },
43-
{ u"100.1.1.22", u"100.1.1.21", u"255.255.255.255", false },
40+
{ "100.1.1.22", "192.168.1.0", "255.255.255.0", false },
41+
{ "100.1.1.22", "100.1.1.22", "255.255.255.255", true },
42+
{ "100.1.1.22", "100.1.1.23", "255.255.255.255", false },
43+
{ "100.1.1.22", "100.1.1.21", "255.255.255.255", false },
4444

45-
{ u"0.0.0.1", u"0.0.0.0", u"0.0.0.0", true },
46-
{ u"192.168.1.2", u"10.0.0.1", u"255.255.255.255", false }
45+
{ "0.0.0.1", "0.0.0.0", "0.0.0.0", true },
46+
{ "192.168.1.2", "10.0.0.1", "255.255.255.255", false }
4747
};
4848

4949
for (size_t i = 0; i < std::size(kTestTable); ++i)

0 commit comments

Comments
 (0)