Skip to content

Commit ea05c47

Browse files
mbknustmbknust
committed
Applied suggested changes
1 parent e2bb3af commit ea05c47

10 files changed

+171
-171
lines changed

‎src/lib/dnssd/minimal_mdns/core/tests/TestQName.cpp

+28-28
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ TEST(TestQName, IteratorTest)
4646
SerializedQNameIterator it = AsSerializedQName(kOneItem);
4747

4848
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());
5151
EXPECT_TRUE(it.IsValid());
5252
}
5353

@@ -56,37 +56,37 @@ TEST(TestQName, IteratorTest)
5656
SerializedQNameIterator it = AsSerializedQName(kManyItems);
5757

5858
EXPECT_TRUE(it.Next());
59-
EXPECT_EQ(strcmp(it.Value(), "this"), 0);
59+
EXPECT_STREQ(it.Value(), "this");
6060

6161
EXPECT_TRUE(it.Next());
62-
EXPECT_EQ(strcmp(it.Value(), "is"), 0);
62+
EXPECT_STREQ(it.Value(), "is");
6363

6464
EXPECT_TRUE(it.Next());
65-
EXPECT_EQ(strcmp(it.Value(), "a"), 0);
65+
EXPECT_STREQ(it.Value(), "a");
6666

6767
EXPECT_TRUE(it.Next());
68-
EXPECT_EQ(strcmp(it.Value(), "test"), 0);
68+
EXPECT_STREQ(it.Value(), "test");
6969

70-
EXPECT_TRUE(!it.Next());
70+
EXPECT_FALSE(it.Next());
7171
EXPECT_TRUE(it.IsValid());
7272
}
7373
{
7474
static const uint8_t kPtrItems[] = "abc\02is\01a\04test\00\04this\xc0\03";
7575
SerializedQNameIterator it(BytesRange(kPtrItems, kPtrItems + sizeof(kPtrItems)), kPtrItems + 14);
7676

7777
EXPECT_TRUE(it.Next());
78-
EXPECT_EQ(strcmp(it.Value(), "this"), 0);
78+
EXPECT_STREQ(it.Value(), "this");
7979

8080
EXPECT_TRUE(it.Next());
81-
EXPECT_EQ(strcmp(it.Value(), "is"), 0);
81+
EXPECT_STREQ(it.Value(), "is");
8282

8383
EXPECT_TRUE(it.Next());
84-
EXPECT_EQ(strcmp(it.Value(), "a"), 0);
84+
EXPECT_STREQ(it.Value(), "a");
8585

8686
EXPECT_TRUE(it.Next());
87-
EXPECT_EQ(strcmp(it.Value(), "test"), 0);
87+
EXPECT_STREQ(it.Value(), "test");
8888

89-
EXPECT_TRUE(!it.Next());
89+
EXPECT_FALSE(it.Next());
9090
EXPECT_TRUE(it.IsValid());
9191
}
9292
}
@@ -98,26 +98,26 @@ TEST(TestQName, ErrorTest)
9898
static const uint8_t kData[] = "\04test";
9999
SerializedQNameIterator it = AsSerializedQName(kData);
100100

101-
EXPECT_TRUE(!it.Next());
102-
EXPECT_TRUE(!it.IsValid());
101+
EXPECT_FALSE(it.Next());
102+
EXPECT_FALSE(it.IsValid());
103103
}
104104

105105
{
106106
// Truncated before the end
107107
static const uint8_t kData[] = "\02";
108108
SerializedQNameIterator it = AsSerializedQName(kData);
109109

110-
EXPECT_TRUE(!it.Next());
111-
EXPECT_TRUE(!it.IsValid());
110+
EXPECT_FALSE(it.Next());
111+
EXPECT_FALSE(it.IsValid());
112112
}
113113

114114
{
115115
// Truncated before the end
116116
static const uint8_t kData[] = "\xc0";
117117
SerializedQNameIterator it = AsSerializedQName(kData);
118118

119-
EXPECT_TRUE(!it.Next());
120-
EXPECT_TRUE(!it.IsValid());
119+
EXPECT_FALSE(it.Next());
120+
EXPECT_FALSE(it.IsValid());
121121
}
122122
}
123123

@@ -129,8 +129,8 @@ TEST(TestQName, InvalidReferencing)
129129
static const uint8_t kData[] = "\00\xc0\x00";
130130
SerializedQNameIterator it(BytesRange(kData, kData + 2), kData + 1);
131131

132-
EXPECT_TRUE(!it.Next());
133-
EXPECT_TRUE(!it.IsValid());
132+
EXPECT_FALSE(it.Next());
133+
EXPECT_FALSE(it.IsValid());
134134
}
135135

136136
{
@@ -139,8 +139,8 @@ TEST(TestQName, InvalidReferencing)
139139
SerializedQNameIterator it = AsSerializedQName(kData);
140140

141141
EXPECT_TRUE(it.Next());
142-
EXPECT_TRUE(!it.Next());
143-
EXPECT_TRUE(!it.IsValid());
142+
EXPECT_FALSE(it.Next());
143+
EXPECT_FALSE(it.IsValid());
144144
}
145145

146146
{
@@ -149,17 +149,17 @@ TEST(TestQName, InvalidReferencing)
149149
SerializedQNameIterator it = AsSerializedQName(kData);
150150

151151
EXPECT_TRUE(it.Next());
152-
EXPECT_TRUE(!it.Next());
153-
EXPECT_TRUE(!it.IsValid());
152+
EXPECT_FALSE(it.Next());
153+
EXPECT_FALSE(it.IsValid());
154154
}
155155

156156
{
157157
// Infinite recursion by referencing own element at the start
158158
static const uint8_t kData[] = "\xc0\x00";
159159
SerializedQNameIterator it = AsSerializedQName(kData);
160160

161-
EXPECT_TRUE(!it.Next());
162-
EXPECT_TRUE(!it.IsValid());
161+
EXPECT_FALSE(it.Next());
162+
EXPECT_FALSE(it.IsValid());
163163
}
164164

165165
{
@@ -168,8 +168,8 @@ TEST(TestQName, InvalidReferencing)
168168
SerializedQNameIterator it = AsSerializedQName(kData);
169169

170170
EXPECT_TRUE(it.Next());
171-
EXPECT_TRUE(!it.Next());
172-
EXPECT_TRUE(!it.IsValid());
171+
EXPECT_FALSE(it.Next());
172+
EXPECT_FALSE(it.IsValid());
173173
}
174174
}
175175

‎src/lib/dnssd/minimal_mdns/responders/tests/TestQueryResponder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ TEST(TestQueryResponder, LimitedStorage)
130130
for (int i = 0; i < 100; i++)
131131
{
132132
EmptyResponder emptyX(kName1);
133-
EXPECT_TRUE(!responder.AddResponder(&emptyX).SetReportInServiceListing(true).IsValid());
133+
EXPECT_FALSE(responder.AddResponder(&emptyX).SetReportInServiceListing(true).IsValid());
134134
}
135135

136136
int idx = 0;

‎src/lib/dnssd/minimal_mdns/tests/TestMinimalMdnsAllocator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ TEST_F(TestMinimalMdnsAllocator, TestQueryAllocatorRecordResponder)
192192
#endif
193193

194194
// Adding one more should fail.
195-
EXPECT_TRUE(!test.AddResponder<PtrResponder>(serviceName, instanceName).IsValid());
195+
EXPECT_FALSE(test.AddResponder<PtrResponder>(serviceName, instanceName).IsValid());
196196
#if CHIP_CONFIG_MEMORY_DEBUG_DMALLOC
197197
// We should not have allocated any more memory
198198
EXPECT_EQ(nAllocated, dmalloc_count_changed(mark, 1, 0));

‎src/lib/dnssd/minimal_mdns/tests/TestQueryReplyFilter.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ TEST(TestQueryReplyFilter, TestQueryReplyFilter)
5757
EXPECT_TRUE(QueryReplyFilter(buildQueryData(QType::A, QClass::IN, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
5858

5959
// Reject cases
60-
EXPECT_TRUE(!QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName2)));
60+
EXPECT_FALSE(QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName2)));
6161

62-
EXPECT_TRUE(!QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName3)));
62+
EXPECT_FALSE(QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName3)));
6363

64-
EXPECT_TRUE(!QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName4)));
64+
EXPECT_FALSE(QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName4)));
6565

66-
EXPECT_TRUE(!QueryReplyFilter(buildQueryData(QType::AAAA, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
66+
EXPECT_FALSE(QueryReplyFilter(buildQueryData(QType::AAAA, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
6767

68-
EXPECT_TRUE(!QueryReplyFilter(buildQueryData(QType::SRV, QClass::IN, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
68+
EXPECT_FALSE(QueryReplyFilter(buildQueryData(QType::SRV, QClass::IN, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
6969

70-
EXPECT_TRUE(!QueryReplyFilter(buildQueryData(QType::PTR, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
70+
EXPECT_FALSE(QueryReplyFilter(buildQueryData(QType::PTR, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
7171
}
7272

7373
TEST(TestQueryReplyFilter, TestLongerQueryPath)
@@ -86,7 +86,7 @@ TEST(TestQueryReplyFilter, TestLongerQueryPath)
8686
EXPECT_EQ(SerializedQNameIterator(BytesRange(query, query + sizeof(query)), query), FullQName(kName3));
8787
EXPECT_NE(SerializedQNameIterator(BytesRange(query, query + sizeof(query)), query), FullQName(kName4));
8888

89-
EXPECT_TRUE(!QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
89+
EXPECT_FALSE(QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName1)));
9090
EXPECT_TRUE(QueryReplyFilter(buildQueryData(QType::ANY, QClass::ANY, query)).Accept(QType::A, QClass::IN, FullQName(kName3)));
9191
}
9292
} // namespace

‎src/lib/dnssd/minimal_mdns/tests/TestRecordData.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ TEST(TestRecordData, SrvRecordSimpleParsing)
5555
SerializedQNameIterator name = srv.GetName();
5656

5757
EXPECT_TRUE(name.Next());
58-
EXPECT_EQ(strcmp(name.Value(), "some"), 0);
58+
EXPECT_STREQ(name.Value(), "some");
5959
EXPECT_TRUE(name.Next());
60-
EXPECT_EQ(strcmp(name.Value(), "test"), 0);
60+
EXPECT_STREQ(name.Value(), "test");
6161
EXPECT_TRUE(name.Next());
62-
EXPECT_EQ(strcmp(name.Value(), "local"), 0);
62+
EXPECT_STREQ(name.Value(), "local");
6363
EXPECT_EQ(name.Next(), false);
6464
}
6565
}
@@ -95,11 +95,11 @@ TEST(TestRecordData, SrvWithPtrRecord)
9595
SerializedQNameIterator name = srv.GetName();
9696

9797
EXPECT_TRUE(name.Next());
98-
EXPECT_EQ(strcmp(name.Value(), "foo"), 0);
98+
EXPECT_STREQ(name.Value(), "foo");
9999
EXPECT_TRUE(name.Next());
100-
EXPECT_EQ(strcmp(name.Value(), "some"), 0);
100+
EXPECT_STREQ(name.Value(), "some");
101101
EXPECT_TRUE(name.Next());
102-
EXPECT_EQ(strcmp(name.Value(), "test"), 0);
102+
EXPECT_STREQ(name.Value(), "test");
103103
EXPECT_EQ(name.Next(), false);
104104
}
105105
}
@@ -122,7 +122,7 @@ TEST(TestRecordData, ARecordParsing)
122122
EXPECT_TRUE(Inet::IPAddress::FromString("10.11.12.13", expected));
123123
EXPECT_EQ(addr, expected);
124124
#else
125-
EXPECT_TRUE(!ParseARecord(BytesRange(record, record + sizeof(record)), &addr));
125+
EXPECT_FALSE(ParseARecord(BytesRange(record, record + sizeof(record)), &addr));
126126
#endif // INET_CONFIG_ENABLE_IPV4
127127
}
128128

@@ -159,11 +159,11 @@ TEST(TestRecordData, PtrRecordSimpleParsing)
159159

160160
EXPECT_TRUE(ParsePtrRecord(data, packet, &name));
161161
EXPECT_TRUE(name.Next());
162-
EXPECT_EQ(strcmp(name.Value(), "some"), 0);
162+
EXPECT_STREQ(name.Value(), "some");
163163
EXPECT_TRUE(name.Next());
164-
EXPECT_EQ(strcmp(name.Value(), "test"), 0);
164+
EXPECT_STREQ(name.Value(), "test");
165165
EXPECT_TRUE(name.Next());
166-
EXPECT_EQ(strcmp(name.Value(), "local"), 0);
166+
EXPECT_STREQ(name.Value(), "local");
167167
EXPECT_EQ(name.Next(), false);
168168
}
169169

@@ -187,15 +187,15 @@ TEST(TestRecordData, PtrRecordComplexParsing)
187187

188188
EXPECT_TRUE(ParsePtrRecord(data, packet, &name));
189189
EXPECT_TRUE(name.Next());
190-
EXPECT_EQ(strcmp(name.Value(), "foo"), 0);
190+
EXPECT_STREQ(name.Value(), "foo");
191191
EXPECT_TRUE(name.Next());
192-
EXPECT_EQ(strcmp(name.Value(), "bar"), 0);
192+
EXPECT_STREQ(name.Value(), "bar");
193193
EXPECT_TRUE(name.Next());
194-
EXPECT_EQ(strcmp(name.Value(), "baz"), 0);
194+
EXPECT_STREQ(name.Value(), "baz");
195195
EXPECT_TRUE(name.Next());
196-
EXPECT_EQ(strcmp(name.Value(), "some"), 0);
196+
EXPECT_STREQ(name.Value(), "some");
197197
EXPECT_TRUE(name.Next());
198-
EXPECT_EQ(strcmp(name.Value(), "test"), 0);
198+
EXPECT_STREQ(name.Value(), "test");
199199
EXPECT_EQ(name.Next(), false);
200200
}
201201

‎src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,15 @@ TEST_F(TestResponseSender, NoQueryResponder)
237237

238238
common.recordWriter.WriteQName(common.dnsSd);
239239
responseSender.Respond(1, queryData, &common.packetInfo, ResponseConfiguration());
240-
EXPECT_TRUE(!common.server.GetSendCalled());
240+
EXPECT_FALSE(common.server.GetSendCalled());
241241

242242
common.recordWriter.WriteQName(common.service);
243243
responseSender.Respond(1, queryData, &common.packetInfo, ResponseConfiguration());
244-
EXPECT_TRUE(!common.server.GetSendCalled());
244+
EXPECT_FALSE(common.server.GetSendCalled());
245245

246246
common.recordWriter.WriteQName(common.instance);
247247
responseSender.Respond(1, queryData, &common.packetInfo, ResponseConfiguration());
248-
EXPECT_TRUE(!common.server.GetSendCalled());
248+
EXPECT_FALSE(common.server.GetSendCalled());
249249
}
250250

251251
TEST_F(TestResponseSender, AddManyQueryResponders)
@@ -270,7 +270,7 @@ TEST_F(TestResponseSender, AddManyQueryResponders)
270270

271271
// removing the only copy should clear out everything
272272
responseSender.RemoveQueryResponder(&q1);
273-
EXPECT_TRUE(!responseSender.HasQueryResponders());
273+
EXPECT_FALSE(responseSender.HasQueryResponders());
274274

275275
// At least 7 should be supported:
276276
// - 5 is the spec minimum

0 commit comments

Comments
 (0)