@@ -391,17 +391,18 @@ public void GetCommand_ShouldReturnCommand_WhenDataIsValid()
391391 var objectProvider = new BindingContextObjectProvider ( Array . Empty < IValueConverter > ( ) ) ;
392392 var bindingContext = new MyBindingContext ( ) ;
393393
394- ICommand incrementCommand ;
395- ICommand decrementCommand ;
396-
397394 // 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 ) ) ;
400400
401- decrementCommand =
402- objectProvider . GetCommand < ICommand > ( bindingContext , nameof ( MyBindingContext . DecrementCommand ) ) ;
401+ var decrementCommand = objectProvider
402+ . GetCommand < ICommand > ( bindingContext , nameof ( MyBindingContext . DecrementCommand ) ) ;
403403
404404 // Assert
405+ fieldCommand . Should ( ) . NotBeNull ( ) . And . BeAssignableTo < IBaseCommand > ( ) ;
405406 incrementCommand . Should ( ) . NotBeNull ( ) . And . BeAssignableTo < IBaseCommand > ( ) ;
406407 decrementCommand . Should ( ) . NotBeNull ( ) . And . BeAssignableTo < IBaseCommand > ( ) ;
407408 }
@@ -452,14 +453,15 @@ public void GetCommand_ShouldThrow_WhenCommandTypeIsNotAssignableFromPropertyTyp
452453 . Should ( )
453454 . Throw < InvalidCastException > ( )
454455 . 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.") ;
456457 }
457458
458459 [ Fact ]
459460 public void RentCommandWrapper_ShouldReturnCommand_WhenDataIsValid ( )
460461 {
461462 // Arrange
462463 const string commandName = nameof ( MyBindingContext . SetValueCommand ) ;
464+ const string fieldCommandName = nameof ( MyBindingContext . SetValueFieldCommand ) ;
463465
464466 var objectProvider = new BindingContextObjectProvider ( new IValueConverter [ ]
465467 {
@@ -468,14 +470,16 @@ public void RentCommandWrapper_ShouldReturnCommand_WhenDataIsValid()
468470
469471 var bindingContext = new MyBindingContext ( ) ;
470472
471- IBaseCommand setValueCommand ;
472473 var setValueCommandBindingData = $ "{ commandName } , 5". ToCommandBindingData ( 0 ) ;
474+ var setValueFieldCommandBindingData = $ "{ fieldCommandName } , 5". ToCommandBindingData ( 0 ) ;
473475
474476 // Act
475- setValueCommand = objectProvider . RentCommandWrapper ( bindingContext , setValueCommandBindingData ) ;
477+ var setValueCommand = objectProvider . RentCommandWrapper ( bindingContext , setValueCommandBindingData ) ;
478+ var setValueFieldCommand = objectProvider . RentCommandWrapper ( bindingContext , setValueFieldCommandBindingData ) ;
476479
477480 // Assert
478481 setValueCommand . Should ( ) . NotBeNull ( ) ;
482+ setValueFieldCommand . Should ( ) . NotBeNull ( ) ;
479483 }
480484
481485 [ Fact ]
0 commit comments