@@ -396,25 +396,37 @@ class TestCommandBridge : public CHIPCommandBridge,
396
396
397
397
using ConstraintsChecker::CheckConstraintMinLength;
398
398
399
- bool CheckConstraintMinLength (const char * _Nonnull itemName, NSString * _Nonnull current, uint64_t expected)
399
+ bool CheckConstraintMinLength (const char * _Nonnull itemName, NSString * _Nullable current, uint64_t expected)
400
400
{
401
+ if (current == nil ) {
402
+ return true ;
403
+ }
401
404
return CheckConstraintMinLength (itemName, [current length ], expected);
402
405
}
403
406
404
- bool CheckConstraintMinLength (const char * _Nonnull itemName, NSArray * _Nonnull current, uint64_t expected)
407
+ bool CheckConstraintMinLength (const char * _Nonnull itemName, NSArray * _Nullable current, uint64_t expected)
405
408
{
409
+ if (current == nil ) {
410
+ return true ;
411
+ }
406
412
return CheckConstraintMinLength (itemName, [current count ], expected);
407
413
}
408
414
409
415
using ConstraintsChecker::CheckConstraintMaxLength;
410
416
411
- bool CheckConstraintMaxLength (const char * _Nonnull itemName, NSString * _Nonnull current, uint64_t expected)
417
+ bool CheckConstraintMaxLength (const char * _Nonnull itemName, NSString * _Nullable current, uint64_t expected)
412
418
{
419
+ if (current == nil ) {
420
+ return true ;
421
+ }
413
422
return CheckConstraintMaxLength (itemName, [current length ], expected);
414
423
}
415
424
416
- bool CheckConstraintMaxLength (const char * _Nonnull itemName, NSArray * _Nonnull current, uint64_t expected)
425
+ bool CheckConstraintMaxLength (const char * _Nonnull itemName, NSArray * _Nullable current, uint64_t expected)
417
426
{
427
+ if (current == nil ) {
428
+ return true ;
429
+ }
418
430
return CheckConstraintMaxLength (itemName, [current count ], expected);
419
431
}
420
432
@@ -423,20 +435,29 @@ class TestCommandBridge : public CHIPCommandBridge,
423
435
// Used when the minValue is a saved variable, since ConstraintsChecker does
424
436
// not expect Core Foundation types.
425
437
template <typename T, std::enable_if_t <std::is_integral<T>::value && std::is_signed<T>::value, int > = 0 >
426
- bool CheckConstraintMinValue (const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
438
+ bool CheckConstraintMinValue (const char * _Nonnull itemName, T current, const NSNumber * _Nullable expected)
427
439
{
440
+ if (expected == nil ) {
441
+ return true ;
442
+ }
428
443
return ConstraintsChecker::CheckConstraintMinValue (itemName, current, [expected longLongValue ]);
429
444
}
430
445
431
446
template <typename T, std::enable_if_t <std::is_integral<T>::value && !std::is_signed<T>::value, int > = 0 >
432
- bool CheckConstraintMinValue (const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
447
+ bool CheckConstraintMinValue (const char * _Nonnull itemName, T current, const NSNumber * _Nullable expected)
433
448
{
449
+ if (expected == nil ) {
450
+ return true ;
451
+ }
434
452
return ConstraintsChecker::CheckConstraintMinValue (itemName, current, [expected unsignedLongLongValue ]);
435
453
}
436
454
437
455
template <typename T, std::enable_if_t <std::is_floating_point<T>::value, int > = 0 >
438
- bool CheckConstraintMinValue (const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
456
+ bool CheckConstraintMinValue (const char * _Nonnull itemName, T current, const NSNumber * _Nullable expected)
439
457
{
458
+ if (expected == nil ) {
459
+ return true ;
460
+ }
440
461
return ConstraintsChecker::CheckConstraintMinValue (itemName, current, [expected doubleValue ]);
441
462
}
442
463
@@ -445,20 +466,29 @@ class TestCommandBridge : public CHIPCommandBridge,
445
466
// Used when the maxValue is a saved variable, since ConstraintsChecker does
446
467
// not expect Core Foundation types.
447
468
template <typename T, std::enable_if_t <std::is_integral<T>::value && std::is_signed<T>::value, int > = 0 >
448
- bool CheckConstraintMaxValue (const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
469
+ bool CheckConstraintMaxValue (const char * _Nonnull itemName, T current, const NSNumber * _Nullable expected)
449
470
{
471
+ if (expected == nil ) {
472
+ return true ;
473
+ }
450
474
return ConstraintsChecker::CheckConstraintMaxValue (itemName, current, [expected longLongValue ]);
451
475
}
452
476
453
477
template <typename T, std::enable_if_t <std::is_integral<T>::value && !std::is_signed<T>::value, int > = 0 >
454
- bool CheckConstraintMaxValue (const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
478
+ bool CheckConstraintMaxValue (const char * _Nonnull itemName, T current, const NSNumber * _Nullable expected)
455
479
{
480
+ if (expected == nil ) {
481
+ return true ;
482
+ }
456
483
return ConstraintsChecker::CheckConstraintMaxValue (itemName, current, [expected unsignedLongLongValue ]);
457
484
}
458
485
459
486
template <typename T, std::enable_if_t <std::is_floating_point<T>::value, int > = 0 >
460
- bool CheckConstraintMaxValue (const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
487
+ bool CheckConstraintMaxValue (const char * _Nonnull itemName, T current, const NSNumber * _Nullable expected)
461
488
{
489
+ if (expected == nil ) {
490
+ return true ;
491
+ }
462
492
return ConstraintsChecker::CheckConstraintMaxValue (itemName, current, [expected doubleValue ]);
463
493
}
464
494
0 commit comments