Skip to content

Commit 97d10cc

Browse files
restyled-commitssu-shanka
restyled-commits
authored and
su-shanka
committed
Restyled by clang-format
1 parent 8675480 commit 97d10cc

File tree

1 file changed

+54
-56
lines changed

1 file changed

+54
-56
lines changed

‎src/lib/dnssd/tests/TestTxtFields.cpp

+54-56
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,10 @@ TEST(TestTxtFields, TestGetCommissionerPasscode)
303303
bool NodeDataIsEmpty(const CommissionNodeData & node)
304304
{
305305

306-
if (node.longDiscriminator != 0 || node.vendorId != 0 || node.productId != 0 ||
307-
node.commissioningMode != 0 || node.deviceType != 0 || node.rotatingIdLen != 0 ||
308-
node.pairingHint != 0 || node.mrpRetryIntervalIdle.HasValue() ||
309-
node.mrpRetryIntervalActive.HasValue() || node.mrpRetryActiveThreshold.HasValue() ||
310-
node.isICDOperatingAsLIT.HasValue() || node.supportsTcp ||
311-
node.supportsCommissionerGeneratedPasscode != 0)
306+
if (node.longDiscriminator != 0 || node.vendorId != 0 || node.productId != 0 || node.commissioningMode != 0 ||
307+
node.deviceType != 0 || node.rotatingIdLen != 0 || node.pairingHint != 0 || node.mrpRetryIntervalIdle.HasValue() ||
308+
node.mrpRetryIntervalActive.HasValue() || node.mrpRetryActiveThreshold.HasValue() || node.isICDOperatingAsLIT.HasValue() ||
309+
node.supportsTcp || node.supportsCommissionerGeneratedPasscode != 0)
312310
{
313311
return false;
314312
}
@@ -461,55 +459,55 @@ void DiscoveredTxtFieldSessionIdleInterval()
461459
strcpy(key, "SII");
462460
strcpy(val, "1");
463461
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
464-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
465-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().Value() == 1_ms32);
462+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
463+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().Value() == 1_ms32);
466464

467465
// Maximum
468466
strcpy(key, "SII");
469467
strcpy(val, "3600000");
470468
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
471-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
472-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().Value() == 3600000_ms32);
469+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
470+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().Value() == 3600000_ms32);
473471

474472
// Test no other fields were populated
475473
ResetRetryIntervalIdle(nodeData);
476-
EXPECT_TRUE( NodeDataIsEmpty(nodeData.Get<NodeData>()));
474+
EXPECT_TRUE(NodeDataIsEmpty(nodeData.Get<NodeData>()));
477475

478476
// Invalid SII - negative value
479477
strcpy(key, "SII");
480478
strcpy(val, "-1");
481479
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
482-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
480+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
483481

484482
// Invalid SII - greater than maximum
485483
strcpy(key, "SII");
486484
strcpy(val, "3600001");
487485
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
488-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
486+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
489487

490488
// Invalid SII - much greater than maximum
491489
strcpy(key, "SII");
492490
strcpy(val, "1095216660481"); // 0xFF00000001 == 1 (mod 2^32)
493491
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
494-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
492+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
495493

496494
// Invalid SII - hexadecimal value
497495
strcpy(key, "SII");
498496
strcpy(val, "0x20");
499497
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
500-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
498+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
501499

502500
// Invalid SII - leading zeros
503501
strcpy(key, "SII");
504502
strcpy(val, "0700");
505503
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
506-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
504+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
507505

508506
// Invalid SII - text at the end
509507
strcpy(key, "SII");
510508
strcpy(val, "123abc");
511509
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
512-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
510+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalIdle().HasValue());
513511
}
514512

515513
// Test SAI (formerly CRA)
@@ -526,55 +524,55 @@ void DiscoveredTxtFieldSessionActiveInterval()
526524
strcpy(key, "SAI");
527525
strcpy(val, "1");
528526
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
529-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
530-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalActive().Value() == 1_ms32);
527+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
528+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalActive().Value() == 1_ms32);
531529

532530
// Maximum
533531
strcpy(key, "SAI");
534532
strcpy(val, "3600000");
535533
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
536-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
537-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryIntervalActive().Value() == 3600000_ms32);
534+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
535+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryIntervalActive().Value() == 3600000_ms32);
538536

539537
// Test no other fields were populated
540538
ResetRetryIntervalActive(nodeData);
541-
EXPECT_TRUE( NodeDataIsEmpty(nodeData.Get<NodeData>()));
539+
EXPECT_TRUE(NodeDataIsEmpty(nodeData.Get<NodeData>()));
542540

543541
// Invalid SAI - negative value
544542
strcpy(key, "SAI");
545543
strcpy(val, "-1");
546544
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
547-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
545+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
548546

549547
// Invalid SAI - greater than maximum
550548
strcpy(key, "SAI");
551549
strcpy(val, "3600001");
552550
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
553-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
551+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
554552

555553
// Invalid SAI - much greater than maximum
556554
strcpy(key, "SAI");
557555
strcpy(val, "1095216660481"); // 0xFF00000001 == 1 (mod 2^32)
558556
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
559-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
557+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
560558

561559
// Invalid SAI - hexadecimal value
562560
strcpy(key, "SAI");
563561
strcpy(val, "0x20");
564562
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
565-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
563+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
566564

567565
// Invalid SAI - leading zeros
568566
strcpy(key, "SAI");
569567
strcpy(val, "0700");
570568
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
571-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
569+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
572570

573571
// Invalid SAI - text at the end
574572
strcpy(key, "SAI");
575573
strcpy(val, "123abc");
576574
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
577-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
575+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryIntervalActive().HasValue());
578576
}
579577

580578
// Test SAT (Session Active Threshold)
@@ -591,55 +589,55 @@ void DiscoveredTxtFieldSessionActiveThreshold()
591589
strcpy(key, "SAT");
592590
strcpy(val, "1");
593591
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
594-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
595-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().Value() == 1_ms16);
592+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
593+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().Value() == 1_ms16);
596594

597595
// Maximum
598596
strcpy(key, "SAT");
599597
strcpy(val, "65535");
600598
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
601-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
602-
EXPECT_TRUE( nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().Value() == 65535_ms16);
599+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
600+
EXPECT_TRUE(nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().Value() == 65535_ms16);
603601

604602
// Test no other fields were populated
605603
ResetRetryActiveThreshold(nodeData);
606-
EXPECT_TRUE( NodeDataIsEmpty(nodeData.Get<NodeData>()));
604+
EXPECT_TRUE(NodeDataIsEmpty(nodeData.Get<NodeData>()));
607605

608606
// Invalid SAI - negative value
609607
strcpy(key, "SAT");
610608
strcpy(val, "-1");
611609
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
612-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
610+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
613611

614612
// Invalid SAI - greater than maximum
615613
strcpy(key, "SAT");
616614
strcpy(val, "65536");
617615
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
618-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
616+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
619617

620618
// Invalid SAT - much greater than maximum
621619
strcpy(key, "SAT");
622620
strcpy(val, "1095216660481"); // 0xFF00000001 == 1 (mod 2^32)
623621
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
624-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
622+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
625623

626624
// Invalid SAT - hexadecimal value
627625
strcpy(key, "SAT");
628626
strcpy(val, "0x20");
629627
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
630-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
628+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
631629

632630
// Invalid SAT - leading zeros
633631
strcpy(key, "SAT");
634632
strcpy(val, "0700");
635633
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
636-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
634+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
637635

638636
// Invalid SAT - text at the end
639637
strcpy(key, "SAT");
640638
strcpy(val, "123abc");
641639
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
642-
EXPECT_TRUE( !nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
640+
EXPECT_TRUE(!nodeData.Get<NodeData>().GetMrpRetryActiveThreshold().HasValue());
643641
}
644642

645643
// Test T (TCP support)
@@ -656,23 +654,23 @@ void DiscoveredTxtFieldTcpSupport()
656654
strcpy(key, "T");
657655
strcpy(val, "1");
658656
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
659-
EXPECT_TRUE( nodeData.Get<NodeData>().supportsTcp);
657+
EXPECT_TRUE(nodeData.Get<NodeData>().supportsTcp);
660658

661659
// Test no other fields were populated
662660
nodeData.Get<NodeData>().supportsTcp = false;
663-
EXPECT_TRUE( NodeDataIsEmpty(nodeData.Get<NodeData>()));
661+
EXPECT_TRUE(NodeDataIsEmpty(nodeData.Get<NodeData>()));
664662

665663
// False
666664
strcpy(key, "T");
667665
strcpy(val, "0");
668666
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
669-
EXPECT_TRUE( nodeData.Get<NodeData>().supportsTcp == false);
667+
EXPECT_TRUE(nodeData.Get<NodeData>().supportsTcp == false);
670668

671669
// Invalid value, stil false
672670
strcpy(key, "T");
673671
strcpy(val, "asdf");
674672
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
675-
EXPECT_TRUE( nodeData.Get<NodeData>().supportsTcp == false);
673+
EXPECT_TRUE(nodeData.Get<NodeData>().supportsTcp == false);
676674
}
677675

678676
// Test ICD (ICD operation Mode)
@@ -689,27 +687,27 @@ void DiscoveredTxtFieldICDoperatesAsLIT()
689687
strcpy(key, "ICD");
690688
strcpy(val, "1");
691689
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
692-
EXPECT_TRUE( nodeData.Get<NodeData>().isICDOperatingAsLIT.HasValue());
693-
EXPECT_TRUE( nodeData.Get<NodeData>().isICDOperatingAsLIT.Value());
690+
EXPECT_TRUE(nodeData.Get<NodeData>().isICDOperatingAsLIT.HasValue());
691+
EXPECT_TRUE(nodeData.Get<NodeData>().isICDOperatingAsLIT.Value());
694692

695693
// Test no other fields were populated
696694
nodeData.Get<NodeData>().isICDOperatingAsLIT.ClearValue();
697-
EXPECT_TRUE( NodeDataIsEmpty(nodeData.Get<NodeData>()));
695+
EXPECT_TRUE(NodeDataIsEmpty(nodeData.Get<NodeData>()));
698696

699697
// ICD is operating as a SIT device
700698
strcpy(key, "ICD");
701699
strcpy(val, "0");
702700
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
703-
EXPECT_TRUE( nodeData.Get<NodeData>().isICDOperatingAsLIT.HasValue());
704-
EXPECT_TRUE( nodeData.Get<NodeData>().isICDOperatingAsLIT.Value() == false);
701+
EXPECT_TRUE(nodeData.Get<NodeData>().isICDOperatingAsLIT.HasValue());
702+
EXPECT_TRUE(nodeData.Get<NodeData>().isICDOperatingAsLIT.Value() == false);
705703

706704
nodeData.Get<NodeData>().isICDOperatingAsLIT.ClearValue();
707-
EXPECT_TRUE( NodeDataIsEmpty(nodeData.Get<NodeData>()));
705+
EXPECT_TRUE(NodeDataIsEmpty(nodeData.Get<NodeData>()));
708706
// Invalid value, No key set
709707
strcpy(key, "ICD");
710708
strcpy(val, "asdf");
711709
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
712-
EXPECT_TRUE( nodeData.Get<NodeData>().isICDOperatingAsLIT.HasValue() == false);
710+
EXPECT_TRUE(nodeData.Get<NodeData>().isICDOperatingAsLIT.HasValue() == false);
713711
}
714712

715713
// Test IsDeviceTreatedAsSleepy() with CRI
@@ -725,19 +723,19 @@ void DiscoveredTestIsDeviceSessionIdle()
725723
CommonResolutionData & resolutionData = nodeData.Get<NodeData>();
726724

727725
// No key/val set, so the device can't be sleepy
728-
EXPECT_TRUE( !nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
726+
EXPECT_TRUE(!nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
729727

730728
// If the interval is the default value, the device is not sleepy
731729
strcpy(key, "SII");
732730
sprintf(val, "%d", static_cast<int>(CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL.count()));
733731
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
734-
EXPECT_TRUE( !nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
732+
EXPECT_TRUE(!nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
735733

736734
// If the interval is greater than the default value, the device is sleepy
737735
sprintf(key, "SII");
738736
sprintf(val, "%d", static_cast<int>(CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL.count() + 1));
739737
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
740-
EXPECT_TRUE( nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
738+
EXPECT_TRUE(nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
741739
}
742740

743741
// Test IsDeviceTreatedAsSleepy() with CRA
@@ -753,19 +751,19 @@ void DiscoveredTestIsDeviceSessionActive()
753751
CommonResolutionData & resolutionData = nodeData.Get<NodeData>();
754752

755753
// No key/val set, so the device can't be sleepy
756-
EXPECT_TRUE( !nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
754+
EXPECT_TRUE(!nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
757755

758756
// If the interval is the default value, the device is not sleepy
759757
sprintf(key, "SAI");
760758
sprintf(val, "%d", static_cast<int>(CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL.count()));
761759
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
762-
EXPECT_TRUE( !nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
760+
EXPECT_TRUE(!nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
763761

764762
// If the interval is greater than the default value, the device is sleepy
765763
strcpy(key, "SAI");
766764
sprintf(val, "%d", static_cast<int>(CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL.count() + 1));
767765
FillNodeDataFromTxt(GetSpan(key), GetSpan(val), resolutionData);
768-
EXPECT_TRUE( nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
766+
EXPECT_TRUE(nodeData.Get<NodeData>().IsDeviceTreatedAsSleepy(&defaultMRPConfig));
769767
}
770768

771769
// Test SAI (formally CRI)

0 commit comments

Comments
 (0)