Skip to content

Commit a53c7a1

Browse files
authored
Replaced nlunit-test with pw_unit_test in src/lib/address_resolve/ (#33064)
1 parent 858d870 commit a53c7a1

File tree

2 files changed

+25
-45
lines changed

2 files changed

+25
-45
lines changed

src/lib/address_resolve/tests/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
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}/src/lib/address_resolve/address_resolve.gni")
2019

2120
import("${chip_root}/build/chip/chip_test_suite.gni")
2221

23-
chip_test_suite_using_nltest("tests") {
22+
chip_test_suite("tests") {
2423
output_name = "libAddressResolveTests"
2524

2625
if (chip_address_resolve_strategy == "default") {
@@ -29,8 +28,6 @@ chip_test_suite_using_nltest("tests") {
2928

3029
public_deps = [
3130
"${chip_root}/src/lib/address_resolve",
32-
"${chip_root}/src/lib/support:testing_nlunit",
3331
"${chip_root}/src/protocols",
34-
"${nlunit_test_root}:nlunit-test",
3532
]
3633
}

src/lib/address_resolve/tests/TestAddressResolve_DefaultImpl.cpp

+24-41
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include <lib/address_resolve/AddressResolve_DefaultImpl.h>
17-
18-
#include <lib/support/UnitTestRegistration.h>
16+
#include <gtest/gtest.h>
1917

20-
#include <nlunit-test.h>
18+
#include <lib/address_resolve/AddressResolve_DefaultImpl.h>
2119

2220
using namespace chip;
2321
using namespace chip::AddressResolve;
@@ -66,7 +64,7 @@ Transport::PeerAddress GetAddressWithHighScore(uint16_t port = CHIP_PORT, Inet::
6664
return Transport::PeerAddress::UDP(ipAddress, port, interfaceId);
6765
}
6866

69-
void TestLookupResult(nlTestSuite * inSuite, void * inContext)
67+
TEST(TestAddressResolveDefaultImpl, TestLookupResult)
7068
{
7169
ResolveResult lowResult;
7270
lowResult.address = GetAddressWithLowScore();
@@ -83,8 +81,8 @@ void TestLookupResult(nlTestSuite * inSuite, void * inContext)
8381
IpScore mediumScore = ScoreIpAddress(mediumResult.address.GetIPAddress(), Inet::InterfaceId::Null());
8482
IpScore highScore = ScoreIpAddress(highResult.address.GetIPAddress(), Inet::InterfaceId::Null());
8583

86-
NL_TEST_ASSERT(inSuite, to_underlying(lowScore) < to_underlying(mediumScore));
87-
NL_TEST_ASSERT(inSuite, to_underlying(mediumScore) < to_underlying(highScore));
84+
EXPECT_LT(to_underlying(lowScore), to_underlying(mediumScore));
85+
EXPECT_LT(to_underlying(mediumScore), to_underlying(highScore));
8886

8987
ResolveResult outResult;
9088

@@ -95,20 +93,20 @@ void TestLookupResult(nlTestSuite * inSuite, void * inContext)
9593
handle.ResetForLookup(now, request);
9694

9795
// Check that no result exists.
98-
NL_TEST_ASSERT(inSuite, !handle.HasLookupResult());
96+
EXPECT_FALSE(handle.HasLookupResult());
9997

10098
// Fill a single slot.
10199
handle.LookupResult(lowResult);
102100

103101
// Check that a result exists.
104-
NL_TEST_ASSERT(inSuite, handle.HasLookupResult());
102+
EXPECT_TRUE(handle.HasLookupResult());
105103

106104
// Check that the result match what has been inserted.
107105
outResult = handle.TakeLookupResult();
108-
NL_TEST_ASSERT(inSuite, lowResult.address == outResult.address);
106+
EXPECT_EQ(lowResult.address, outResult.address);
109107

110108
// Check that the result has been consumed properly
111-
NL_TEST_ASSERT(inSuite, !handle.HasLookupResult());
109+
EXPECT_FALSE(handle.HasLookupResult());
112110

113111
handle.ResetForLookup(now, request);
114112

@@ -121,13 +119,13 @@ void TestLookupResult(nlTestSuite * inSuite, void * inContext)
121119
// Read back all results and validate that they match the input.
122120
for (auto i = 0; i < kNumberOfAvailableSlots; i++)
123121
{
124-
NL_TEST_ASSERT(inSuite, handle.HasLookupResult());
122+
EXPECT_TRUE(handle.HasLookupResult());
125123
outResult = handle.TakeLookupResult();
126-
NL_TEST_ASSERT(inSuite, lowResult.address == outResult.address);
124+
EXPECT_EQ(lowResult.address, outResult.address);
127125
}
128126

129127
// Check that the results has been consumed properly.
130-
NL_TEST_ASSERT(inSuite, !handle.HasLookupResult());
128+
EXPECT_FALSE(handle.HasLookupResult());
131129

132130
handle.ResetForLookup(now, request);
133131

@@ -140,13 +138,13 @@ void TestLookupResult(nlTestSuite * inSuite, void * inContext)
140138
// Read back all results and validate that they match the input.
141139
for (auto i = 0; i < kNumberOfAvailableSlots; i++)
142140
{
143-
NL_TEST_ASSERT(inSuite, handle.HasLookupResult());
141+
EXPECT_TRUE(handle.HasLookupResult());
144142
outResult = handle.TakeLookupResult();
145-
NL_TEST_ASSERT(inSuite, lowResult.address == outResult.address);
143+
EXPECT_EQ(lowResult.address, outResult.address);
146144
}
147145

148146
// Check that the results has been consumed properly.
149-
NL_TEST_ASSERT(inSuite, !handle.HasLookupResult());
147+
EXPECT_FALSE(handle.HasLookupResult());
150148

151149
handle.ResetForLookup(now, request);
152150

@@ -158,9 +156,9 @@ void TestLookupResult(nlTestSuite * inSuite, void * inContext)
158156

159157
// Add a result with a medium score and ensure it sits at the top.
160158
handle.LookupResult(mediumResult);
161-
NL_TEST_ASSERT(inSuite, handle.HasLookupResult());
159+
EXPECT_TRUE(handle.HasLookupResult());
162160
outResult = handle.TakeLookupResult();
163-
NL_TEST_ASSERT(inSuite, mediumResult.address == outResult.address);
161+
EXPECT_EQ(mediumResult.address, outResult.address);
164162

165163
handle.ResetForLookup(now, request);
166164

@@ -173,45 +171,30 @@ void TestLookupResult(nlTestSuite * inSuite, void * inContext)
173171
// Add a result with a medium score and a result with a high score and ensure the result with the high score comes first.
174172
handle.LookupResult(mediumResult);
175173
handle.LookupResult(highResult);
176-
NL_TEST_ASSERT(inSuite, handle.HasLookupResult());
174+
EXPECT_TRUE(handle.HasLookupResult());
177175
outResult = handle.TakeLookupResult();
178-
NL_TEST_ASSERT(inSuite, highResult.address == outResult.address);
176+
EXPECT_EQ(highResult.address, outResult.address);
179177

180178
if (kNumberOfAvailableSlots > 1)
181179
{
182180
// Ensure the second result is the medium result.
183-
NL_TEST_ASSERT(inSuite, handle.HasLookupResult());
181+
EXPECT_TRUE(handle.HasLookupResult());
184182
outResult = handle.TakeLookupResult();
185-
NL_TEST_ASSERT(inSuite, mediumResult.address == outResult.address);
183+
EXPECT_EQ(mediumResult.address, outResult.address);
186184
}
187185

188186
if (kNumberOfAvailableSlots > 2)
189187
{
190188
// Ensure that all the other results are low results.
191189
for (auto i = 2; i < kNumberOfAvailableSlots; i++)
192190
{
193-
NL_TEST_ASSERT(inSuite, handle.HasLookupResult());
191+
EXPECT_TRUE(handle.HasLookupResult());
194192
outResult = handle.TakeLookupResult();
195-
NL_TEST_ASSERT(inSuite, lowResult.address == outResult.address);
193+
EXPECT_EQ(lowResult.address, outResult.address);
196194
}
197195
}
198196

199197
// Check that the results has been consumed properly.
200-
NL_TEST_ASSERT(inSuite, !handle.HasLookupResult());
198+
EXPECT_FALSE(handle.HasLookupResult());
201199
}
202-
203-
const nlTest sTests[] = {
204-
NL_TEST_DEF("TestLookupResult", TestLookupResult), //
205-
NL_TEST_SENTINEL() //
206-
};
207-
208200
} // namespace
209-
210-
int TestAddressResolve_DefaultImpl()
211-
{
212-
nlTestSuite theSuite = { "AddressResolve_DefaultImpl", sTests, nullptr, nullptr };
213-
nlTestRunner(&theSuite, nullptr);
214-
return nlTestRunnerStats(&theSuite);
215-
}
216-
217-
CHIP_REGISTER_TEST_SUITE(TestAddressResolve_DefaultImpl)

0 commit comments

Comments
 (0)