Skip to content

Commit 2a1cf85

Browse files
msandstedtmsandstedt
authored
Minor style and comment fixes for project-chip#23062 (project-chip#23110)
Apply suggestions per bzbarsky-apple
1 parent 8eb1865 commit 2a1cf85

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

‎src/protocols/secure_channel/tests/TestDefaultSessionResumptionStorage.cpp

+16-17
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18+
#include <lib/support/CodeUtils.h>
1819
#include <lib/support/DefaultStorageKeyAllocator.h>
1920
#include <lib/support/TestPersistentStorageDelegate.h>
2021
#include <lib/support/UnitTestRegistration.h>
@@ -24,8 +25,6 @@
2425
// Use SimpleSessionResumptionStorage, which extends it, to test.
2526
#include <protocols/secure_channel/SimpleSessionResumptionStorage.h>
2627

27-
#define ARRAY_SIZE(_array) ((sizeof(_array) / sizeof(_array[0])))
28-
2928
void TestSave(nlTestSuite * inSuite, void * inContext)
3029
{
3130
chip::SimpleSessionResumptionStorage sessionStorage;
@@ -40,7 +39,7 @@ void TestSave(nlTestSuite * inSuite, void * inContext)
4039
} vectors[CHIP_CONFIG_CASE_SESSION_RESUME_CACHE_SIZE + 1];
4140

4241
// Populate test vectors.
43-
for (size_t i = 0; i < ARRAY_SIZE(vectors); ++i)
42+
for (size_t i = 0; i < ArraySize(vectors); ++i)
4443
{
4544
NL_TEST_ASSERT(
4645
inSuite, CHIP_NO_ERROR == chip::Crypto::DRBG_get_bytes(vectors[i].resumptionId.data(), vectors[i].resumptionId.size()));
@@ -70,7 +69,7 @@ void TestSave(nlTestSuite * inSuite, void * inContext)
7069
// If more sophisticated LRU behavior is implemented, this test
7170
// case should be modified to match.
7271
{
73-
size_t last = ARRAY_SIZE(vectors) - 1;
72+
size_t last = ArraySize(vectors) - 1;
7473
NL_TEST_ASSERT(inSuite,
7574
sessionStorage.Save(vectors[last].node, vectors[last].resumptionId, vectors[last].sharedSecret,
7675
vectors[last].cats) == CHIP_NO_ERROR);
@@ -99,7 +98,7 @@ void TestSave(nlTestSuite * inSuite, void * inContext)
9998
NL_TEST_ASSERT(inSuite, vector.cats.values[1] == outCats.values[1]);
10099
NL_TEST_ASSERT(inSuite, vector.cats.values[2] == outCats.values[2]);
101100

102-
// Validate retreiveal by resumption ID.
101+
// Validate retrieval by resumption ID.
103102
NL_TEST_ASSERT(inSuite,
104103
sessionStorage.FindByResumptionId(vector.resumptionId, outNode, outSharedSecret, outCats) == CHIP_NO_ERROR);
105104
NL_TEST_ASSERT(inSuite, vector.node == outNode);
@@ -123,12 +122,12 @@ void TestInPlaceSave(nlTestSuite * inSuite, void * inContext)
123122
chip::CATValues cats;
124123
} vectors[CHIP_CONFIG_CASE_SESSION_RESUME_CACHE_SIZE + 10];
125124

126-
// Construct only a few unique node identities to simiulate talking to a
125+
// Construct only a few unique node identities to simulate talking to a
127126
// couple peers.
128127
chip::ScopedNodeId nodes[3];
129-
static_assert(ARRAY_SIZE(nodes) < CHIP_CONFIG_CASE_SESSION_RESUME_CACHE_SIZE,
128+
static_assert(ArraySize(nodes) < CHIP_CONFIG_CASE_SESSION_RESUME_CACHE_SIZE,
130129
"must have fewer nodes than slots in session resumption storage");
131-
for (size_t i = 0; i < ARRAY_SIZE(nodes); ++i)
130+
for (size_t i = 0; i < ArraySize(nodes); ++i)
132131
{
133132
do
134133
{
@@ -137,7 +136,7 @@ void TestInPlaceSave(nlTestSuite * inSuite, void * inContext)
137136
}
138137

139138
// Populate test vectors.
140-
for (size_t i = 0; i < ARRAY_SIZE(vectors); ++i)
139+
for (size_t i = 0; i < ArraySize(vectors); ++i)
141140
{
142141
NL_TEST_ASSERT(
143142
inSuite, CHIP_NO_ERROR == chip::Crypto::DRBG_get_bytes(vectors[i].resumptionId.data(), vectors[i].resumptionId.size()));
@@ -147,22 +146,22 @@ void TestInPlaceSave(nlTestSuite * inSuite, void * inContext)
147146
NL_TEST_ASSERT(inSuite,
148147
CHIP_NO_ERROR ==
149148
chip::Crypto::DRBG_get_bytes(vectors[i].sharedSecret.Bytes(), vectors[i].sharedSecret.Length()));
150-
vectors[i].node = nodes[i % ARRAY_SIZE(nodes)];
149+
vectors[i].node = nodes[i % ArraySize(nodes)];
151150
vectors[i].cats.values[0] = static_cast<chip::CASEAuthTag>(rand());
152151
vectors[i].cats.values[1] = static_cast<chip::CASEAuthTag>(rand());
153152
vectors[i].cats.values[2] = static_cast<chip::CASEAuthTag>(rand());
154153
}
155154

156155
// Add one entry for each node.
157-
for (size_t i = 0; i < ARRAY_SIZE(nodes); ++i)
156+
for (size_t i = 0; i < ArraySize(nodes); ++i)
158157
{
159158
NL_TEST_ASSERT(inSuite,
160159
sessionStorage.Save(vectors[i].node, vectors[i].resumptionId, vectors[i].sharedSecret, vectors[i].cats) ==
161160
CHIP_NO_ERROR);
162161
}
163162

164163
// Read back and verify values.
165-
for (size_t i = 0; i < ARRAY_SIZE(nodes); ++i)
164+
for (size_t i = 0; i < ArraySize(nodes); ++i)
166165
{
167166
chip::ScopedNodeId outNode;
168167
chip::SessionResumptionStorage::ResumptionIdStorage outResumptionId;
@@ -180,7 +179,7 @@ void TestInPlaceSave(nlTestSuite * inSuite, void * inContext)
180179
NL_TEST_ASSERT(inSuite, vectors[i].cats.values[1] == outCats.values[1]);
181180
NL_TEST_ASSERT(inSuite, vectors[i].cats.values[2] == outCats.values[2]);
182181

183-
// Validate retreiveal by resumption ID.
182+
// Validate retrieval by resumption ID.
184183
NL_TEST_ASSERT(inSuite,
185184
sessionStorage.FindByResumptionId(vectors[i].resumptionId, outNode, outSharedSecret, outCats) ==
186185
CHIP_NO_ERROR);
@@ -200,7 +199,7 @@ void TestInPlaceSave(nlTestSuite * inSuite, void * inContext)
200199
}
201200

202201
// Read back and verify that only the last record for each node was retained.
203-
for (size_t i = ARRAY_SIZE(vectors) - ARRAY_SIZE(nodes); i < ARRAY_SIZE(vectors); ++i)
202+
for (size_t i = ArraySize(vectors) - ArraySize(nodes); i < ArraySize(vectors); ++i)
204203
{
205204
chip::ScopedNodeId outNode;
206205
chip::SessionResumptionStorage::ResumptionIdStorage outResumptionId;
@@ -218,7 +217,7 @@ void TestInPlaceSave(nlTestSuite * inSuite, void * inContext)
218217
NL_TEST_ASSERT(inSuite, vectors[i].cats.values[1] == outCats.values[1]);
219218
NL_TEST_ASSERT(inSuite, vectors[i].cats.values[2] == outCats.values[2]);
220219

221-
// Validate retreiveal by resumption ID.
220+
// Validate retrieval by resumption ID.
222221
NL_TEST_ASSERT(inSuite,
223222
sessionStorage.FindByResumptionId(vectors[i].resumptionId, outNode, outSharedSecret, outCats) ==
224223
CHIP_NO_ERROR);
@@ -290,7 +289,7 @@ void TestDelete(nlTestSuite * inSuite, void * inContext)
290289
NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == chip::Crypto::DRBG_get_bytes(sharedSecret.Bytes(), sharedSecret.Length()));
291290

292291
// Populate test vectors.
293-
for (size_t i = 0; i < ARRAY_SIZE(vectors); ++i)
292+
for (size_t i = 0; i < ArraySize(vectors); ++i)
294293
{
295294
NL_TEST_ASSERT(
296295
inSuite, CHIP_NO_ERROR == chip::Crypto::DRBG_get_bytes(vectors[i].resumptionId.data(), vectors[i].resumptionId.size()));
@@ -308,7 +307,7 @@ void TestDelete(nlTestSuite * inSuite, void * inContext)
308307
}
309308

310309
// Delete values in turn from storage and verify they are removed.
311-
for (size_t i = 0; i < ARRAY_SIZE(vectors); ++i)
310+
for (size_t i = 0; i < ArraySize(vectors); ++i)
312311
{
313312
chip::ScopedNodeId outNode;
314313
chip::SessionResumptionStorage::ResumptionIdStorage outResumptionId;

0 commit comments

Comments
 (0)