TracyP/WpfViewModelFirst
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Tracy Pearson
2022-08-30 19:34:41 -04:00
parent 379ec7881f
commit c36b4581c1
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
WpfViewModelFirst.Tests/MainWindowViewModelTests.cs
View File

@@ -10,7 +10,7 @@ namespace WpfViewModelFirst.Tests
public void Part1WillSetPart1ViewModelToCurrentViewModel() public void Part1WillSetPart1ViewModelToCurrentViewModel()
{ {
Part1ViewModel part1ViewModel = new(() => { return Task.CompletedTask; }); 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>>())) mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>()))
.Returns(part1ViewModel); .Returns(part1ViewModel);
MainWindowViewModel main = new(mockViewModelFactory.Object); MainWindowViewModel main = new(mockViewModelFactory.Object);
@@ -20,10 +20,9 @@ namespace WpfViewModelFirst.Tests
[Fact] [Fact]
public async Task Part1CallbackIsSuccessfull() public async Task Part1CallbackIsSuccessfull()
{ {
TaskCompletionSource<bool> taskCompletionSource = new TaskCompletionSource<bool>(); TaskCompletionSource<bool> taskCompletionSource = new();
Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>(); Mock<IViewModelFactory> mockViewModelFactory = new();
mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>())) mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>()))
.Returns(() => new Part1ViewModel(() => .Returns(() => new Part1ViewModel(() =>
{ {
return Task.CompletedTask; return Task.CompletedTask;
@@ -31,7 +30,6 @@ namespace WpfViewModelFirst.Tests
})) }))
.Callback<Func<Task>>(c => .Callback<Func<Task>>(c =>
{ {
//taskCompletionSource.SetResult(true);
Task.Run(() => Task.Run(() =>
{ {
c.Invoke(); c.Invoke();
@@ -44,15 +42,7 @@ namespace WpfViewModelFirst.Tests
main.Part1(null); main.Part1(null);
await taskCompletionSource.Task.WaitAsync(CancellationToken.None); await taskCompletionSource.Task.WaitAsync(CancellationToken.None);
Assert.IsType<Part2ViewModel>(main.CurrentViewModel); Assert.IsType<Part2ViewModel>(main.CurrentViewModel);
taskCompletionSource = new();
await taskCompletionSource.Task.WaitAsync(CancellationToken.None);
Assert.Single(main.Strings); Assert.Single(main.Strings);
}
Func<Task> Part1Func()
{
return () => Task.CompletedTask;
} }
} }
} }

4
WpfViewModelFirst/MainWindowViewModel.cs
View File

@@ -20,7 +20,7 @@ namespace WpfViewModelFirst
StartCommand = new CustomCommand(Part1); StartCommand = new CustomCommand(Part1);
} }
private IViewModelFactory _viewModelFactory; private readonly IViewModelFactory _viewModelFactory;
public ICommand StartCommand { get; set; } public ICommand StartCommand { get; set; }
@@ -35,9 +35,7 @@ namespace WpfViewModelFirst
var currentDispatcher = Dispatcher.CurrentDispatcher; var currentDispatcher = Dispatcher.CurrentDispatcher;
return LongDelay().ContinueWith((c) => return LongDelay().ContinueWith((c) =>
{ {
//System.Diagnostics.Debug.WriteLine(c.Result);
CurrentViewModel = _viewModelFactory.GetPart2ViewModel(); CurrentViewModel = _viewModelFactory.GetPart2ViewModel();
ItHappened?.Invoke();
currentDispatcher.Invoke(() => currentDispatcher.Invoke(() =>
{ {
Strings.Add($"{DateTime.Now}"); Strings.Add($"{DateTime.Now}");