1919
2020public class GitHubPaneViewModelTests : TestBaseClass
2121{
22- private readonly IServiceProvider serviceProvider ;
23- private readonly IUIController uiController ;
24- private readonly FakeMenuCommandService menuCommandService ;
25- private readonly GitHubPaneViewModel viewModel ;
26- private UIViewType lastUiControllerJump ;
22+ readonly IServiceProvider serviceProvider ;
23+ readonly IUIController uiController ;
24+ readonly FakeMenuCommandService menuCommandService ;
25+ readonly GitHubPaneViewModel viewModel ;
26+ UIViewType lastUiControllerJump ;
2727
2828 public GitHubPaneViewModelTests ( )
2929 {
30- #region Start tests already logged in with an active repo.
31-
3230 var repositoryHosts = Substitutes . RepositoryHosts ;
3331 repositoryHosts . IsLoggedInToAnyHost . Returns ( true ) ;
3432
3533 var teamExplorerServiceHolder = Substitute . For < ITeamExplorerServiceHolder > ( ) ;
3634 var activeRepo = Substitute . For < ILocalRepositoryModel > ( ) ;
3735 activeRepo . CloneUrl . Returns ( new UriString ( "https://github.com/foo/foo" ) ) ;
3836 teamExplorerServiceHolder
39- . When ( _ => _ . Subscribe ( Arg . Any < object > ( ) , Arg . Any < Action < ILocalRepositoryModel > > ( ) ) )
40- . Do ( _ =>
37+ . When ( x => x . Subscribe ( Arg . Any < object > ( ) , Arg . Any < Action < ILocalRepositoryModel > > ( ) ) )
38+ . Do ( x =>
4139 {
42- var invokeAction = _ . Arg < Action < ILocalRepositoryModel > > ( ) ;
40+ var invokeAction = x . Arg < Action < ILocalRepositoryModel > > ( ) ;
4341 invokeAction ( activeRepo ) ;
4442 } ) ;
4543
@@ -56,26 +54,19 @@ public GitHubPaneViewModelTests()
5654 host . IsLoggedIn . Returns ( true ) ;
5755 repositoryHosts . LookupHost ( connectionHostAddress ) . Returns ( host ) ;
5856
59- #endregion
60-
61- #region Wire up service/UI provider.
62-
6357 serviceProvider = Substitutes . GetFullyMockedServiceProvider ( ) ;
6458 menuCommandService = new FakeMenuCommandService ( ) ;
6559 serviceProvider . GetService ( typeof ( IMenuCommandService ) ) . Returns ( menuCommandService ) ;
6660
67- // TODO: Maybe could avoid cast by making a new interface that inherits IServiceProvider and IUIProvider
6861 var uiProvider = serviceProvider as IUIProvider ;
6962 uiProvider . TryGetService ( typeof ( IUIProvider ) ) . Returns ( serviceProvider ) ;
7063
71- #endregion
72-
7364 uiController = Substitute . For < IUIController > ( ) ;
7465 uiController . CurrentFlow . Returns ( UIControllerFlow . PullRequests ) ;
7566 uiController . SelectedFlow . Returns ( UIControllerFlow . PullRequests ) ;
7667 uiController
77- . When ( _ => _ . Jump ( Arg . Any < ViewWithData > ( ) ) )
78- . Do ( _ => lastUiControllerJump = _ . Arg < ViewWithData > ( ) . ViewType ) ;
68+ . When ( x => x . Jump ( Arg . Any < ViewWithData > ( ) ) )
69+ . Do ( x => lastUiControllerJump = x . Arg < ViewWithData > ( ) . ViewType ) ;
7970
8071 var exportFactoryProvider = Substitutes . ExportFactoryProvider ;
8172 uiProvider . TryGetService ( typeof ( IExportFactoryProvider ) ) . Returns ( exportFactoryProvider ) ;
@@ -112,10 +103,10 @@ public void ListRefreshKeepsListVisible_DoesNotSwitchToPRCreation()
112103 private void RunSteps ( IEnumerable < NavStep > steps )
113104 {
114105 var observableSteps = steps
115- . Select ( _ => new LoadData
106+ . Select ( x => new LoadData
116107 {
117- Direction = _ . Direction ,
118- Data = new ViewWithData ( ) { ViewType = _ . ViewType } ,
108+ Direction = x . Direction ,
109+ Data = new ViewWithData ( ) { ViewType = x . ViewType } ,
119110 View = Substitute . For < IView > ( )
120111 } )
121112 . ToObservable ( ) ;
0 commit comments