Skip to content

Commit e62bc1c

Browse files
mbknustarkq
mbknust
and
arkq
authored
Switched to pw_unit_test in src/lib/dnssd/minimal_mdns/records/ (#33070)
Co-authored-by: Arkadiusz Bokowy <a.bokowy@samsung.com>
1 parent 8823bd9 commit e62bc1c

File tree

8 files changed

+116
-208
lines changed

8 files changed

+116
-208
lines changed

‎src/lib/dnssd/minimal_mdns/records/tests/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414

1515
import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
17-
import("//build_overrides/nlunit_test.gni")
1817

1918
import("${chip_root}/build/chip/chip_test_suite.gni")
2019

21-
chip_test_suite_using_nltest("tests") {
20+
chip_test_suite("tests") {
2221
output_name = "libMinimalMdnsRecordsTests"
2322

2423
test_sources = [
@@ -34,7 +33,5 @@ chip_test_suite_using_nltest("tests") {
3433
public_deps = [
3534
"${chip_root}/src/lib/core",
3635
"${chip_root}/src/lib/dnssd/minimal_mdns/records",
37-
"${chip_root}/src/lib/support:testing_nlunit",
38-
"${nlunit_test_root}:nlunit-test",
3936
]
4037
}

‎src/lib/dnssd/minimal_mdns/records/tests/TestResourceRecord.cpp

+55-76
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include <lib/dnssd/minimal_mdns/records/ResourceRecord.h>
20-
#include <lib/support/UnitTestRegistration.h>
19+
#include <gtest/gtest.h>
2120

22-
#include <nlunit-test.h>
21+
#include <lib/dnssd/minimal_mdns/records/ResourceRecord.h>
2322

2423
namespace {
2524

@@ -41,7 +40,7 @@ class FakeResourceRecord : public ResourceRecord
4140
const char * mData;
4241
};
4342

44-
void CanWriteSimpleRecord(nlTestSuite * inSuite, void * inContext)
43+
TEST(TestResourceRecord, CanWriteSimpleRecord)
4544
{
4645
uint8_t headerBuffer[HeaderRef::kSizeBytes];
4746
uint8_t dataBuffer[128];
@@ -68,15 +67,15 @@ void CanWriteSimpleRecord(nlTestSuite * inSuite, void * inContext)
6867
's', 'o', 'm', 'e', 'd', 'a', 't', 'a',
6968
};
7069

71-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAnswer, writer));
72-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 1);
73-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 0);
74-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
75-
NL_TEST_ASSERT(inSuite, output.Needed() == sizeof(expectedOutput));
76-
NL_TEST_ASSERT(inSuite, memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)) == 0);
70+
EXPECT_TRUE(record.Append(header, ResourceType::kAnswer, writer));
71+
EXPECT_EQ(header.GetAnswerCount(), 1);
72+
EXPECT_EQ(header.GetAuthorityCount(), 0);
73+
EXPECT_EQ(header.GetAdditionalCount(), 0);
74+
EXPECT_EQ(output.Needed(), sizeof(expectedOutput));
75+
EXPECT_EQ(memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)), 0);
7776
}
7877

79-
void CanWriteMultipleRecords(nlTestSuite * inSuite, void * inContext)
78+
TEST(TestResourceRecord, CanWriteMultipleRecords)
8079
{
8180
uint8_t headerBuffer[HeaderRef::kSizeBytes];
8281
uint8_t dataBuffer[128];
@@ -118,26 +117,26 @@ void CanWriteMultipleRecords(nlTestSuite * inSuite, void * inContext)
118117
'x', 'y', 'z',
119118
};
120119

121-
NL_TEST_ASSERT(inSuite, record1.Append(header, ResourceType::kAnswer, writer));
122-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 1);
123-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 0);
124-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
120+
EXPECT_TRUE(record1.Append(header, ResourceType::kAnswer, writer));
121+
EXPECT_EQ(header.GetAnswerCount(), 1);
122+
EXPECT_EQ(header.GetAuthorityCount(), 0);
123+
EXPECT_EQ(header.GetAdditionalCount(), 0);
125124

126-
NL_TEST_ASSERT(inSuite, record2.Append(header, ResourceType::kAuthority, writer));
127-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 1);
128-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 1);
129-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
125+
EXPECT_TRUE(record2.Append(header, ResourceType::kAuthority, writer));
126+
EXPECT_EQ(header.GetAnswerCount(), 1);
127+
EXPECT_EQ(header.GetAuthorityCount(), 1);
128+
EXPECT_EQ(header.GetAdditionalCount(), 0);
130129

131-
NL_TEST_ASSERT(inSuite, record3.Append(header, ResourceType::kAdditional, writer));
132-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 1);
133-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 1);
134-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 1);
130+
EXPECT_TRUE(record3.Append(header, ResourceType::kAdditional, writer));
131+
EXPECT_EQ(header.GetAnswerCount(), 1);
132+
EXPECT_EQ(header.GetAuthorityCount(), 1);
133+
EXPECT_EQ(header.GetAdditionalCount(), 1);
135134

136-
NL_TEST_ASSERT(inSuite, output.Needed() == sizeof(expectedOutput));
137-
NL_TEST_ASSERT(inSuite, memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)) == 0);
135+
EXPECT_EQ(output.Needed(), sizeof(expectedOutput));
136+
EXPECT_EQ(memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)), 0);
138137
}
139138

140-
void RecordOrderIsEnforced(nlTestSuite * inSuite, void * inContext)
139+
TEST(TestResourceRecord, RecordOrderIsEnforced)
141140
{
142141
uint8_t headerBuffer[HeaderRef::kSizeBytes];
143142
uint8_t dataBuffer[128];
@@ -151,15 +150,15 @@ void RecordOrderIsEnforced(nlTestSuite * inSuite, void * inContext)
151150

152151
header.Clear();
153152
header.SetAuthorityCount(1);
154-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAnswer, writer) == false);
153+
EXPECT_EQ(record.Append(header, ResourceType::kAnswer, writer), false);
155154

156155
header.Clear();
157156
header.SetAdditionalCount(1);
158-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAnswer, writer) == false);
159-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAuthority, writer) == false);
157+
EXPECT_EQ(record.Append(header, ResourceType::kAnswer, writer), false);
158+
EXPECT_EQ(record.Append(header, ResourceType::kAuthority, writer), false);
160159
}
161160

162-
void ErrorsOutOnSmallBuffers(nlTestSuite * inSuite, void * inContext)
161+
TEST(TestResourceRecord, ErrorsOutOnSmallBuffers)
163162
{
164163
uint8_t headerBuffer[HeaderRef::kSizeBytes];
165164
uint8_t dataBuffer[123];
@@ -191,23 +190,23 @@ void ErrorsOutOnSmallBuffers(nlTestSuite * inSuite, void * inContext)
191190
BufferWriter output(dataBuffer, i);
192191
RecordWriter writer(&output);
193192

194-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAnswer, writer) == false);
193+
EXPECT_EQ(record.Append(header, ResourceType::kAnswer, writer), false);
195194

196195
// header untouched
197-
NL_TEST_ASSERT(inSuite, memcmp(headerBuffer, clearHeader, HeaderRef::kSizeBytes) == 0);
196+
EXPECT_EQ(memcmp(headerBuffer, clearHeader, HeaderRef::kSizeBytes), 0);
198197
}
199198

200199
memset(dataBuffer, 0, sizeof(dataBuffer));
201200
BufferWriter output(dataBuffer, sizeof(expectedOutput));
202201
RecordWriter writer(&output);
203202

204-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAnswer, writer));
205-
NL_TEST_ASSERT(inSuite, output.Needed() == sizeof(expectedOutput));
206-
NL_TEST_ASSERT(inSuite, memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)) == 0);
207-
NL_TEST_ASSERT(inSuite, memcmp(headerBuffer, clearHeader, HeaderRef::kSizeBytes) != 0);
203+
EXPECT_TRUE(record.Append(header, ResourceType::kAnswer, writer));
204+
EXPECT_EQ(output.Needed(), sizeof(expectedOutput));
205+
EXPECT_EQ(memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)), 0);
206+
EXPECT_NE(memcmp(headerBuffer, clearHeader, HeaderRef::kSizeBytes), 0);
208207
}
209208

210-
void RecordCount(nlTestSuite * inSuite, void * inContext)
209+
TEST(TestResourceRecord, RecordCount)
211210
{
212211
constexpr int kAppendCount = 10;
213212
uint8_t headerBuffer[HeaderRef::kSizeBytes];
@@ -223,69 +222,49 @@ void RecordCount(nlTestSuite * inSuite, void * inContext)
223222
BufferWriter output(dataBuffer, sizeof(dataBuffer));
224223
RecordWriter writer(&output);
225224

226-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAnswer, writer));
227-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == i + 1);
228-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 0);
229-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
225+
EXPECT_TRUE(record.Append(header, ResourceType::kAnswer, writer));
226+
EXPECT_EQ(header.GetAnswerCount(), i + 1);
227+
EXPECT_EQ(header.GetAuthorityCount(), 0);
228+
EXPECT_EQ(header.GetAdditionalCount(), 0);
230229
}
231230

232231
for (int i = 0; i < kAppendCount; i++)
233232
{
234233
BufferWriter output(dataBuffer, sizeof(dataBuffer));
235234
RecordWriter writer(&output);
236235

237-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAuthority, writer));
238-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == kAppendCount);
239-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == i + 1);
240-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
236+
EXPECT_TRUE(record.Append(header, ResourceType::kAuthority, writer));
237+
EXPECT_EQ(header.GetAnswerCount(), kAppendCount);
238+
EXPECT_EQ(header.GetAuthorityCount(), i + 1);
239+
EXPECT_EQ(header.GetAdditionalCount(), 0);
241240
}
242241

243242
for (int i = 0; i < kAppendCount; i++)
244243
{
245244
BufferWriter output(dataBuffer, sizeof(dataBuffer));
246245
RecordWriter writer(&output);
247246

248-
NL_TEST_ASSERT(inSuite, record.Append(header, ResourceType::kAdditional, writer));
249-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == kAppendCount);
250-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == kAppendCount);
251-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == i + 1);
247+
EXPECT_TRUE(record.Append(header, ResourceType::kAdditional, writer));
248+
EXPECT_EQ(header.GetAnswerCount(), kAppendCount);
249+
EXPECT_EQ(header.GetAuthorityCount(), kAppendCount);
250+
EXPECT_EQ(header.GetAdditionalCount(), i + 1);
252251
}
253252
}
254-
void CacheFlushBit(nlTestSuite * inSuite, void * inContext)
253+
TEST(TestResourceRecord, CacheFlushBit)
255254
{
256255
FakeResourceRecord record("somedata");
257256
// No cache flush bit by default.
258-
NL_TEST_ASSERT(inSuite, record.GetClass() == QClass::IN);
259-
NL_TEST_ASSERT(inSuite, record.GetCacheFlush() == false);
257+
EXPECT_EQ(record.GetClass(), QClass::IN);
258+
EXPECT_EQ(record.GetCacheFlush(), false);
260259

261260
// Check we can set flush bit and the class marker reflects that.
262261
record.SetCacheFlush(true);
263-
NL_TEST_ASSERT(inSuite, record.GetClass() == QClass::IN_FLUSH);
264-
NL_TEST_ASSERT(inSuite, record.GetCacheFlush() == true);
262+
EXPECT_EQ(record.GetClass(), QClass::IN_FLUSH);
263+
EXPECT_EQ(record.GetCacheFlush(), true);
265264

266265
// Check we can unset.
267266
record.SetCacheFlush(false);
268-
NL_TEST_ASSERT(inSuite, record.GetClass() == QClass::IN);
269-
NL_TEST_ASSERT(inSuite, record.GetCacheFlush() == false);
267+
EXPECT_EQ(record.GetClass(), QClass::IN);
268+
EXPECT_EQ(record.GetCacheFlush(), false);
270269
}
271-
272-
const nlTest sTests[] = {
273-
NL_TEST_DEF("CanWriteSimpleRecord", CanWriteSimpleRecord), //
274-
NL_TEST_DEF("CanWriteMultipleRecords", CanWriteMultipleRecords), //
275-
NL_TEST_DEF("RecordOrderIsEnforced", RecordOrderIsEnforced), //
276-
NL_TEST_DEF("ErrorsOutOnSmallBuffers", ErrorsOutOnSmallBuffers), //
277-
NL_TEST_DEF("RecordCount", RecordCount), //
278-
NL_TEST_DEF("CacheFlushBit", CacheFlushBit), //
279-
NL_TEST_SENTINEL() //
280-
};
281-
282270
} // namespace
283-
284-
int TestResourceRecord()
285-
{
286-
nlTestSuite theSuite = { "ResourceRecord", sTests, nullptr, nullptr };
287-
nlTestRunner(&theSuite, nullptr);
288-
return nlTestRunnerStats(&theSuite);
289-
}
290-
291-
CHIP_REGISTER_TEST_SUITE(TestResourceRecord)

‎src/lib/dnssd/minimal_mdns/records/tests/TestResourceRecordIP.cpp

+31-51
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
#include <lib/dnssd/minimal_mdns/records/IP.h>
19-
#include <lib/support/UnitTestRegistration.h>
2018

21-
#include <nlunit-test.h>
19+
#include <gtest/gtest.h>
20+
21+
#include <lib/dnssd/minimal_mdns/records/IP.h>
2222

2323
namespace {
2424

@@ -30,11 +30,11 @@ using namespace chip::Encoding::BigEndian;
3030
const QNamePart kNames[] = { "some", "test", "local" };
3131

3232
#if INET_CONFIG_ENABLE_IPV4
33-
void WriteIPv4(nlTestSuite * inSuite, void * inContext)
33+
TEST(TestResourceRecordIP, WriteIPv4)
3434
{
3535
IPAddress ipAddress;
3636

37-
NL_TEST_ASSERT(inSuite, IPAddress::FromString("10.20.30.40", ipAddress));
37+
EXPECT_TRUE(IPAddress::FromString("10.20.30.40", ipAddress));
3838

3939
uint8_t headerBuffer[HeaderRef::kSizeBytes];
4040
uint8_t dataBuffer[128];
@@ -63,12 +63,12 @@ void WriteIPv4(nlTestSuite * inSuite, void * inContext)
6363
10, 20, 30, 40 // IP Address
6464
};
6565

66-
NL_TEST_ASSERT(inSuite, ipResourceRecord.Append(header, ResourceType::kAnswer, writer));
67-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 1);
68-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 0);
69-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
70-
NL_TEST_ASSERT(inSuite, output.Needed() == sizeof(expectedOutput));
71-
NL_TEST_ASSERT(inSuite, memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)) == 0);
66+
EXPECT_TRUE(ipResourceRecord.Append(header, ResourceType::kAnswer, writer));
67+
EXPECT_EQ(header.GetAnswerCount(), 1);
68+
EXPECT_EQ(header.GetAuthorityCount(), 0);
69+
EXPECT_EQ(header.GetAdditionalCount(), 0);
70+
EXPECT_EQ(output.Needed(), sizeof(expectedOutput));
71+
EXPECT_EQ(memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)), 0);
7272
}
7373

7474
{
@@ -93,12 +93,12 @@ void WriteIPv4(nlTestSuite * inSuite, void * inContext)
9393
10, 20, 30, 40 // IP Address
9494
};
9595

96-
NL_TEST_ASSERT(inSuite, ipResourceRecord.Append(header, ResourceType::kAuthority, writer));
97-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 0);
98-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 1);
99-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
100-
NL_TEST_ASSERT(inSuite, output.Needed() == sizeof(expectedOutput));
101-
NL_TEST_ASSERT(inSuite, memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)) == 0);
96+
EXPECT_TRUE(ipResourceRecord.Append(header, ResourceType::kAuthority, writer));
97+
EXPECT_EQ(header.GetAnswerCount(), 0);
98+
EXPECT_EQ(header.GetAuthorityCount(), 1);
99+
EXPECT_EQ(header.GetAdditionalCount(), 0);
100+
EXPECT_EQ(output.Needed(), sizeof(expectedOutput));
101+
EXPECT_EQ(memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)), 0);
102102
}
103103

104104
{
@@ -123,21 +123,21 @@ void WriteIPv4(nlTestSuite * inSuite, void * inContext)
123123
10, 20, 30, 40 // IP Address
124124
};
125125

126-
NL_TEST_ASSERT(inSuite, ipResourceRecord.Append(header, ResourceType::kAdditional, writer));
127-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 0);
128-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 0);
129-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 1);
130-
NL_TEST_ASSERT(inSuite, output.Needed() == sizeof(expectedOutput));
131-
NL_TEST_ASSERT(inSuite, memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)) == 0);
126+
EXPECT_TRUE(ipResourceRecord.Append(header, ResourceType::kAdditional, writer));
127+
EXPECT_EQ(header.GetAnswerCount(), 0);
128+
EXPECT_EQ(header.GetAuthorityCount(), 0);
129+
EXPECT_EQ(header.GetAdditionalCount(), 1);
130+
EXPECT_EQ(output.Needed(), sizeof(expectedOutput));
131+
EXPECT_EQ(memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)), 0);
132132
}
133133
}
134134
#endif // INET_CONFIG_ENABLE_IPV4
135135

136-
void WriteIPv6(nlTestSuite * inSuite, void * inContext)
136+
TEST(TestResourceRecordIP, WriteIPv6)
137137
{
138138
IPAddress ipAddress;
139139

140-
NL_TEST_ASSERT(inSuite, IPAddress::FromString("fe80::224:32ff:fe19:359b", ipAddress));
140+
EXPECT_TRUE(IPAddress::FromString("fe80::224:32ff:fe19:359b", ipAddress));
141141

142142
uint8_t headerBuffer[HeaderRef::kSizeBytes];
143143
uint8_t dataBuffer[128];
@@ -167,31 +167,11 @@ void WriteIPv6(nlTestSuite * inSuite, void * inContext)
167167
0xfe, 0x19, 0x35, 0x9b
168168
};
169169

170-
NL_TEST_ASSERT(inSuite, ipResourceRecord.Append(header, ResourceType::kAnswer, writer));
171-
NL_TEST_ASSERT(inSuite, header.GetAnswerCount() == 1);
172-
NL_TEST_ASSERT(inSuite, header.GetAuthorityCount() == 0);
173-
NL_TEST_ASSERT(inSuite, header.GetAdditionalCount() == 0);
174-
NL_TEST_ASSERT(inSuite, output.Needed() == sizeof(expectedOutput));
175-
NL_TEST_ASSERT(inSuite, memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)) == 0);
170+
EXPECT_TRUE(ipResourceRecord.Append(header, ResourceType::kAnswer, writer));
171+
EXPECT_EQ(header.GetAnswerCount(), 1);
172+
EXPECT_EQ(header.GetAuthorityCount(), 0);
173+
EXPECT_EQ(header.GetAdditionalCount(), 0);
174+
EXPECT_EQ(output.Needed(), sizeof(expectedOutput));
175+
EXPECT_EQ(memcmp(dataBuffer, expectedOutput, sizeof(expectedOutput)), 0);
176176
}
177-
178-
const nlTest sTests[] = {
179-
#if INET_CONFIG_ENABLE_IPV4
180-
NL_TEST_DEF("IPV4", WriteIPv4), //
181-
#endif // INET_CONFIG_ENABLE_IPV4
182-
NL_TEST_DEF("IPV6", WriteIPv6), //
183-
NL_TEST_SENTINEL() //
184-
};
185-
186177
} // namespace
187-
188-
int TestIPResourceRecord()
189-
{
190-
191-
nlTestSuite theSuite = { "IPResourceRecord", sTests, nullptr, nullptr };
192-
nlTestRunner(&theSuite, nullptr);
193-
194-
return (nlTestRunnerStats(&theSuite));
195-
}
196-
197-
CHIP_REGISTER_TEST_SUITE(TestIPResourceRecord)

0 commit comments

Comments
 (0)