Skip to content

Commit 479d243

Browse files
mbknustrestyled-commits
mbknust
and
restyled-commits
authored
Replaced nlunit-test with pw_unit_test in src/lib/core/ (#33062)
* Replaced nlunit-test with pw_unit_test in src/lib/core/ * Restyled by whitespace * Restyled by clang-format * Update openiotsdk test components * Use ASSERT_EQ instead of VerifyOrDie * Removed redundant nullptr checks * Use EXPECT_STREQ --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent a860932 commit 479d243

11 files changed

+1377
-1778
lines changed

‎src/lib/core/tests/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
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
import("${chip_root}/build/chip/fuzz_test.gni")
2120

22-
chip_test_suite_using_nltest("tests") {
21+
chip_test_suite("tests") {
2322
output_name = "libCoreTests"
2423

2524
test_sources = [
@@ -39,9 +38,7 @@ chip_test_suite_using_nltest("tests") {
3938
"${chip_root}/src/lib/core",
4039
"${chip_root}/src/lib/core:vectortlv",
4140
"${chip_root}/src/lib/support:test_utils",
42-
"${chip_root}/src/lib/support:testing_nlunit",
4341
"${chip_root}/src/platform",
44-
"${nlunit_test_root}:nlunit-test",
4542
]
4643
}
4744

‎src/lib/core/tests/TestCATValues.cpp

+52-101
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include <lib/support/UnitTestRegistration.h>
20-
#include <nlunit-test.h>
19+
#include <gtest/gtest.h>
2120

2221
#include <lib/core/CASEAuthTag.h>
2322

2423
using namespace chip;
2524

26-
void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
25+
TEST(TestCATValues, TestEqualityOperator)
2726
{
2827
{
2928
auto a = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'0003 } };
@@ -37,7 +36,7 @@ void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
3736
{
3837
for (auto & inner : candidates)
3938
{
40-
NL_TEST_ASSERT(inSuite, inner == outer);
39+
EXPECT_EQ(inner, outer);
4140
}
4241
}
4342
}
@@ -49,7 +48,7 @@ void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
4948
{
5049
for (auto & inner : candidates)
5150
{
52-
NL_TEST_ASSERT(inSuite, inner == outer);
51+
EXPECT_EQ(inner, outer);
5352
}
5453
}
5554
}
@@ -65,13 +64,13 @@ void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
6564
{
6665
for (auto & inner : candidates)
6766
{
68-
NL_TEST_ASSERT(inSuite, inner == outer);
67+
EXPECT_EQ(inner, outer);
6968
}
7069
}
7170
}
7271
}
7372

74-
void TestInequalityOperator(nlTestSuite * inSuite, void * inContext)
73+
TEST(TestCATValues, TestInequalityOperator)
7574
{
7675
auto a = CATValues{ { 0x1111'0001 } };
7776
auto b = CATValues{ { 0x1111'0001, 0x2222'0002 } };
@@ -103,12 +102,12 @@ void TestInequalityOperator(nlTestSuite * inSuite, void * inContext)
103102
{
104103
continue;
105104
}
106-
NL_TEST_ASSERT(inSuite, inner != outer);
105+
EXPECT_NE(inner, outer);
107106
}
108107
}
109108
}
110109

111-
void TestValidity(nlTestSuite * inSuite, void * inContext)
110+
TEST(TestCATValues, TestValidity)
112111
{
113112
{
114113
auto a = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'0003 } };
@@ -119,7 +118,7 @@ void TestValidity(nlTestSuite * inSuite, void * inContext)
119118
CATValues validCandidates[] = { a, b, c, d, e };
120119
for (auto & candidate : validCandidates)
121120
{
122-
NL_TEST_ASSERT(inSuite, candidate.AreValid());
121+
EXPECT_TRUE(candidate.AreValid());
123122
}
124123
}
125124

@@ -130,117 +129,69 @@ void TestValidity(nlTestSuite * inSuite, void * inContext)
130129
CATValues invalidCandidates[] = { versionZero1, versionZero2, collidingId };
131130
for (auto & candidate : invalidCandidates)
132131
{
133-
NL_TEST_ASSERT(inSuite, !candidate.AreValid());
132+
EXPECT_FALSE(candidate.AreValid());
134133
}
135134
}
136135
}
137136

138-
void TestMembership(nlTestSuite * inSuite, void * inContext)
137+
TEST(TestCATValues, TestMembership)
139138
{
140139
auto a = CATValues{ { 0x1111'0001 } };
141140
auto b = CATValues{ { 0x1111'0001, 0x2222'0002 } };
142141
auto c = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'0003 } };
143142

144-
NL_TEST_ASSERT(inSuite, a.Contains(0x1111'0001));
145-
NL_TEST_ASSERT(inSuite, a.GetNumTagsPresent() == 1);
146-
NL_TEST_ASSERT(inSuite, !a.Contains(0x1111'0002));
147-
NL_TEST_ASSERT(inSuite, !a.Contains(0x2222'0002));
148-
NL_TEST_ASSERT(inSuite, a.ContainsIdentifier(0x1111));
149-
NL_TEST_ASSERT(inSuite, !a.ContainsIdentifier(0x2222));
150-
NL_TEST_ASSERT(inSuite, a.AreValid());
151-
152-
NL_TEST_ASSERT(inSuite, b.Contains(0x1111'0001));
153-
NL_TEST_ASSERT(inSuite, b.Contains(0x2222'0002));
154-
NL_TEST_ASSERT(inSuite, b.GetNumTagsPresent() == 2);
155-
NL_TEST_ASSERT(inSuite, b.ContainsIdentifier(0x1111));
156-
NL_TEST_ASSERT(inSuite, b.ContainsIdentifier(0x2222));
157-
NL_TEST_ASSERT(inSuite, b.AreValid());
158-
159-
NL_TEST_ASSERT(inSuite, c.Contains(0x1111'0001));
160-
NL_TEST_ASSERT(inSuite, c.Contains(0x2222'0002));
161-
NL_TEST_ASSERT(inSuite, c.Contains(0x3333'0003));
162-
NL_TEST_ASSERT(inSuite, c.GetNumTagsPresent() == 3);
163-
NL_TEST_ASSERT(inSuite, c.ContainsIdentifier(0x1111));
164-
NL_TEST_ASSERT(inSuite, c.ContainsIdentifier(0x2222));
165-
NL_TEST_ASSERT(inSuite, c.ContainsIdentifier(0x3333));
166-
NL_TEST_ASSERT(inSuite, c.AreValid());
143+
EXPECT_TRUE(a.Contains(0x1111'0001));
144+
EXPECT_EQ(a.GetNumTagsPresent(), 1u);
145+
EXPECT_FALSE(a.Contains(0x1111'0002));
146+
EXPECT_FALSE(a.Contains(0x2222'0002));
147+
EXPECT_TRUE(a.ContainsIdentifier(0x1111));
148+
EXPECT_FALSE(a.ContainsIdentifier(0x2222));
149+
EXPECT_TRUE(a.AreValid());
150+
151+
EXPECT_TRUE(b.Contains(0x1111'0001));
152+
EXPECT_TRUE(b.Contains(0x2222'0002));
153+
EXPECT_EQ(b.GetNumTagsPresent(), 2u);
154+
EXPECT_TRUE(b.ContainsIdentifier(0x1111));
155+
EXPECT_TRUE(b.ContainsIdentifier(0x2222));
156+
EXPECT_TRUE(b.AreValid());
157+
158+
EXPECT_TRUE(c.Contains(0x1111'0001));
159+
EXPECT_TRUE(c.Contains(0x2222'0002));
160+
EXPECT_TRUE(c.Contains(0x3333'0003));
161+
EXPECT_EQ(c.GetNumTagsPresent(), 3u);
162+
EXPECT_TRUE(c.ContainsIdentifier(0x1111));
163+
EXPECT_TRUE(c.ContainsIdentifier(0x2222));
164+
EXPECT_TRUE(c.ContainsIdentifier(0x3333));
165+
EXPECT_TRUE(c.AreValid());
167166
}
168167

169-
void TestSubjectMatching(nlTestSuite * inSuite, void * inContext)
168+
TEST(TestCATValues, TestSubjectMatching)
170169
{
171170
// Check operational node IDs don't match
172171
auto a = CATValues{ { 0x2222'0002 } };
173-
NL_TEST_ASSERT(inSuite, !a.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0x0001'0002'0003'0004ull)));
174-
NL_TEST_ASSERT(inSuite, !a.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0x0001'0002'2222'0002ull)));
172+
EXPECT_FALSE(a.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0x0001'0002'0003'0004ull)));
173+
EXPECT_FALSE(a.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0x0001'0002'2222'0002ull)));
175174

176175
auto b = CATValues{ { 0x1111'0001 } };
177-
NL_TEST_ASSERT(inSuite, b.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'1111'0001ull)));
178-
NL_TEST_ASSERT(inSuite, !b.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'1111'0002ull)));
176+
EXPECT_TRUE(b.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'1111'0001ull)));
177+
EXPECT_FALSE(b.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'1111'0002ull)));
179178

180179
auto c = CATValues{ { 0x1111'0001, 0x2222'0002 } };
181-
NL_TEST_ASSERT(inSuite, c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0001ull)));
182-
NL_TEST_ASSERT(inSuite, c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0002ull)));
183-
NL_TEST_ASSERT(inSuite, !c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0003ull)));
180+
EXPECT_TRUE(c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0001ull)));
181+
EXPECT_TRUE(c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0002ull)));
182+
EXPECT_FALSE(c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0003ull)));
184183

185184
auto d = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'0003 } };
186-
NL_TEST_ASSERT(inSuite, d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0001ull)));
187-
NL_TEST_ASSERT(inSuite, d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0002ull)));
188-
NL_TEST_ASSERT(inSuite, d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0003ull)));
189-
NL_TEST_ASSERT(inSuite, !d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0004ull)));
190-
NL_TEST_ASSERT(inSuite, !d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'ffffull)));
185+
EXPECT_TRUE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0001ull)));
186+
EXPECT_TRUE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0002ull)));
187+
EXPECT_TRUE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0003ull)));
188+
EXPECT_FALSE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0004ull)));
189+
EXPECT_FALSE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'ffffull)));
191190

192191
auto e = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'ffff } };
193-
NL_TEST_ASSERT(inSuite, e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0001ull)));
194-
NL_TEST_ASSERT(inSuite, e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0002ull)));
195-
NL_TEST_ASSERT(inSuite, e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0003ull)));
196-
NL_TEST_ASSERT(inSuite, e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0004ull)));
197-
NL_TEST_ASSERT(inSuite, e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'ffffull)));
192+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0001ull)));
193+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0002ull)));
194+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0003ull)));
195+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0004ull)));
196+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'ffffull)));
198197
}
199-
// Test Suite
200-
201-
/**
202-
* Test Suite that lists all the test functions.
203-
*/
204-
// clang-format off
205-
static const nlTest sTests[] =
206-
{
207-
NL_TEST_DEF("Equality operator", TestEqualityOperator),
208-
NL_TEST_DEF("Inequality operator", TestInequalityOperator),
209-
NL_TEST_DEF("Validity checks", TestValidity),
210-
NL_TEST_DEF("Set operations", TestMembership),
211-
NL_TEST_DEF("Subject matching for ACL", TestSubjectMatching),
212-
NL_TEST_SENTINEL()
213-
};
214-
// clang-format on
215-
216-
int TestCATValues_Setup(void * inContext)
217-
{
218-
return SUCCESS;
219-
}
220-
221-
/**
222-
* Tear down the test suite.
223-
*/
224-
int TestCATValues_Teardown(void * inContext)
225-
{
226-
return SUCCESS;
227-
}
228-
229-
int TestCATValues()
230-
{
231-
// clang-format off
232-
nlTestSuite theSuite =
233-
{
234-
"CATValues",
235-
&sTests[0],
236-
TestCATValues_Setup,
237-
TestCATValues_Teardown,
238-
};
239-
// clang-format on
240-
241-
nlTestRunner(&theSuite, nullptr);
242-
243-
return (nlTestRunnerStats(&theSuite));
244-
}
245-
246-
CHIP_REGISTER_TEST_SUITE(TestCATValues)

0 commit comments

Comments
 (0)