Skip to content

Commit f27b978

Browse files
feasel0andy31415
feasel0
and
andy31415
authoredApr 25, 2024
Updated unit tests in src/transport/retransmit/tests/ to use PW instead of NL. (#33157)
* Updated unit tests in src/transport/tests/ to use PW instead of NL. * Restyle --------- Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent d905835 commit f27b978

File tree

4 files changed

+88
-119
lines changed

4 files changed

+88
-119
lines changed
 

‎src/test_driver/openiotsdk/unit-tests/test_components.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CoreTests
1010
MdnsTests
1111
CredentialsTest
1212
PlatformTests
13+
RetransmitTests
1314
TestShell
1415
SetupPayloadTests
1516
SupportTests

‎src/test_driver/openiotsdk/unit-tests/test_components_nl.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ DataModelTests
33
InetLayerTests
44
MessagingLayerTests
55
RawTransportTests
6-
RetransmitTests
76
SecureChannelTests
87
SetupPayloadTestsNL
98
SupportTestsNL

‎src/transport/retransmit/tests/BUILD.gn

+3-7
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,16 @@
1414

1515
import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
17-
import("//build_overrides/nlunit_test.gni")
17+
import("//build_overrides/pigweed.gni")
1818

1919
import("${chip_root}/build/chip/chip_test_suite.gni")
2020

21-
chip_test_suite_using_nltest("tests") {
21+
chip_test_suite("tests") {
2222
output_name = "libRetransmitTests"
2323

2424
cflags = [ "-Wconversion" ]
2525

2626
test_sources = [ "TestCache.cpp" ]
2727

28-
public_deps = [
29-
"${chip_root}/src/lib/support:testing_nlunit",
30-
"${chip_root}/src/transport/retransmit",
31-
"${nlunit_test_root}:nlunit-test",
32-
]
28+
public_deps = [ "${chip_root}/src/transport/retransmit" ]
3329
}

‎src/transport/retransmit/tests/TestCache.cpp

+84-111
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
#include <lib/support/UnitTestRegistration.h>
1817
#include <transport/retransmit/Cache.h>
1918

2019
#include <bitset>
21-
#include <nlunit-test.h>
20+
#include <gtest/gtest.h>
2221

2322
// Helpers for simple payload management
2423
namespace {
@@ -45,18 +44,16 @@ class TestableCache : public chip::Retransmit::Cache<KeyType, PayloadType, N>
4544
class IntPayloadTracker
4645
{
4746
public:
48-
void Init(nlTestSuite * suite) { mSuite = suite; }
49-
5047
void Acquire(int value)
5148
{
52-
NL_TEST_ASSERT(mSuite, (value > 0) && value < kMaxPayloadValue);
49+
EXPECT_TRUE((value > 0) && value < kMaxPayloadValue);
5350
mAcquired.set(static_cast<size_t>(value));
5451
}
5552

5653
void Release(int value)
5754
{
58-
NL_TEST_ASSERT(mSuite, (value > 0) && value < kMaxPayloadValue);
59-
NL_TEST_ASSERT(mSuite, mAcquired.test(static_cast<size_t>(value)));
55+
EXPECT_TRUE((value > 0) && value < kMaxPayloadValue);
56+
EXPECT_TRUE(mAcquired.test(static_cast<size_t>(value)));
6057
mAcquired.reset(static_cast<size_t>(value));
6158
}
6259

@@ -65,7 +62,6 @@ class IntPayloadTracker
6562
bool IsAcquired(int value) const { return mAcquired.test(static_cast<size_t>(value)); }
6663

6764
private:
68-
nlTestSuite * mSuite;
6965
std::bitset<kMaxPayloadValue> mAcquired;
7066
};
7167

@@ -104,176 +100,153 @@ void chip::Retransmit::Lifetime<int>::Release(int & value)
104100

105101
namespace {
106102

107-
void TestNoOp(nlTestSuite * inSuite, void * inContext)
103+
TEST(TestCache, TestNoOp)
108104
{
109105
// unused address cache should not do any Acquire/release at any time
110-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
106+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
111107
{
112108
TestableCache<int, int, 20> test;
113-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
109+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
114110
}
115-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
111+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
116112
}
117113

118-
void TestDestructorFree(nlTestSuite * inSuite, void * inContext)
114+
TEST(TestCache, TestDestructorFree)
119115
{
120116
{
121117
TestableCache<int, int, 20> test;
122118

123-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
119+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
124120

125-
NL_TEST_ASSERT(inSuite, test.AddValue(1, 1) == CHIP_NO_ERROR);
126-
NL_TEST_ASSERT(inSuite, test.AddValue(2, 2) == CHIP_NO_ERROR);
121+
EXPECT_EQ(test.AddValue(1, 1), CHIP_NO_ERROR);
122+
EXPECT_EQ(test.AddValue(2, 2), CHIP_NO_ERROR);
127123

128-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 2);
124+
EXPECT_EQ(gPayloadTracker.Count(), 2u);
129125
}
130126

131127
// destructor should release the items
132-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
128+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
133129
}
134130

135-
void OutOfSpace(nlTestSuite * inSuite, void * inContext)
131+
TEST(TestCache, OutOfSpace)
136132
{
137133
{
138134
TestableCache<int, int, 4> test;
139135

140-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
136+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
141137

142-
NL_TEST_ASSERT(inSuite, test.AddValue(1, 1) == CHIP_NO_ERROR);
143-
NL_TEST_ASSERT(inSuite, test.AddValue(2, 2) == CHIP_NO_ERROR);
144-
NL_TEST_ASSERT(inSuite, test.AddValue(3, 4) == CHIP_NO_ERROR);
145-
NL_TEST_ASSERT(inSuite, test.AddValue(4, 6) == CHIP_NO_ERROR);
146-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 4);
138+
EXPECT_EQ(test.AddValue(1, 1), CHIP_NO_ERROR);
139+
EXPECT_EQ(test.AddValue(2, 2), CHIP_NO_ERROR);
140+
EXPECT_EQ(test.AddValue(3, 4), CHIP_NO_ERROR);
141+
EXPECT_EQ(test.AddValue(4, 6), CHIP_NO_ERROR);
142+
EXPECT_EQ(gPayloadTracker.Count(), 4u);
147143

148-
NL_TEST_ASSERT(inSuite, test.AddValue(5, 8) == CHIP_ERROR_NO_MEMORY);
149-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 4);
144+
EXPECT_EQ(test.AddValue(5, 8), CHIP_ERROR_NO_MEMORY);
145+
EXPECT_EQ(gPayloadTracker.Count(), 4u);
150146

151-
NL_TEST_ASSERT(inSuite, test.AddValue(6, 10) == CHIP_ERROR_NO_MEMORY);
152-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 4);
147+
EXPECT_EQ(test.AddValue(6, 10), CHIP_ERROR_NO_MEMORY);
148+
EXPECT_EQ(gPayloadTracker.Count(), 4u);
153149
}
154-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
150+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
155151
}
156152

157-
void AddRemove(nlTestSuite * inSuite, void * inContext)
153+
TEST(TestCache, AddRemove)
158154
{
159155
TestableCache<int, int, 3> test;
160156

161-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
157+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
162158

163-
NL_TEST_ASSERT(inSuite, test.AddValue(1, 1) == CHIP_NO_ERROR);
164-
NL_TEST_ASSERT(inSuite, test.AddValue(2, 2) == CHIP_NO_ERROR);
165-
NL_TEST_ASSERT(inSuite, test.AddValue(3, 4) == CHIP_NO_ERROR);
166-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 3);
159+
EXPECT_EQ(test.AddValue(1, 1), CHIP_NO_ERROR);
160+
EXPECT_EQ(test.AddValue(2, 2), CHIP_NO_ERROR);
161+
EXPECT_EQ(test.AddValue(3, 4), CHIP_NO_ERROR);
162+
EXPECT_EQ(gPayloadTracker.Count(), 3u);
167163

168-
NL_TEST_ASSERT(inSuite, test.AddValue(10, 8) == CHIP_ERROR_NO_MEMORY);
169-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 3);
164+
EXPECT_EQ(test.AddValue(10, 8), CHIP_ERROR_NO_MEMORY);
165+
EXPECT_EQ(gPayloadTracker.Count(), 3u);
170166

171-
NL_TEST_ASSERT(inSuite, test.Remove(2) == CHIP_NO_ERROR);
172-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 2);
167+
EXPECT_EQ(test.Remove(2), CHIP_NO_ERROR);
168+
EXPECT_EQ(gPayloadTracker.Count(), 2u);
173169

174-
NL_TEST_ASSERT(inSuite, test.AddValue(10, 8) == CHIP_NO_ERROR);
175-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 3);
170+
EXPECT_EQ(test.AddValue(10, 8), CHIP_NO_ERROR);
171+
EXPECT_EQ(gPayloadTracker.Count(), 3u);
176172

177-
NL_TEST_ASSERT(inSuite, test.Remove(14) == CHIP_ERROR_KEY_NOT_FOUND);
178-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 3);
173+
EXPECT_EQ(test.Remove(14), CHIP_ERROR_KEY_NOT_FOUND);
174+
EXPECT_EQ(gPayloadTracker.Count(), 3u);
179175

180-
NL_TEST_ASSERT(inSuite, test.Remove(1) == CHIP_NO_ERROR);
181-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 2);
176+
EXPECT_EQ(test.Remove(1), CHIP_NO_ERROR);
177+
EXPECT_EQ(gPayloadTracker.Count(), 2u);
182178

183-
NL_TEST_ASSERT(inSuite, test.Remove(3) == CHIP_NO_ERROR);
184-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 1);
179+
EXPECT_EQ(test.Remove(3), CHIP_NO_ERROR);
180+
EXPECT_EQ(gPayloadTracker.Count(), 1u);
185181

186-
NL_TEST_ASSERT(inSuite, test.Remove(3) == CHIP_ERROR_KEY_NOT_FOUND);
187-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 1);
182+
EXPECT_EQ(test.Remove(3), CHIP_ERROR_KEY_NOT_FOUND);
183+
EXPECT_EQ(gPayloadTracker.Count(), 1u);
188184

189-
NL_TEST_ASSERT(inSuite, test.Remove(10) == CHIP_NO_ERROR);
190-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
185+
EXPECT_EQ(test.Remove(10), CHIP_NO_ERROR);
186+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
191187

192-
NL_TEST_ASSERT(inSuite, test.Remove(10) == CHIP_ERROR_KEY_NOT_FOUND);
193-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
188+
EXPECT_EQ(test.Remove(10), CHIP_ERROR_KEY_NOT_FOUND);
189+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
194190
}
195191

196-
void RemoveMatching(nlTestSuite * inSuite, void * inContext)
192+
TEST(TestCache, RemoveMatching)
197193
{
198194
TestableCache<int, int, 4> test;
199195

200-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
196+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
201197

202-
NL_TEST_ASSERT(inSuite, test.AddValue(1, 1) == CHIP_NO_ERROR);
203-
NL_TEST_ASSERT(inSuite, test.AddValue(2, 2) == CHIP_NO_ERROR);
204-
NL_TEST_ASSERT(inSuite, test.AddValue(3, 4) == CHIP_NO_ERROR);
205-
NL_TEST_ASSERT(inSuite, test.AddValue(4, 8) == CHIP_NO_ERROR);
206-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 4);
198+
EXPECT_EQ(test.AddValue(1, 1), CHIP_NO_ERROR);
199+
EXPECT_EQ(test.AddValue(2, 2), CHIP_NO_ERROR);
200+
EXPECT_EQ(test.AddValue(3, 4), CHIP_NO_ERROR);
201+
EXPECT_EQ(test.AddValue(4, 8), CHIP_NO_ERROR);
202+
EXPECT_EQ(gPayloadTracker.Count(), 4u);
207203

208204
test.RemoveMatching(DivisibleBy(2));
209-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 2);
205+
EXPECT_EQ(gPayloadTracker.Count(), 2u);
210206

211207
// keys 1 and 3 remain
212-
NL_TEST_ASSERT(inSuite, gPayloadTracker.IsAcquired(1));
213-
NL_TEST_ASSERT(inSuite, gPayloadTracker.IsAcquired(4));
208+
EXPECT_TRUE(gPayloadTracker.IsAcquired(1));
209+
EXPECT_TRUE(gPayloadTracker.IsAcquired(4));
214210

215-
NL_TEST_ASSERT(inSuite, test.Remove(3) == CHIP_NO_ERROR);
216-
NL_TEST_ASSERT(inSuite, gPayloadTracker.IsAcquired(1));
217-
NL_TEST_ASSERT(inSuite, !gPayloadTracker.IsAcquired(4));
211+
EXPECT_EQ(test.Remove(3), CHIP_NO_ERROR);
212+
EXPECT_TRUE(gPayloadTracker.IsAcquired(1));
213+
EXPECT_FALSE(gPayloadTracker.IsAcquired(4));
218214
}
219215

220-
void FindMatching(nlTestSuite * inSuite, void * inContext)
216+
TEST(TestCache, FindMatching)
221217
{
222218
TestableCache<int, int, 4> test;
223219

224-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 0);
220+
EXPECT_EQ(gPayloadTracker.Count(), 0u);
225221

226-
NL_TEST_ASSERT(inSuite, test.AddValue(1, 1) == CHIP_NO_ERROR);
227-
NL_TEST_ASSERT(inSuite, test.AddValue(2, 2) == CHIP_NO_ERROR);
228-
NL_TEST_ASSERT(inSuite, test.AddValue(3, 4) == CHIP_NO_ERROR);
229-
NL_TEST_ASSERT(inSuite, test.AddValue(4, 8) == CHIP_NO_ERROR);
230-
NL_TEST_ASSERT(inSuite, gPayloadTracker.Count() == 4);
222+
EXPECT_EQ(test.AddValue(1, 1), CHIP_NO_ERROR);
223+
EXPECT_EQ(test.AddValue(2, 2), CHIP_NO_ERROR);
224+
EXPECT_EQ(test.AddValue(3, 4), CHIP_NO_ERROR);
225+
EXPECT_EQ(test.AddValue(4, 8), CHIP_NO_ERROR);
226+
EXPECT_EQ(gPayloadTracker.Count(), 4u);
231227

232228
const int * key;
233229
const int * value;
234230

235-
NL_TEST_ASSERT(inSuite, test.Find(DivisibleBy(20), &key, &value) == false);
236-
NL_TEST_ASSERT(inSuite, key == nullptr);
237-
NL_TEST_ASSERT(inSuite, value == nullptr);
231+
EXPECT_FALSE(test.Find(DivisibleBy(20), &key, &value));
232+
EXPECT_EQ(key, nullptr);
233+
EXPECT_EQ(value, nullptr);
238234

239235
// This relies on linear add. May need changing if implementation changes
240-
NL_TEST_ASSERT(inSuite, test.Find(DivisibleBy(2), &key, &value) == true);
241-
NL_TEST_ASSERT(inSuite, *key == 2);
242-
NL_TEST_ASSERT(inSuite, *value == 2);
236+
EXPECT_TRUE(test.Find(DivisibleBy(2), &key, &value));
237+
EXPECT_EQ(*key, 2);
238+
EXPECT_EQ(*value, 2);
243239

244-
NL_TEST_ASSERT(inSuite, test.Remove(*key) == CHIP_NO_ERROR);
240+
EXPECT_EQ(test.Remove(*key), CHIP_NO_ERROR);
245241

246-
NL_TEST_ASSERT(inSuite, test.Find(DivisibleBy(2), &key, &value) == true);
247-
NL_TEST_ASSERT(inSuite, *key == 4);
248-
NL_TEST_ASSERT(inSuite, *value == 8);
242+
EXPECT_TRUE(test.Find(DivisibleBy(2), &key, &value));
243+
EXPECT_EQ(*key, 4);
244+
EXPECT_EQ(*value, 8);
249245

250-
NL_TEST_ASSERT(inSuite, test.Remove(*key) == CHIP_NO_ERROR);
251-
NL_TEST_ASSERT(inSuite, test.Find(DivisibleBy(2), &key, &value) == false);
252-
NL_TEST_ASSERT(inSuite, key == nullptr);
253-
NL_TEST_ASSERT(inSuite, value == nullptr);
246+
EXPECT_EQ(test.Remove(*key), CHIP_NO_ERROR);
247+
EXPECT_FALSE(test.Find(DivisibleBy(2), &key, &value));
248+
EXPECT_EQ(key, nullptr);
249+
EXPECT_EQ(value, nullptr);
254250
}
255251

256252
} // namespace
257-
258-
// clang-format off
259-
static const nlTest sTests[] =
260-
{
261-
NL_TEST_DEF("NoOp", TestNoOp),
262-
NL_TEST_DEF("DestructorFree", TestDestructorFree),
263-
NL_TEST_DEF("OutOfSpace", OutOfSpace),
264-
NL_TEST_DEF("AddRemove", AddRemove),
265-
NL_TEST_DEF("RemoveMatching", RemoveMatching),
266-
NL_TEST_DEF("FindMatching", FindMatching),
267-
NL_TEST_SENTINEL()
268-
};
269-
// clang-format on
270-
271-
int TestCache()
272-
{
273-
nlTestSuite theSuite = { "Retransmit-Cache", &sTests[0], nullptr, nullptr };
274-
gPayloadTracker.Init(&theSuite);
275-
nlTestRunner(&theSuite, nullptr);
276-
return nlTestRunnerStats(&theSuite);
277-
}
278-
279-
CHIP_REGISTER_TEST_SUITE(TestCache)

0 commit comments

Comments
 (0)