@@ -46,8 +46,8 @@ TEST(TestQName, IteratorTest)
46
46
SerializedQNameIterator it = AsSerializedQName (kOneItem );
47
47
48
48
EXPECT_TRUE (it.Next ());
49
- EXPECT_EQ ( strcmp ( it.Value (), " test" ), 0 );
50
- EXPECT_TRUE (! it.Next ());
49
+ EXPECT_STREQ ( it.Value (), " test" );
50
+ EXPECT_FALSE ( it.Next ());
51
51
EXPECT_TRUE (it.IsValid ());
52
52
}
53
53
@@ -56,37 +56,37 @@ TEST(TestQName, IteratorTest)
56
56
SerializedQNameIterator it = AsSerializedQName (kManyItems );
57
57
58
58
EXPECT_TRUE (it.Next ());
59
- EXPECT_EQ ( strcmp ( it.Value (), " this" ), 0 );
59
+ EXPECT_STREQ ( it.Value (), " this" );
60
60
61
61
EXPECT_TRUE (it.Next ());
62
- EXPECT_EQ ( strcmp ( it.Value (), " is" ), 0 );
62
+ EXPECT_STREQ ( it.Value (), " is" );
63
63
64
64
EXPECT_TRUE (it.Next ());
65
- EXPECT_EQ ( strcmp ( it.Value (), " a" ), 0 );
65
+ EXPECT_STREQ ( it.Value (), " a" );
66
66
67
67
EXPECT_TRUE (it.Next ());
68
- EXPECT_EQ ( strcmp ( it.Value (), " test" ), 0 );
68
+ EXPECT_STREQ ( it.Value (), " test" );
69
69
70
- EXPECT_TRUE (! it.Next ());
70
+ EXPECT_FALSE ( it.Next ());
71
71
EXPECT_TRUE (it.IsValid ());
72
72
}
73
73
{
74
74
static const uint8_t kPtrItems [] = " abc\02 is\01 a\04 test\00\04 this\xc0\03 " ;
75
75
SerializedQNameIterator it (BytesRange (kPtrItems , kPtrItems + sizeof (kPtrItems )), kPtrItems + 14 );
76
76
77
77
EXPECT_TRUE (it.Next ());
78
- EXPECT_EQ ( strcmp ( it.Value (), " this" ), 0 );
78
+ EXPECT_STREQ ( it.Value (), " this" );
79
79
80
80
EXPECT_TRUE (it.Next ());
81
- EXPECT_EQ ( strcmp ( it.Value (), " is" ), 0 );
81
+ EXPECT_STREQ ( it.Value (), " is" );
82
82
83
83
EXPECT_TRUE (it.Next ());
84
- EXPECT_EQ ( strcmp ( it.Value (), " a" ), 0 );
84
+ EXPECT_STREQ ( it.Value (), " a" );
85
85
86
86
EXPECT_TRUE (it.Next ());
87
- EXPECT_EQ ( strcmp ( it.Value (), " test" ), 0 );
87
+ EXPECT_STREQ ( it.Value (), " test" );
88
88
89
- EXPECT_TRUE (! it.Next ());
89
+ EXPECT_FALSE ( it.Next ());
90
90
EXPECT_TRUE (it.IsValid ());
91
91
}
92
92
}
@@ -98,26 +98,26 @@ TEST(TestQName, ErrorTest)
98
98
static const uint8_t kData [] = " \04 test" ;
99
99
SerializedQNameIterator it = AsSerializedQName (kData );
100
100
101
- EXPECT_TRUE (! it.Next ());
102
- EXPECT_TRUE (! it.IsValid ());
101
+ EXPECT_FALSE ( it.Next ());
102
+ EXPECT_FALSE ( it.IsValid ());
103
103
}
104
104
105
105
{
106
106
// Truncated before the end
107
107
static const uint8_t kData [] = " \02 " ;
108
108
SerializedQNameIterator it = AsSerializedQName (kData );
109
109
110
- EXPECT_TRUE (! it.Next ());
111
- EXPECT_TRUE (! it.IsValid ());
110
+ EXPECT_FALSE ( it.Next ());
111
+ EXPECT_FALSE ( it.IsValid ());
112
112
}
113
113
114
114
{
115
115
// Truncated before the end
116
116
static const uint8_t kData [] = " \xc0 " ;
117
117
SerializedQNameIterator it = AsSerializedQName (kData );
118
118
119
- EXPECT_TRUE (! it.Next ());
120
- EXPECT_TRUE (! it.IsValid ());
119
+ EXPECT_FALSE ( it.Next ());
120
+ EXPECT_FALSE ( it.IsValid ());
121
121
}
122
122
}
123
123
@@ -129,8 +129,8 @@ TEST(TestQName, InvalidReferencing)
129
129
static const uint8_t kData [] = " \00\xc0\x00 " ;
130
130
SerializedQNameIterator it (BytesRange (kData , kData + 2 ), kData + 1 );
131
131
132
- EXPECT_TRUE (! it.Next ());
133
- EXPECT_TRUE (! it.IsValid ());
132
+ EXPECT_FALSE ( it.Next ());
133
+ EXPECT_FALSE ( it.IsValid ());
134
134
}
135
135
136
136
{
@@ -139,8 +139,8 @@ TEST(TestQName, InvalidReferencing)
139
139
SerializedQNameIterator it = AsSerializedQName (kData );
140
140
141
141
EXPECT_TRUE (it.Next ());
142
- EXPECT_TRUE (! it.Next ());
143
- EXPECT_TRUE (! it.IsValid ());
142
+ EXPECT_FALSE ( it.Next ());
143
+ EXPECT_FALSE ( it.IsValid ());
144
144
}
145
145
146
146
{
@@ -149,17 +149,17 @@ TEST(TestQName, InvalidReferencing)
149
149
SerializedQNameIterator it = AsSerializedQName (kData );
150
150
151
151
EXPECT_TRUE (it.Next ());
152
- EXPECT_TRUE (! it.Next ());
153
- EXPECT_TRUE (! it.IsValid ());
152
+ EXPECT_FALSE ( it.Next ());
153
+ EXPECT_FALSE ( it.IsValid ());
154
154
}
155
155
156
156
{
157
157
// Infinite recursion by referencing own element at the start
158
158
static const uint8_t kData [] = " \xc0\x00 " ;
159
159
SerializedQNameIterator it = AsSerializedQName (kData );
160
160
161
- EXPECT_TRUE (! it.Next ());
162
- EXPECT_TRUE (! it.IsValid ());
161
+ EXPECT_FALSE ( it.Next ());
162
+ EXPECT_FALSE ( it.IsValid ());
163
163
}
164
164
165
165
{
@@ -168,8 +168,8 @@ TEST(TestQName, InvalidReferencing)
168
168
SerializedQNameIterator it = AsSerializedQName (kData );
169
169
170
170
EXPECT_TRUE (it.Next ());
171
- EXPECT_TRUE (! it.Next ());
172
- EXPECT_TRUE (! it.IsValid ());
171
+ EXPECT_FALSE ( it.Next ());
172
+ EXPECT_FALSE ( it.IsValid ());
173
173
}
174
174
}
175
175
0 commit comments