@@ -303,12 +303,10 @@ TEST(TestTxtFields, TestGetCommissionerPasscode)
303
303
bool NodeDataIsEmpty (const CommissionNodeData & node)
304
304
{
305
305
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 )
312
310
{
313
311
return false ;
314
312
}
@@ -461,55 +459,55 @@ void DiscoveredTxtFieldSessionIdleInterval()
461
459
strcpy (key, " SII" );
462
460
strcpy (val, " 1" );
463
461
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);
466
464
467
465
// Maximum
468
466
strcpy (key, " SII" );
469
467
strcpy (val, " 3600000" );
470
468
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);
473
471
474
472
// Test no other fields were populated
475
473
ResetRetryIntervalIdle (nodeData);
476
- EXPECT_TRUE ( NodeDataIsEmpty (nodeData.Get <NodeData>()));
474
+ EXPECT_TRUE (NodeDataIsEmpty (nodeData.Get <NodeData>()));
477
475
478
476
// Invalid SII - negative value
479
477
strcpy (key, " SII" );
480
478
strcpy (val, " -1" );
481
479
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
482
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
480
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
483
481
484
482
// Invalid SII - greater than maximum
485
483
strcpy (key, " SII" );
486
484
strcpy (val, " 3600001" );
487
485
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
488
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
486
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
489
487
490
488
// Invalid SII - much greater than maximum
491
489
strcpy (key, " SII" );
492
490
strcpy (val, " 1095216660481" ); // 0xFF00000001 == 1 (mod 2^32)
493
491
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
494
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
492
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
495
493
496
494
// Invalid SII - hexadecimal value
497
495
strcpy (key, " SII" );
498
496
strcpy (val, " 0x20" );
499
497
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
500
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
498
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
501
499
502
500
// Invalid SII - leading zeros
503
501
strcpy (key, " SII" );
504
502
strcpy (val, " 0700" );
505
503
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
506
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
504
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
507
505
508
506
// Invalid SII - text at the end
509
507
strcpy (key, " SII" );
510
508
strcpy (val, " 123abc" );
511
509
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
512
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
510
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalIdle ().HasValue ());
513
511
}
514
512
515
513
// Test SAI (formerly CRA)
@@ -526,55 +524,55 @@ void DiscoveredTxtFieldSessionActiveInterval()
526
524
strcpy (key, " SAI" );
527
525
strcpy (val, " 1" );
528
526
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);
531
529
532
530
// Maximum
533
531
strcpy (key, " SAI" );
534
532
strcpy (val, " 3600000" );
535
533
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);
538
536
539
537
// Test no other fields were populated
540
538
ResetRetryIntervalActive (nodeData);
541
- EXPECT_TRUE ( NodeDataIsEmpty (nodeData.Get <NodeData>()));
539
+ EXPECT_TRUE (NodeDataIsEmpty (nodeData.Get <NodeData>()));
542
540
543
541
// Invalid SAI - negative value
544
542
strcpy (key, " SAI" );
545
543
strcpy (val, " -1" );
546
544
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
547
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
545
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
548
546
549
547
// Invalid SAI - greater than maximum
550
548
strcpy (key, " SAI" );
551
549
strcpy (val, " 3600001" );
552
550
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
553
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
551
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
554
552
555
553
// Invalid SAI - much greater than maximum
556
554
strcpy (key, " SAI" );
557
555
strcpy (val, " 1095216660481" ); // 0xFF00000001 == 1 (mod 2^32)
558
556
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
559
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
557
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
560
558
561
559
// Invalid SAI - hexadecimal value
562
560
strcpy (key, " SAI" );
563
561
strcpy (val, " 0x20" );
564
562
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
565
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
563
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
566
564
567
565
// Invalid SAI - leading zeros
568
566
strcpy (key, " SAI" );
569
567
strcpy (val, " 0700" );
570
568
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
571
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
569
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
572
570
573
571
// Invalid SAI - text at the end
574
572
strcpy (key, " SAI" );
575
573
strcpy (val, " 123abc" );
576
574
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
577
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
575
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryIntervalActive ().HasValue ());
578
576
}
579
577
580
578
// Test SAT (Session Active Threshold)
@@ -591,55 +589,55 @@ void DiscoveredTxtFieldSessionActiveThreshold()
591
589
strcpy (key, " SAT" );
592
590
strcpy (val, " 1" );
593
591
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);
596
594
597
595
// Maximum
598
596
strcpy (key, " SAT" );
599
597
strcpy (val, " 65535" );
600
598
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);
603
601
604
602
// Test no other fields were populated
605
603
ResetRetryActiveThreshold (nodeData);
606
- EXPECT_TRUE ( NodeDataIsEmpty (nodeData.Get <NodeData>()));
604
+ EXPECT_TRUE (NodeDataIsEmpty (nodeData.Get <NodeData>()));
607
605
608
606
// Invalid SAI - negative value
609
607
strcpy (key, " SAT" );
610
608
strcpy (val, " -1" );
611
609
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
612
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
610
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
613
611
614
612
// Invalid SAI - greater than maximum
615
613
strcpy (key, " SAT" );
616
614
strcpy (val, " 65536" );
617
615
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
618
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
616
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
619
617
620
618
// Invalid SAT - much greater than maximum
621
619
strcpy (key, " SAT" );
622
620
strcpy (val, " 1095216660481" ); // 0xFF00000001 == 1 (mod 2^32)
623
621
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
624
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
622
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
625
623
626
624
// Invalid SAT - hexadecimal value
627
625
strcpy (key, " SAT" );
628
626
strcpy (val, " 0x20" );
629
627
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
630
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
628
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
631
629
632
630
// Invalid SAT - leading zeros
633
631
strcpy (key, " SAT" );
634
632
strcpy (val, " 0700" );
635
633
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
636
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
634
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
637
635
638
636
// Invalid SAT - text at the end
639
637
strcpy (key, " SAT" );
640
638
strcpy (val, " 123abc" );
641
639
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
642
- EXPECT_TRUE ( !nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
640
+ EXPECT_TRUE (!nodeData.Get <NodeData>().GetMrpRetryActiveThreshold ().HasValue ());
643
641
}
644
642
645
643
// Test T (TCP support)
@@ -656,23 +654,23 @@ void DiscoveredTxtFieldTcpSupport()
656
654
strcpy (key, " T" );
657
655
strcpy (val, " 1" );
658
656
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
659
- EXPECT_TRUE ( nodeData.Get <NodeData>().supportsTcp );
657
+ EXPECT_TRUE (nodeData.Get <NodeData>().supportsTcp );
660
658
661
659
// Test no other fields were populated
662
660
nodeData.Get <NodeData>().supportsTcp = false ;
663
- EXPECT_TRUE ( NodeDataIsEmpty (nodeData.Get <NodeData>()));
661
+ EXPECT_TRUE (NodeDataIsEmpty (nodeData.Get <NodeData>()));
664
662
665
663
// False
666
664
strcpy (key, " T" );
667
665
strcpy (val, " 0" );
668
666
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
669
- EXPECT_TRUE ( nodeData.Get <NodeData>().supportsTcp == false );
667
+ EXPECT_TRUE (nodeData.Get <NodeData>().supportsTcp == false );
670
668
671
669
// Invalid value, stil false
672
670
strcpy (key, " T" );
673
671
strcpy (val, " asdf" );
674
672
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
675
- EXPECT_TRUE ( nodeData.Get <NodeData>().supportsTcp == false );
673
+ EXPECT_TRUE (nodeData.Get <NodeData>().supportsTcp == false );
676
674
}
677
675
678
676
// Test ICD (ICD operation Mode)
@@ -689,27 +687,27 @@ void DiscoveredTxtFieldICDoperatesAsLIT()
689
687
strcpy (key, " ICD" );
690
688
strcpy (val, " 1" );
691
689
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 ());
694
692
695
693
// Test no other fields were populated
696
694
nodeData.Get <NodeData>().isICDOperatingAsLIT .ClearValue ();
697
- EXPECT_TRUE ( NodeDataIsEmpty (nodeData.Get <NodeData>()));
695
+ EXPECT_TRUE (NodeDataIsEmpty (nodeData.Get <NodeData>()));
698
696
699
697
// ICD is operating as a SIT device
700
698
strcpy (key, " ICD" );
701
699
strcpy (val, " 0" );
702
700
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 );
705
703
706
704
nodeData.Get <NodeData>().isICDOperatingAsLIT .ClearValue ();
707
- EXPECT_TRUE ( NodeDataIsEmpty (nodeData.Get <NodeData>()));
705
+ EXPECT_TRUE (NodeDataIsEmpty (nodeData.Get <NodeData>()));
708
706
// Invalid value, No key set
709
707
strcpy (key, " ICD" );
710
708
strcpy (val, " asdf" );
711
709
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
712
- EXPECT_TRUE ( nodeData.Get <NodeData>().isICDOperatingAsLIT .HasValue () == false );
710
+ EXPECT_TRUE (nodeData.Get <NodeData>().isICDOperatingAsLIT .HasValue () == false );
713
711
}
714
712
715
713
// Test IsDeviceTreatedAsSleepy() with CRI
@@ -725,19 +723,19 @@ void DiscoveredTestIsDeviceSessionIdle()
725
723
CommonResolutionData & resolutionData = nodeData.Get <NodeData>();
726
724
727
725
// 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));
729
727
730
728
// If the interval is the default value, the device is not sleepy
731
729
strcpy (key, " SII" );
732
730
sprintf (val, " %d" , static_cast <int >(CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL.count ()));
733
731
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
734
- EXPECT_TRUE ( !nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
732
+ EXPECT_TRUE (!nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
735
733
736
734
// If the interval is greater than the default value, the device is sleepy
737
735
sprintf (key, " SII" );
738
736
sprintf (val, " %d" , static_cast <int >(CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL.count () + 1 ));
739
737
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
740
- EXPECT_TRUE ( nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
738
+ EXPECT_TRUE (nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
741
739
}
742
740
743
741
// Test IsDeviceTreatedAsSleepy() with CRA
@@ -753,19 +751,19 @@ void DiscoveredTestIsDeviceSessionActive()
753
751
CommonResolutionData & resolutionData = nodeData.Get <NodeData>();
754
752
755
753
// 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));
757
755
758
756
// If the interval is the default value, the device is not sleepy
759
757
sprintf (key, " SAI" );
760
758
sprintf (val, " %d" , static_cast <int >(CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL.count ()));
761
759
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
762
- EXPECT_TRUE ( !nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
760
+ EXPECT_TRUE (!nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
763
761
764
762
// If the interval is greater than the default value, the device is sleepy
765
763
strcpy (key, " SAI" );
766
764
sprintf (val, " %d" , static_cast <int >(CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL.count () + 1 ));
767
765
FillNodeDataFromTxt (GetSpan (key), GetSpan (val), resolutionData);
768
- EXPECT_TRUE ( nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
766
+ EXPECT_TRUE (nodeData.Get <NodeData>().IsDeviceTreatedAsSleepy (&defaultMRPConfig));
769
767
}
770
768
771
769
// Test SAI (formally CRI)
0 commit comments