Skip to content

Commit ff76343

Browse files
gongminmingongminmin
committed
Update the code to adapt the new gtest.
1 parent fdd2db9 commit ff76343

File tree

7 files changed

+128
-128
lines changed

7 files changed

+128
-128
lines changed

‎test/perftest/platformtest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ TEST_F(Platform, strlen) {
7676

7777
TEST_F(Platform, memcmp) {
7878
for (int i = 0; i < kTrialCount; i++) {
79-
EXPECT_EQ(0, memcmp(temp_, json_, length_));
79+
EXPECT_EQ(0u, memcmp(temp_, json_, length_));
8080
}
8181
}
8282

‎test/unittest/cursorstreamwrappertest.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,78 +38,78 @@ TEST(CursorStreamWrapper, MissingFirstBracket) {
3838
size_t col, line;
3939
bool ret = testJson(json, line, col);
4040
EXPECT_TRUE(ret);
41-
EXPECT_EQ(line, 3);
42-
EXPECT_EQ(col, 0);
41+
EXPECT_EQ(line, 3u);
42+
EXPECT_EQ(col, 0u);
4343
}
4444

4545
TEST(CursorStreamWrapper, MissingQuotes) {
4646
const char json[] = "{\"string\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
4747
size_t col, line;
4848
bool ret = testJson(json, line, col);
4949
EXPECT_TRUE(ret);
50-
EXPECT_EQ(line, 1);
51-
EXPECT_EQ(col, 8);
50+
EXPECT_EQ(line, 1u);
51+
EXPECT_EQ(col, 8u);
5252
}
5353

5454
TEST(CursorStreamWrapper, MissingColon) {
5555
const char json[] = "{\"string\"\n\n\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
5656
size_t col, line;
5757
bool ret = testJson(json, line, col);
5858
EXPECT_TRUE(ret);
59-
EXPECT_EQ(line, 3);
60-
EXPECT_EQ(col, 0);
59+
EXPECT_EQ(line, 3u);
60+
EXPECT_EQ(col, 0u);
6161
}
6262

6363
TEST(CursorStreamWrapper, MissingSecondQuotes) {
6464
const char json[] = "{\"string\"\n\n:my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
6565
size_t col, line;
6666
bool ret = testJson(json, line, col);
6767
EXPECT_TRUE(ret);
68-
EXPECT_EQ(line, 3);
69-
EXPECT_EQ(col, 1);
68+
EXPECT_EQ(line, 3u);
69+
EXPECT_EQ(col, 1u);
7070
}
7171

7272
TEST(CursorStreamWrapper, MissingComma) {
7373
const char json[] = "{\"string\"\n\n:\"my string\"\"array\"\n:[\"1\", \"2\", \"3\"]}";
7474
size_t col, line;
7575
bool ret = testJson(json, line, col);
7676
EXPECT_TRUE(ret);
77-
EXPECT_EQ(line, 3);
78-
EXPECT_EQ(col, 12);
77+
EXPECT_EQ(line, 3u);
78+
EXPECT_EQ(col, 12u);
7979
}
8080

8181
TEST(CursorStreamWrapper, MissingArrayBracket) {
8282
const char json[] = "{\"string\"\n\n:\"my string\",\"array\"\n:\"1\", \"2\", \"3\"]}";
8383
size_t col, line;
8484
bool ret = testJson(json, line, col);
8585
EXPECT_TRUE(ret);
86-
EXPECT_EQ(line, 4);
87-
EXPECT_EQ(col, 9);
86+
EXPECT_EQ(line, 4u);
87+
EXPECT_EQ(col, 9u);
8888
}
8989

9090
TEST(CursorStreamWrapper, MissingArrayComma) {
9191
const char json[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\" \"2\", \"3\"]}";
9292
size_t col, line;
9393
bool ret = testJson(json, line, col);
9494
EXPECT_TRUE(ret);
95-
EXPECT_EQ(line, 4);
96-
EXPECT_EQ(col, 6);
95+
EXPECT_EQ(line, 4u);
96+
EXPECT_EQ(col, 6u);
9797
}
9898

9999
TEST(CursorStreamWrapper, MissingLastArrayBracket) {
100100
const char json8[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"}";
101101
size_t col, line;
102102
bool ret = testJson(json8, line, col);
103103
EXPECT_TRUE(ret);
104-
EXPECT_EQ(line, 4);
105-
EXPECT_EQ(col, 15);
104+
EXPECT_EQ(line, 4u);
105+
EXPECT_EQ(col, 15u);
106106
}
107107

108108
TEST(CursorStreamWrapper, MissingLastBracket) {
109109
const char json9[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]";
110110
size_t col, line;
111111
bool ret = testJson(json9, line, col);
112112
EXPECT_TRUE(ret);
113-
EXPECT_EQ(line, 4);
114-
EXPECT_EQ(col, 16);
113+
EXPECT_EQ(line, 4u);
114+
EXPECT_EQ(col, 16u);
115115
}

‎test/unittest/istreamwrappertest.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ static void TestStringStream() {
3535
{
3636
StringStreamType iss;
3737
BasicIStreamWrapper<StringStreamType> is(iss);
38-
EXPECT_EQ(0, is.Tell());
38+
EXPECT_EQ(0u, is.Tell());
3939
if (sizeof(Ch) == 1) {
4040
EXPECT_EQ(0, is.Peek4());
41-
EXPECT_EQ(0, is.Tell());
41+
EXPECT_EQ(0u, is.Tell());
4242
}
4343
EXPECT_EQ(0, is.Peek());
4444
EXPECT_EQ(0, is.Take());
45-
EXPECT_EQ(0, is.Tell());
45+
EXPECT_EQ(0u, is.Tell());
4646
}
4747

4848
{
4949
Ch s[] = { 'A', 'B', 'C', '\0' };
5050
StringStreamType iss(s);
5151
BasicIStreamWrapper<StringStreamType> is(iss);
52-
EXPECT_EQ(0, is.Tell());
52+
EXPECT_EQ(0u, is.Tell());
5353
if (sizeof(Ch) == 1) {
5454
EXPECT_EQ(0, is.Peek4()); // less than 4 bytes
5555
}
@@ -59,7 +59,7 @@ static void TestStringStream() {
5959
EXPECT_EQ('A' + i, is.Peek());
6060
EXPECT_EQ('A' + i, is.Take());
6161
}
62-
EXPECT_EQ(3, is.Tell());
62+
EXPECT_EQ(3u, is.Tell());
6363
EXPECT_EQ(0, is.Peek());
6464
EXPECT_EQ(0, is.Take());
6565
}
@@ -72,15 +72,15 @@ static void TestStringStream() {
7272
const Ch* c = is.Peek4();
7373
for (int i = 0; i < 4; i++)
7474
EXPECT_EQ('A' + i, c[i]);
75-
EXPECT_EQ(0, is.Tell());
75+
EXPECT_EQ(0u, is.Tell());
7676
}
7777
for (int i = 0; i < 5; i++) {
7878
EXPECT_EQ(static_cast<size_t>(i), is.Tell());
7979
EXPECT_EQ('A' + i, is.Peek());
8080
EXPECT_EQ('A' + i, is.Peek());
8181
EXPECT_EQ('A' + i, is.Take());
8282
}
83-
EXPECT_EQ(5, is.Tell());
83+
EXPECT_EQ(5u, is.Tell());
8484
EXPECT_EQ(0, is.Peek());
8585
EXPECT_EQ(0, is.Take());
8686
}
@@ -129,7 +129,7 @@ TEST(IStreamWrapper, ifstream) {
129129
Document d;
130130
EXPECT_TRUE(!d.ParseStream(eis).HasParseError());
131131
EXPECT_TRUE(d.IsObject());
132-
EXPECT_EQ(5, d.MemberCount());
132+
EXPECT_EQ(5u, d.MemberCount());
133133
}
134134

135135
TEST(IStreamWrapper, fstream) {
@@ -140,7 +140,7 @@ TEST(IStreamWrapper, fstream) {
140140
Document d;
141141
EXPECT_TRUE(!d.ParseStream(eis).HasParseError());
142142
EXPECT_TRUE(d.IsObject());
143-
EXPECT_EQ(5, d.MemberCount());
143+
EXPECT_EQ(5u, d.MemberCount());
144144
}
145145

146146
// wifstream/wfstream only works on C++11 with codecvt_utf16

‎test/unittest/pointertest.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -634,13 +634,13 @@ TEST(Pointer, Get) {
634634
EXPECT_TRUE(Pointer("/abc").Get(d) == 0);
635635
size_t unresolvedTokenIndex;
636636
EXPECT_TRUE(Pointer("/foo/2").Get(d, &unresolvedTokenIndex) == 0); // Out of boundary
637-
EXPECT_EQ(1, unresolvedTokenIndex);
637+
EXPECT_EQ(1u, unresolvedTokenIndex);
638638
EXPECT_TRUE(Pointer("/foo/a").Get(d, &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
639-
EXPECT_EQ(1, unresolvedTokenIndex);
639+
EXPECT_EQ(1u, unresolvedTokenIndex);
640640
EXPECT_TRUE(Pointer("/foo/0/0").Get(d, &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
641-
EXPECT_EQ(2, unresolvedTokenIndex);
641+
EXPECT_EQ(2u, unresolvedTokenIndex);
642642
EXPECT_TRUE(Pointer("/foo/0/a").Get(d, &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
643-
EXPECT_EQ(2, unresolvedTokenIndex);
643+
EXPECT_EQ(2u, unresolvedTokenIndex);
644644
}
645645

646646
TEST(Pointer, GetWithDefault) {
@@ -959,27 +959,27 @@ TEST(Pointer, GetValueByPointer) {
959959

960960
size_t unresolvedTokenIndex;
961961
EXPECT_TRUE(GetValueByPointer(d, "/foo/2", &unresolvedTokenIndex) == 0); // Out of boundary
962-
EXPECT_EQ(1, unresolvedTokenIndex);
962+
EXPECT_EQ(1u, unresolvedTokenIndex);
963963
EXPECT_TRUE(GetValueByPointer(d, "/foo/a", &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
964-
EXPECT_EQ(1, unresolvedTokenIndex);
964+
EXPECT_EQ(1u, unresolvedTokenIndex);
965965
EXPECT_TRUE(GetValueByPointer(d, "/foo/0/0", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
966-
EXPECT_EQ(2, unresolvedTokenIndex);
966+
EXPECT_EQ(2u, unresolvedTokenIndex);
967967
EXPECT_TRUE(GetValueByPointer(d, "/foo/0/a", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
968-
EXPECT_EQ(2, unresolvedTokenIndex);
968+
EXPECT_EQ(2u, unresolvedTokenIndex);
969969

970970
// const version
971971
const Value& v = d;
972972
EXPECT_EQ(&d["foo"][0], GetValueByPointer(v, Pointer("/foo/0")));
973973
EXPECT_EQ(&d["foo"][0], GetValueByPointer(v, "/foo/0"));
974974

975975
EXPECT_TRUE(GetValueByPointer(v, "/foo/2", &unresolvedTokenIndex) == 0); // Out of boundary
976-
EXPECT_EQ(1, unresolvedTokenIndex);
976+
EXPECT_EQ(1u, unresolvedTokenIndex);
977977
EXPECT_TRUE(GetValueByPointer(v, "/foo/a", &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
978-
EXPECT_EQ(1, unresolvedTokenIndex);
978+
EXPECT_EQ(1u, unresolvedTokenIndex);
979979
EXPECT_TRUE(GetValueByPointer(v, "/foo/0/0", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
980-
EXPECT_EQ(2, unresolvedTokenIndex);
980+
EXPECT_EQ(2u, unresolvedTokenIndex);
981981
EXPECT_TRUE(GetValueByPointer(v, "/foo/0/a", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
982-
EXPECT_EQ(2, unresolvedTokenIndex);
982+
EXPECT_EQ(2u, unresolvedTokenIndex);
983983

984984
}
985985

0 commit comments

Comments
 (0)