Skip to content

Commit f242ec6

Browse files
mbknustmbknust
committed
Replaced nlunit-test with pw_unit_test in src/lib/core/
1 parent 80b2f61 commit f242ec6

9 files changed

+1381
-1761
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

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

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

2222
#include <lib/core/CASEAuthTag.h>
2323

2424
using namespace chip;
2525

26-
void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
26+
TEST(TestCATValues, TestEqualityOperator)
2727
{
2828
{
2929
auto a = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'0003 } };
@@ -37,7 +37,7 @@ void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
3737
{
3838
for (auto & inner : candidates)
3939
{
40-
NL_TEST_ASSERT(inSuite, inner == outer);
40+
EXPECT_EQ(inner, outer);
4141
}
4242
}
4343
}
@@ -49,7 +49,7 @@ void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
4949
{
5050
for (auto & inner : candidates)
5151
{
52-
NL_TEST_ASSERT(inSuite, inner == outer);
52+
EXPECT_EQ(inner, outer);
5353
}
5454
}
5555
}
@@ -65,13 +65,13 @@ void TestEqualityOperator(nlTestSuite * inSuite, void * inContext)
6565
{
6666
for (auto & inner : candidates)
6767
{
68-
NL_TEST_ASSERT(inSuite, inner == outer);
68+
EXPECT_EQ(inner, outer);
6969
}
7070
}
7171
}
7272
}
7373

74-
void TestInequalityOperator(nlTestSuite * inSuite, void * inContext)
74+
TEST(TestCATValues, TestInequalityOperator)
7575
{
7676
auto a = CATValues{ { 0x1111'0001 } };
7777
auto b = CATValues{ { 0x1111'0001, 0x2222'0002 } };
@@ -103,12 +103,12 @@ void TestInequalityOperator(nlTestSuite * inSuite, void * inContext)
103103
{
104104
continue;
105105
}
106-
NL_TEST_ASSERT(inSuite, inner != outer);
106+
EXPECT_NE(inner, outer);
107107
}
108108
}
109109
}
110110

111-
void TestValidity(nlTestSuite * inSuite, void * inContext)
111+
TEST(TestCATValues, TestValidity)
112112
{
113113
{
114114
auto a = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'0003 } };
@@ -119,7 +119,7 @@ void TestValidity(nlTestSuite * inSuite, void * inContext)
119119
CATValues validCandidates[] = { a, b, c, d, e };
120120
for (auto & candidate : validCandidates)
121121
{
122-
NL_TEST_ASSERT(inSuite, candidate.AreValid());
122+
EXPECT_TRUE(candidate.AreValid());
123123
}
124124
}
125125

@@ -130,117 +130,69 @@ void TestValidity(nlTestSuite * inSuite, void * inContext)
130130
CATValues invalidCandidates[] = { versionZero1, versionZero2, collidingId };
131131
for (auto & candidate : invalidCandidates)
132132
{
133-
NL_TEST_ASSERT(inSuite, !candidate.AreValid());
133+
EXPECT_FALSE(candidate.AreValid());
134134
}
135135
}
136136
}
137137

138-
void TestMembership(nlTestSuite * inSuite, void * inContext)
138+
TEST(TestCATValues, TestMembership)
139139
{
140140
auto a = CATValues{ { 0x1111'0001 } };
141141
auto b = CATValues{ { 0x1111'0001, 0x2222'0002 } };
142142
auto c = CATValues{ { 0x1111'0001, 0x2222'0002, 0x3333'0003 } };
143143

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());
144+
EXPECT_TRUE(a.Contains(0x1111'0001));
145+
EXPECT_EQ(a.GetNumTagsPresent(), 1u);
146+
EXPECT_FALSE(a.Contains(0x1111'0002));
147+
EXPECT_FALSE(a.Contains(0x2222'0002));
148+
EXPECT_TRUE(a.ContainsIdentifier(0x1111));
149+
EXPECT_FALSE(a.ContainsIdentifier(0x2222));
150+
EXPECT_TRUE(a.AreValid());
151+
152+
EXPECT_TRUE(b.Contains(0x1111'0001));
153+
EXPECT_TRUE(b.Contains(0x2222'0002));
154+
EXPECT_EQ(b.GetNumTagsPresent(), 2u);
155+
EXPECT_TRUE(b.ContainsIdentifier(0x1111));
156+
EXPECT_TRUE(b.ContainsIdentifier(0x2222));
157+
EXPECT_TRUE(b.AreValid());
158+
159+
EXPECT_TRUE(c.Contains(0x1111'0001));
160+
EXPECT_TRUE(c.Contains(0x2222'0002));
161+
EXPECT_TRUE(c.Contains(0x3333'0003));
162+
EXPECT_EQ(c.GetNumTagsPresent(), 3u);
163+
EXPECT_TRUE(c.ContainsIdentifier(0x1111));
164+
EXPECT_TRUE(c.ContainsIdentifier(0x2222));
165+
EXPECT_TRUE(c.ContainsIdentifier(0x3333));
166+
EXPECT_TRUE(c.AreValid());
167167
}
168168

169-
void TestSubjectMatching(nlTestSuite * inSuite, void * inContext)
169+
TEST(TestCATValues, TestSubjectMatching)
170170
{
171171
// Check operational node IDs don't match
172172
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)));
173+
EXPECT_FALSE(a.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0x0001'0002'0003'0004ull)));
174+
EXPECT_FALSE(a.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0x0001'0002'2222'0002ull)));
175175

176176
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)));
177+
EXPECT_TRUE(b.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'1111'0001ull)));
178+
EXPECT_FALSE(b.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'1111'0002ull)));
179179

180180
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)));
181+
EXPECT_TRUE(c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0001ull)));
182+
EXPECT_TRUE(c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0002ull)));
183+
EXPECT_FALSE(c.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'2222'0003ull)));
184184

185185
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)));
186+
EXPECT_TRUE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0001ull)));
187+
EXPECT_TRUE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0002ull)));
188+
EXPECT_TRUE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0003ull)));
189+
EXPECT_FALSE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0004ull)));
190+
EXPECT_FALSE(d.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'ffffull)));
191191

192192
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)));
193+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0001ull)));
194+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0002ull)));
195+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0003ull)));
196+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'0004ull)));
197+
EXPECT_TRUE(e.CheckSubjectAgainstCATs(static_cast<chip::NodeId>(0xFFFF'FFFD'3333'ffffull)));
198198
}
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)