@@ -131,8 +131,8 @@ TEST(TestManualCode, TestDecimalRepresentation_FullPayloadWithoutZeros)
131
131
EXPECT_TRUE (CheckGenerator (payload, expectedResult));
132
132
}
133
133
134
- void assertPayloadValues (CHIP_ERROR actualError, CHIP_ERROR expectedError, const PayloadContents & payload,
135
- uint32_t pinCode, const SetupDiscriminator & discriminator, uint16_t vendorID, uint16_t productID)
134
+ void assertPayloadValues (CHIP_ERROR actualError, CHIP_ERROR expectedError, const PayloadContents & payload, uint32_t pinCode,
135
+ const SetupDiscriminator & discriminator, uint16_t vendorID, uint16_t productID)
136
136
{
137
137
EXPECT_EQ (actualError, expectedError);
138
138
EXPECT_EQ (payload.setUpPINCode , pinCode);
@@ -274,8 +274,7 @@ TEST(TestManualCode, TestGenerateAndParser_FullPayload)
274
274
275
275
SetupDiscriminator discriminator;
276
276
discriminator.SetShortValue (payload.discriminator .GetShortValue ());
277
- assertPayloadValues (err, CHIP_NO_ERROR, outPayload, payload.setUpPINCode , discriminator, payload.vendorID ,
278
- payload.productID );
277
+ assertPayloadValues (err, CHIP_NO_ERROR, outPayload, payload.setUpPINCode , discriminator, payload.vendorID , payload.productID );
279
278
}
280
279
281
280
TEST (TestManualCode, TestGenerateAndParser_PartialPayload)
@@ -292,8 +291,7 @@ TEST(TestManualCode, TestGenerateAndParser_PartialPayload)
292
291
293
292
SetupDiscriminator discriminator;
294
293
discriminator.SetShortValue (payload.discriminator .GetShortValue ());
295
- assertPayloadValues (err, CHIP_NO_ERROR, outPayload, payload.setUpPINCode , discriminator, payload.vendorID ,
296
- payload.productID );
294
+ assertPayloadValues (err, CHIP_NO_ERROR, outPayload, payload.setUpPINCode , discriminator, payload.vendorID , payload.productID );
297
295
}
298
296
299
297
TEST (TestManualCode, TestPayloadParser_PartialPayload)
@@ -399,11 +397,11 @@ TEST(TestManualCode, TestLongCodeReadWrite)
399
397
EXPECT_TRUE (inPayload == outPayload);
400
398
}
401
399
402
- void assertEmptyPayloadWithError (CHIP_ERROR actualError, CHIP_ERROR expectedError,
403
- const SetupPayload & payload)
400
+ void assertEmptyPayloadWithError (CHIP_ERROR actualError, CHIP_ERROR expectedError, const SetupPayload & payload)
404
401
{
405
402
EXPECT_EQ (actualError, expectedError);
406
- EXPECT_TRUE (payload.setUpPINCode == 0 && payload.discriminator .GetLongValue () == 0 && payload.productID == 0 && payload.vendorID == 0 );
403
+ EXPECT_TRUE (payload.setUpPINCode == 0 && payload.discriminator .GetLongValue () == 0 && payload.productID == 0 &&
404
+ payload.vendorID == 0 );
407
405
}
408
406
409
407
TEST (TestManualCode, TestPayloadParser_InvalidEntry)
@@ -414,47 +412,47 @@ TEST(TestManualCode, TestPayloadParser_InvalidEntry)
414
412
// Empty input
415
413
decimalString = " " ;
416
414
decimalString += Verhoeff10::ComputeCheckChar (decimalString.c_str ());
417
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
418
- CHIP_ERROR_INVALID_STRING_LENGTH, payload);
415
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INVALID_STRING_LENGTH,
416
+ payload);
419
417
420
418
// Invalid character
421
419
decimalString = " 24184.2196" ;
422
420
decimalString += Verhoeff10::ComputeCheckChar (decimalString.c_str ());
423
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
424
- CHIP_ERROR_INVALID_INTEGER_VALUE, payload);
421
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INVALID_INTEGER_VALUE,
422
+ payload);
425
423
426
424
// too short
427
425
decimalString = " 2456" ;
428
426
decimalString += Verhoeff10::ComputeCheckChar (decimalString.c_str ());
429
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
430
- CHIP_ERROR_INVALID_STRING_LENGTH, payload);
427
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INVALID_STRING_LENGTH,
428
+ payload);
431
429
432
430
// too long for long code
433
431
decimalString = " 123456789123456785671" ;
434
432
decimalString += Verhoeff10::ComputeCheckChar (decimalString.c_str ());
435
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
436
- CHIP_ERROR_INVALID_STRING_LENGTH, payload);
433
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INVALID_STRING_LENGTH,
434
+ payload);
437
435
438
436
// too long for short code
439
437
decimalString = " 12749875380" ;
440
438
decimalString += Verhoeff10::ComputeCheckChar (decimalString.c_str ());
441
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
442
- CHIP_ERROR_INVALID_STRING_LENGTH, payload);
439
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INVALID_STRING_LENGTH,
440
+ payload);
443
441
444
442
// bit to indicate short code but long code length
445
443
decimalString = " 23456789123456785610" ;
446
444
decimalString += Verhoeff10::ComputeCheckChar (decimalString.c_str ());
447
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
448
- CHIP_ERROR_INVALID_STRING_LENGTH, payload);
445
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INVALID_STRING_LENGTH,
446
+ payload);
449
447
// no pin code (= 0)
450
448
decimalString = " 2327680000" ;
451
449
decimalString += Verhoeff10::ComputeCheckChar (decimalString.c_str ());
452
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
453
- CHIP_ERROR_INVALID_ARGUMENT, payload);
450
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INVALID_ARGUMENT,
451
+ payload);
454
452
// wrong check digit
455
453
decimalString = " 02684354589" ;
456
- assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload),
457
- CHIP_ERROR_INTEGRITY_CHECK_FAILED, payload);
454
+ assertEmptyPayloadWithError (ManualSetupPayloadParser (decimalString).populatePayload (payload), CHIP_ERROR_INTEGRITY_CHECK_FAILED,
455
+ payload);
458
456
}
459
457
460
458
TEST (TestManualCode, TestCheckDecimalStringValidity)
@@ -465,10 +463,12 @@ TEST(TestManualCode, TestCheckDecimalStringValidity)
465
463
std::string decimalString;
466
464
467
465
representationWithoutCheckDigit = " " ;
468
- EXPECT_EQ (ManualSetupPayloadParser::CheckDecimalStringValidity (representationWithoutCheckDigit, outReprensation), CHIP_ERROR_INVALID_STRING_LENGTH);
466
+ EXPECT_EQ (ManualSetupPayloadParser::CheckDecimalStringValidity (representationWithoutCheckDigit, outReprensation),
467
+ CHIP_ERROR_INVALID_STRING_LENGTH);
469
468
470
469
representationWithoutCheckDigit = " 1" ;
471
- EXPECT_EQ (ManualSetupPayloadParser::CheckDecimalStringValidity (representationWithoutCheckDigit, outReprensation), CHIP_ERROR_INVALID_STRING_LENGTH);
470
+ EXPECT_EQ (ManualSetupPayloadParser::CheckDecimalStringValidity (representationWithoutCheckDigit, outReprensation),
471
+ CHIP_ERROR_INVALID_STRING_LENGTH);
472
472
473
473
representationWithoutCheckDigit = " 10109" ;
474
474
checkDigit = Verhoeff10::ComputeCheckChar (representationWithoutCheckDigit.c_str ());
@@ -544,7 +544,8 @@ TEST(TestManualCode, TestReadCharsFromDecimalString)
544
544
EXPECT_EQ (ManualSetupPayloadParser::ReadDigitsFromDecimalString (" 12" , index , number, 5 ), CHIP_ERROR_INVALID_STRING_LENGTH);
545
545
546
546
index = 200 ;
547
- EXPECT_EQ (ManualSetupPayloadParser::ReadDigitsFromDecimalString (" 6256276377282" , index , number, 1 ), CHIP_ERROR_INVALID_STRING_LENGTH);
547
+ EXPECT_EQ (ManualSetupPayloadParser::ReadDigitsFromDecimalString (" 6256276377282" , index , number, 1 ),
548
+ CHIP_ERROR_INVALID_STRING_LENGTH);
548
549
}
549
550
550
551
TEST (TestManualCode, TestShortCodeCharLengths)
@@ -564,4 +565,4 @@ TEST(TestManualCode, TestShortCodeCharLengths)
564
565
EXPECT_EQ (manualSetupLongCodeCharLength, size_t (kManualSetupLongCodeCharLength ));
565
566
}
566
567
567
- } // namespace
568
+ } // namespace
0 commit comments