From c36b4581c1e750829353590fecfd98f4a070c182 Mon Sep 17 00:00:00 2001
From: Tracy Pearson <tracypearson@tracypearson.com>
Date: Tue, 30 Aug 2022 19:34:41 -0400
Subject: [PATCH] code cleanup

---
 .../MainWindowViewModelTests.cs                  | 16 +++-------------
 WpfViewModelFirst/MainWindowViewModel.cs         |  4 +---
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/WpfViewModelFirst.Tests/MainWindowViewModelTests.cs b/WpfViewModelFirst.Tests/MainWindowViewModelTests.cs
index fa6e9b8..177955d 100644
--- a/WpfViewModelFirst.Tests/MainWindowViewModelTests.cs
+++ b/WpfViewModelFirst.Tests/MainWindowViewModelTests.cs
@@ -10,7 +10,7 @@ namespace WpfViewModelFirst.Tests
         public void Part1WillSetPart1ViewModelToCurrentViewModel()
         {
             Part1ViewModel part1ViewModel = new(() => { return Task.CompletedTask; });
-            Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>();
+            Mock<IViewModelFactory> mockViewModelFactory = new();
             mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>()))
                 .Returns(part1ViewModel);
             MainWindowViewModel main = new(mockViewModelFactory.Object);
@@ -20,10 +20,9 @@ namespace WpfViewModelFirst.Tests
         [Fact]
         public async Task Part1CallbackIsSuccessfull()
         {
-            TaskCompletionSource<bool> taskCompletionSource = new TaskCompletionSource<bool>();
-            Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>();
+            TaskCompletionSource<bool> taskCompletionSource = new();
+            Mock<IViewModelFactory> mockViewModelFactory = new();
             mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>()))
-
                 .Returns(() => new Part1ViewModel(() =>
                 {
                     return Task.CompletedTask;
@@ -31,7 +30,6 @@ namespace WpfViewModelFirst.Tests
                 }))
                 .Callback<Func<Task>>(c =>
                 {
-                    //taskCompletionSource.SetResult(true);
                     Task.Run(() =>
                         {
                             c.Invoke();
@@ -44,15 +42,7 @@ namespace WpfViewModelFirst.Tests
             main.Part1(null);
             await taskCompletionSource.Task.WaitAsync(CancellationToken.None);
             Assert.IsType<Part2ViewModel>(main.CurrentViewModel);
-            taskCompletionSource = new();
-            await taskCompletionSource.Task.WaitAsync(CancellationToken.None);
             Assert.Single(main.Strings);
-
-        }
-
-        Func<Task> Part1Func()
-        {
-            return () => Task.CompletedTask;
         }
     }
 }
\ No newline at end of file
diff --git a/WpfViewModelFirst/MainWindowViewModel.cs b/WpfViewModelFirst/MainWindowViewModel.cs
index 1373ab8..a509f61 100644
--- a/WpfViewModelFirst/MainWindowViewModel.cs
+++ b/WpfViewModelFirst/MainWindowViewModel.cs
@@ -20,7 +20,7 @@ namespace WpfViewModelFirst
             StartCommand = new CustomCommand(Part1);
         }
 
-        private IViewModelFactory _viewModelFactory;
+        private readonly IViewModelFactory _viewModelFactory;
 
         public ICommand StartCommand { get; set; }
 
@@ -35,9 +35,7 @@ namespace WpfViewModelFirst
             var currentDispatcher = Dispatcher.CurrentDispatcher; 
             return LongDelay().ContinueWith((c) =>
             {
-                //System.Diagnostics.Debug.WriteLine(c.Result);
                 CurrentViewModel = _viewModelFactory.GetPart2ViewModel();
-                 ItHappened?.Invoke();
                currentDispatcher.Invoke(() =>
                 {
                     Strings.Add($"{DateTime.Now}");