Skip to content

Commit b008715

Browse files
mbknustarkq
mbknust
and
arkq
authored
Switched to pw_unit_test in src/lib/dnssd/minimal_mdns/responders/ (#33071)
* Switched to pw_unit_test in src/lib/dnssd/minimal_mdns/responders/ * Update src/lib/dnssd/minimal_mdns/responders/tests/TestIPResponder.cpp --------- Co-authored-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> Co-authored-by: Arkadiusz Bokowy <a.bokowy@samsung.com>
1 parent 72e7554 commit b008715

File tree

6 files changed

+95
-164
lines changed

6 files changed

+95
-164
lines changed

‎src/lib/dnssd/minimal_mdns/responders/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 = "libMinimalMdnsRespondersTests"
2322

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

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

+27-53
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020

2121
#include <lib/dnssd/minimal_mdns/AddressPolicy_DefaultImpl.h>
2222
#include <lib/support/CHIPMem.h>
23-
#include <lib/support/UnitTestRegistration.h>
2423

25-
#include <nlunit-test.h>
24+
#include <gtest/gtest.h>
2625

2726
namespace {
2827

@@ -37,17 +36,13 @@ const QNamePart kNames[] = { "some", "test", "local" };
3736
class IPResponseAccumulator : public ResponderDelegate
3837
{
3938
public:
40-
IPResponseAccumulator(nlTestSuite * suite) : mSuite(suite) {}
4139
void AddResponse(const ResourceRecord & record) override
4240
{
4341

44-
NL_TEST_ASSERT(mSuite, (record.GetType() == QType::A) || (record.GetType() == QType::AAAA));
45-
NL_TEST_ASSERT(mSuite, record.GetClass() == QClass::IN_FLUSH);
46-
NL_TEST_ASSERT(mSuite, record.GetName() == kNames);
42+
EXPECT_TRUE((record.GetType() == QType::A) || (record.GetType() == QType::AAAA));
43+
EXPECT_EQ(record.GetClass(), QClass::IN_FLUSH);
44+
EXPECT_EQ(record.GetName(), kNames);
4745
}
48-
49-
private:
50-
nlTestSuite * mSuite;
5146
};
5247

5348
InterfaceId FindValidInterfaceId()
@@ -62,19 +57,30 @@ InterfaceId FindValidInterfaceId()
6257
return InterfaceId::Null();
6358
}
6459

60+
class TestIPResponder : public ::testing::Test
61+
{
62+
public:
63+
static void SetUpTestSuite()
64+
{
65+
mdns::Minimal::SetDefaultAddressPolicy();
66+
ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR);
67+
}
68+
static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
69+
};
70+
6571
#if INET_CONFIG_ENABLE_IPV4
66-
void TestIPv4(nlTestSuite * inSuite, void * inContext)
72+
TEST_F(TestIPResponder, TestIPv4)
6773
{
6874
IPAddress ipAddress;
69-
NL_TEST_ASSERT(inSuite, IPAddress::FromString("10.20.30.40", ipAddress));
75+
EXPECT_TRUE(IPAddress::FromString("10.20.30.40", ipAddress));
7076

7177
IPv4Responder responder(kNames);
7278

73-
NL_TEST_ASSERT(inSuite, responder.GetQClass() == QClass::IN);
74-
NL_TEST_ASSERT(inSuite, responder.GetQType() == QType::A);
75-
NL_TEST_ASSERT(inSuite, responder.GetQName() == kNames);
79+
EXPECT_EQ(responder.GetQClass(), QClass::IN);
80+
EXPECT_EQ(responder.GetQType(), QType::A);
81+
EXPECT_EQ(responder.GetQName(), kNames);
7682

77-
IPResponseAccumulator acc(inSuite);
83+
IPResponseAccumulator acc;
7884
chip::Inet::IPPacketInfo packetInfo;
7985

8086
packetInfo.SrcAddress = ipAddress;
@@ -87,18 +93,18 @@ void TestIPv4(nlTestSuite * inSuite, void * inContext)
8793
}
8894
#endif // INET_CONFIG_ENABLE_IPV4
8995

90-
void TestIPv6(nlTestSuite * inSuite, void * inContext)
96+
TEST_F(TestIPResponder, TestIPv6)
9197
{
9298
IPAddress ipAddress;
93-
NL_TEST_ASSERT(inSuite, IPAddress::FromString("fe80::224:32ff:aabb:ccdd", ipAddress));
99+
EXPECT_TRUE(IPAddress::FromString("fe80::224:32ff:aabb:ccdd", ipAddress));
94100

95101
IPv6Responder responder(kNames);
96102

97-
NL_TEST_ASSERT(inSuite, responder.GetQClass() == QClass::IN);
98-
NL_TEST_ASSERT(inSuite, responder.GetQType() == QType::AAAA);
99-
NL_TEST_ASSERT(inSuite, responder.GetQName() == kNames);
103+
EXPECT_EQ(responder.GetQClass(), QClass::IN);
104+
EXPECT_EQ(responder.GetQType(), QType::AAAA);
105+
EXPECT_EQ(responder.GetQName(), kNames);
100106

101-
IPResponseAccumulator acc(inSuite);
107+
IPResponseAccumulator acc;
102108
chip::Inet::IPPacketInfo packetInfo;
103109

104110
packetInfo.SrcAddress = ipAddress;
@@ -110,36 +116,4 @@ void TestIPv6(nlTestSuite * inSuite, void * inContext)
110116
responder.AddAllResponses(&packetInfo, &acc, ResponseConfiguration());
111117
}
112118

113-
int Setup(void * inContext)
114-
{
115-
mdns::Minimal::SetDefaultAddressPolicy();
116-
117-
CHIP_ERROR error = chip::Platform::MemoryInit();
118-
119-
return (error == CHIP_NO_ERROR) ? SUCCESS : FAILURE;
120-
}
121-
122-
int Teardown(void * inContext)
123-
{
124-
chip::Platform::MemoryShutdown();
125-
return SUCCESS;
126-
}
127-
128-
const nlTest sTests[] = {
129-
#if INET_CONFIG_ENABLE_IPV4
130-
NL_TEST_DEF("TestIPv4", TestIPv4), //
131-
#endif // INET_CONFIG_ENABLE_IPV4
132-
NL_TEST_DEF("TestIPv6", TestIPv6), //
133-
NL_TEST_SENTINEL() //
134-
};
135-
136119
} // namespace
137-
138-
int TestIP()
139-
{
140-
nlTestSuite theSuite = { "IP", sTests, &Setup, &Teardown };
141-
nlTestRunner(&theSuite, nullptr);
142-
return nlTestRunnerStats(&theSuite);
143-
}
144-
145-
CHIP_REGISTER_TEST_SUITE(TestIP)

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

+26-44
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020

2121
#include <lib/dnssd/minimal_mdns/Parser.h>
2222
#include <lib/dnssd/minimal_mdns/RecordData.h>
23-
#include <lib/support/UnitTestRegistration.h>
2423

25-
#include <nlunit-test.h>
24+
#include <gtest/gtest.h>
2625

2726
namespace {
2827

@@ -39,13 +38,13 @@ const QNamePart kTargetNames[] = { "point", "to", "this" };
3938
class PtrResponseAccumulator : public ResponderDelegate
4039
{
4140
public:
42-
PtrResponseAccumulator(nlTestSuite * suite, const uint32_t expectedTtl) : mSuite(suite), mExpectedTtl(expectedTtl) {}
41+
PtrResponseAccumulator(const uint32_t expectedTtl) : mExpectedTtl(expectedTtl) {}
4342
void AddResponse(const ResourceRecord & record) override
4443
{
4544

46-
NL_TEST_ASSERT(mSuite, record.GetType() == QType::PTR);
47-
NL_TEST_ASSERT(mSuite, record.GetClass() == QClass::IN);
48-
NL_TEST_ASSERT(mSuite, record.GetName() == kNames);
45+
EXPECT_EQ(record.GetType(), QType::PTR);
46+
EXPECT_EQ(record.GetClass(), QClass::IN);
47+
EXPECT_EQ(record.GetName(), kNames);
4948

5049
if (record.GetType() == QType::PTR)
5150
{
@@ -58,44 +57,43 @@ class PtrResponseAccumulator : public ResponderDelegate
5857
HeaderRef hdr(headerBuffer);
5958
hdr.Clear();
6059

61-
NL_TEST_ASSERT(mSuite, record.Append(hdr, ResourceType::kAnswer, writer));
60+
EXPECT_TRUE(record.Append(hdr, ResourceType::kAnswer, writer));
6261

6362
ResourceData data;
6463
SerializedQNameIterator target;
6564
const uint8_t * start = buffer;
6665

67-
NL_TEST_ASSERT(mSuite, out.Fit());
66+
EXPECT_TRUE(out.Fit());
6867

6968
BytesRange validDataRange(buffer, buffer + out.Needed());
7069

71-
NL_TEST_ASSERT(mSuite, data.Parse(validDataRange, &start));
72-
NL_TEST_ASSERT(mSuite, start == (buffer + out.Needed()));
73-
NL_TEST_ASSERT(mSuite, data.GetName() == FullQName(kNames));
74-
NL_TEST_ASSERT(mSuite, data.GetType() == QType::PTR);
75-
NL_TEST_ASSERT(mSuite, data.GetTtlSeconds() == mExpectedTtl);
70+
EXPECT_TRUE(data.Parse(validDataRange, &start));
71+
EXPECT_EQ(start, (buffer + out.Needed()));
72+
EXPECT_EQ(data.GetName(), FullQName(kNames));
73+
EXPECT_EQ(data.GetType(), QType::PTR);
74+
EXPECT_EQ(data.GetTtlSeconds(), mExpectedTtl);
7675

77-
NL_TEST_ASSERT(mSuite, ParsePtrRecord(data.GetData(), validDataRange, &target));
78-
NL_TEST_ASSERT(mSuite, target == FullQName(kTargetNames));
76+
EXPECT_TRUE(ParsePtrRecord(data.GetData(), validDataRange, &target));
77+
EXPECT_EQ(target, FullQName(kTargetNames));
7978
}
8079
}
8180

8281
private:
83-
nlTestSuite * mSuite;
8482
const uint32_t mExpectedTtl;
8583
};
8684

87-
void TestPtrResponse(nlTestSuite * inSuite, void * inContext)
85+
TEST(TestPtrResponder, TestPtrResponse)
8886
{
8987
IPAddress ipAddress;
90-
NL_TEST_ASSERT(inSuite, IPAddress::FromString("2607:f8b0:4005:804::200e", ipAddress));
88+
EXPECT_TRUE(IPAddress::FromString("2607:f8b0:4005:804::200e", ipAddress));
9189

9290
PtrResponder responder(kNames, kTargetNames);
9391

94-
NL_TEST_ASSERT(inSuite, responder.GetQClass() == QClass::IN);
95-
NL_TEST_ASSERT(inSuite, responder.GetQType() == QType::PTR);
96-
NL_TEST_ASSERT(inSuite, responder.GetQName() == kNames);
92+
EXPECT_EQ(responder.GetQClass(), QClass::IN);
93+
EXPECT_EQ(responder.GetQType(), QType::PTR);
94+
EXPECT_EQ(responder.GetQName(), kNames);
9795

98-
PtrResponseAccumulator acc(inSuite, ResourceRecord::kDefaultTtl);
96+
PtrResponseAccumulator acc(ResourceRecord::kDefaultTtl);
9997
chip::Inet::IPPacketInfo packetInfo;
10098

10199
packetInfo.SrcAddress = ipAddress;
@@ -107,18 +105,18 @@ void TestPtrResponse(nlTestSuite * inSuite, void * inContext)
107105
responder.AddAllResponses(&packetInfo, &acc, ResponseConfiguration());
108106
}
109107

110-
void TestPtrResponseOverrideTtl(nlTestSuite * inSuite, void * inContext)
108+
TEST(TestPtrResponder, TestPtrResponseOverrideTtl)
111109
{
112110
IPAddress ipAddress;
113-
NL_TEST_ASSERT(inSuite, IPAddress::FromString("2607:f8b0:4005:804::200e", ipAddress));
111+
EXPECT_TRUE(IPAddress::FromString("2607:f8b0:4005:804::200e", ipAddress));
114112

115113
PtrResponder responder(kNames, kTargetNames);
116114

117-
NL_TEST_ASSERT(inSuite, responder.GetQClass() == QClass::IN);
118-
NL_TEST_ASSERT(inSuite, responder.GetQType() == QType::PTR);
119-
NL_TEST_ASSERT(inSuite, responder.GetQName() == kNames);
115+
EXPECT_EQ(responder.GetQClass(), QClass::IN);
116+
EXPECT_EQ(responder.GetQType(), QType::PTR);
117+
EXPECT_EQ(responder.GetQName(), kNames);
120118

121-
PtrResponseAccumulator acc(inSuite, 123);
119+
PtrResponseAccumulator acc(123);
122120
chip::Inet::IPPacketInfo packetInfo;
123121

124122
packetInfo.SrcAddress = ipAddress;
@@ -129,20 +127,4 @@ void TestPtrResponseOverrideTtl(nlTestSuite * inSuite, void * inContext)
129127

130128
responder.AddAllResponses(&packetInfo, &acc, ResponseConfiguration().SetTtlSecondsOverride(123));
131129
}
132-
133-
const nlTest sTests[] = {
134-
NL_TEST_DEF("TestPtrResponse", TestPtrResponse), //
135-
NL_TEST_DEF("TestPtrResponseOverrideTtl", TestPtrResponseOverrideTtl), //
136-
NL_TEST_SENTINEL() //
137-
};
138-
139130
} // namespace
140-
141-
int TestPtr()
142-
{
143-
nlTestSuite theSuite = { "IP", sTests, nullptr, nullptr };
144-
nlTestRunner(&theSuite, nullptr);
145-
return nlTestRunnerStats(&theSuite);
146-
}
147-
148-
CHIP_REGISTER_TEST_SUITE(TestPtr)

0 commit comments

Comments
 (0)