Skip to content

Commit 3685bf9

Browse files
committed
Restyle
1 parent bcdef5e commit 3685bf9

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

src/setup_payload/tests/TestManualCode.cpp

+30-29
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ TEST(TestManualCode, TestDecimalRepresentation_FullPayloadWithoutZeros)
131131
EXPECT_TRUE(CheckGenerator(payload, expectedResult));
132132
}
133133

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)
136136
{
137137
EXPECT_EQ(actualError, expectedError);
138138
EXPECT_EQ(payload.setUpPINCode, pinCode);
@@ -274,8 +274,7 @@ TEST(TestManualCode, TestGenerateAndParser_FullPayload)
274274

275275
SetupDiscriminator discriminator;
276276
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);
279278
}
280279

281280
TEST(TestManualCode, TestGenerateAndParser_PartialPayload)
@@ -292,8 +291,7 @@ TEST(TestManualCode, TestGenerateAndParser_PartialPayload)
292291

293292
SetupDiscriminator discriminator;
294293
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);
297295
}
298296

299297
TEST(TestManualCode, TestPayloadParser_PartialPayload)
@@ -399,11 +397,11 @@ TEST(TestManualCode, TestLongCodeReadWrite)
399397
EXPECT_TRUE(inPayload == outPayload);
400398
}
401399

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)
404401
{
405402
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);
407405
}
408406

409407
TEST(TestManualCode, TestPayloadParser_InvalidEntry)
@@ -414,47 +412,47 @@ TEST(TestManualCode, TestPayloadParser_InvalidEntry)
414412
// Empty input
415413
decimalString = "";
416414
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);
419417

420418
// Invalid character
421419
decimalString = "24184.2196";
422420
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);
425423

426424
// too short
427425
decimalString = "2456";
428426
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);
431429

432430
// too long for long code
433431
decimalString = "123456789123456785671";
434432
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);
437435

438436
// too long for short code
439437
decimalString = "12749875380";
440438
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);
443441

444442
// bit to indicate short code but long code length
445443
decimalString = "23456789123456785610";
446444
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);
449447
// no pin code (= 0)
450448
decimalString = "2327680000";
451449
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);
454452
// wrong check digit
455453
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);
458456
}
459457

460458
TEST(TestManualCode, TestCheckDecimalStringValidity)
@@ -465,10 +463,12 @@ TEST(TestManualCode, TestCheckDecimalStringValidity)
465463
std::string decimalString;
466464

467465
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);
469468

470469
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);
472472

473473
representationWithoutCheckDigit = "10109";
474474
checkDigit = Verhoeff10::ComputeCheckChar(representationWithoutCheckDigit.c_str());
@@ -544,7 +544,8 @@ TEST(TestManualCode, TestReadCharsFromDecimalString)
544544
EXPECT_EQ(ManualSetupPayloadParser::ReadDigitsFromDecimalString("12", index, number, 5), CHIP_ERROR_INVALID_STRING_LENGTH);
545545

546546
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);
548549
}
549550

550551
TEST(TestManualCode, TestShortCodeCharLengths)
@@ -564,4 +565,4 @@ TEST(TestManualCode, TestShortCodeCharLengths)
564565
EXPECT_EQ(manualSetupLongCodeCharLength, size_t(kManualSetupLongCodeCharLength));
565566
}
566567

567-
} // namespace
568+
} // namespace

src/setup_payload/tests/TestQRCode.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <gtest/gtest.h>
3030
#include <lib/support/Span.h>
3131

32-
3332
using namespace chip;
3433
using namespace std;
3534

@@ -403,4 +402,4 @@ TEST(TestQRCode, TestExtractPayload)
403402
EXPECT_EQ(QRCodeSetupPayloadParser::ExtractPayload(string("ABC")), string(""));
404403
}
405404

406-
} // namespace
405+
} // namespace

0 commit comments

Comments
 (0)