@@ -391,17 +391,18 @@ public void GetCommand_ShouldReturnCommand_WhenDataIsValid()
391
391
var objectProvider = new BindingContextObjectProvider ( Array . Empty < IValueConverter > ( ) ) ;
392
392
var bindingContext = new MyBindingContext ( ) ;
393
393
394
- ICommand incrementCommand ;
395
- ICommand decrementCommand ;
396
-
397
394
// Act
398
- incrementCommand =
399
- objectProvider . GetCommand < ICommand > ( bindingContext , nameof ( MyBindingContext . IncrementCommand ) ) ;
395
+ var fieldCommand = objectProvider
396
+ . GetCommand < ICommand > ( bindingContext , nameof ( MyBindingContext . FieldCommand ) ) ;
397
+
398
+ var incrementCommand = objectProvider
399
+ . GetCommand < ICommand > ( bindingContext , nameof ( MyBindingContext . IncrementCommand ) ) ;
400
400
401
- decrementCommand =
402
- objectProvider . GetCommand < ICommand > ( bindingContext , nameof ( MyBindingContext . DecrementCommand ) ) ;
401
+ var decrementCommand = objectProvider
402
+ . GetCommand < ICommand > ( bindingContext , nameof ( MyBindingContext . DecrementCommand ) ) ;
403
403
404
404
// Assert
405
+ fieldCommand . Should ( ) . NotBeNull ( ) . And . BeAssignableTo < IBaseCommand > ( ) ;
405
406
incrementCommand . Should ( ) . NotBeNull ( ) . And . BeAssignableTo < IBaseCommand > ( ) ;
406
407
decrementCommand . Should ( ) . NotBeNull ( ) . And . BeAssignableTo < IBaseCommand > ( ) ;
407
408
}
@@ -452,14 +453,15 @@ public void GetCommand_ShouldThrow_WhenCommandTypeIsNotAssignableFromPropertyTyp
452
453
. Should ( )
453
454
. Throw < InvalidCastException > ( )
454
455
. WithMessage (
455
- $ "Can not cast the { typeof ( IReadOnlyProperty < string > ) } command to the { typeof ( ICommand ) } command.") ;
456
+ $ "Can not cast the ' { typeof ( IReadOnlyProperty < string > ) } ' command to the ' { typeof ( ICommand ) } ' command.") ;
456
457
}
457
458
458
459
[ Fact ]
459
460
public void RentCommandWrapper_ShouldReturnCommand_WhenDataIsValid ( )
460
461
{
461
462
// Arrange
462
463
const string commandName = nameof ( MyBindingContext . SetValueCommand ) ;
464
+ const string fieldCommandName = nameof ( MyBindingContext . SetValueFieldCommand ) ;
463
465
464
466
var objectProvider = new BindingContextObjectProvider ( new IValueConverter [ ]
465
467
{
@@ -468,14 +470,16 @@ public void RentCommandWrapper_ShouldReturnCommand_WhenDataIsValid()
468
470
469
471
var bindingContext = new MyBindingContext ( ) ;
470
472
471
- IBaseCommand setValueCommand ;
472
473
var setValueCommandBindingData = $ "{ commandName } , 5". ToCommandBindingData ( 0 ) ;
474
+ var setValueFieldCommandBindingData = $ "{ fieldCommandName } , 5". ToCommandBindingData ( 0 ) ;
473
475
474
476
// Act
475
- setValueCommand = objectProvider . RentCommandWrapper ( bindingContext , setValueCommandBindingData ) ;
477
+ var setValueCommand = objectProvider . RentCommandWrapper ( bindingContext , setValueCommandBindingData ) ;
478
+ var setValueFieldCommand = objectProvider . RentCommandWrapper ( bindingContext , setValueFieldCommandBindingData ) ;
476
479
477
480
// Assert
478
481
setValueCommand . Should ( ) . NotBeNull ( ) ;
482
+ setValueFieldCommand . Should ( ) . NotBeNull ( ) ;
479
483
}
480
484
481
485
[ Fact ]
0 commit comments