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

Working with passing tests!

Browse Source
This commit is contained in:
Tracy Pearson
2022-08-30 11:55:08 -04:00
parent 50f0754a0f
commit abf09308fc
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
WpfViewModelFirst.Tests/MainWindowViewModelTests.cs
View File

@@ -9,9 +9,9 @@ namespace WpfViewModelFirst.Tests
[Fact] [Fact]
public void Part1WillSetPart1ViewModelToCurrentViewModel() public void Part1WillSetPart1ViewModelToCurrentViewModel()
{ {
Part1ViewModel part1ViewModel = new(() => Task.CompletedTask); Part1ViewModel part1ViewModel = new(() => { });
Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>(); Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>();
mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>())) mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Action>()))
.Returns(part1ViewModel); .Returns(part1ViewModel);
MainWindowViewModel main = new(mockViewModelFactory.Object); MainWindowViewModel main = new(mockViewModelFactory.Object);
main.Part1(null); main.Part1(null);
@@ -22,24 +22,23 @@ namespace WpfViewModelFirst.Tests
{ {
TaskCompletionSource<bool> taskCompletionSource = new TaskCompletionSource<bool>(); TaskCompletionSource<bool> taskCompletionSource = new TaskCompletionSource<bool>();
Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>(); Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>();
mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>())) mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Action>()))
.Returns(() => new Part1ViewModel(() => .Returns(() => new Part1ViewModel(() =>
{ {
taskCompletionSource.SetResult(true); //taskCompletionSource.SetResult(true);
return Task.CompletedTask;
})) }))
.Callback<Func<Task>>(c => .Callback<Action>(c =>
{ {
c.Invoke().ContinueWith(t => //taskCompletionSource.SetResult(true);
{ c.Invoke();
taskCompletionSource.SetResult(true);
});
}) })
; ;
mockViewModelFactory.Setup(vmf => vmf.GetPart2ViewModel()) mockViewModelFactory.Setup(vmf => vmf.GetPart2ViewModel())
.Returns(() => new Part2ViewModel()); .Returns(() => new Part2ViewModel());
MainWindowViewModel main = new(mockViewModelFactory.Object); MainWindowViewModel main = new(mockViewModelFactory.Object);
main.ItHappened += () => taskCompletionSource.SetResult(true);
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);

2
WpfViewModelFirst/IViewModelFactory.cs
View File

@@ -7,7 +7,7 @@ namespace WpfViewModelFirst
{ {
public interface IViewModelFactory public interface IViewModelFactory
{ {
Part1ViewModel GetPart1ViewModel(Func<Task> finishAction); Part1ViewModel GetPart1ViewModel(Action finishAction);
Part2ViewModel GetPart2ViewModel(); Part2ViewModel GetPart2ViewModel();
} }
} }

13
WpfViewModelFirst/MainWindowViewModel.cs
View File

@@ -27,23 +27,26 @@ namespace WpfViewModelFirst
public void Part1(object? e) public void Part1(object? e)
{ {
CurrentViewModel = null; CurrentViewModel = null;
CurrentViewModel = _viewModelFactory.GetPart1ViewModel(async () => await Part1Action()); CurrentViewModel = _viewModelFactory.GetPart1ViewModel(Part1Action);
} }
private Task Part1Action() private void Part1Action()
{ {
var currentDispatcher = Dispatcher.CurrentDispatcher;
CurrentViewModel = null; CurrentViewModel = null;
return LongDelay().ContinueWith((c) => var currentDispatcher = Dispatcher.CurrentDispatcher;
LongDelay().ContinueWith((c) =>
{ {
//System.Diagnostics.Debug.WriteLine(c.Result); //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}");
}); });
},TaskContinuationOptions.OnlyOnRanToCompletion); }, TaskContinuationOptions.OnlyOnRanToCompletion);
} }
public event Action ItHappened;
private async Task<string> LongDelay() private async Task<string> LongDelay()
{ {
await Task.Delay(500); await Task.Delay(500);

4
WpfViewModelFirst/Part1/Part1ViewModel.cs
View File

@@ -9,9 +9,9 @@ namespace WpfViewModelFirst.Part1
{ {
public class Part1ViewModel : ViewModelBase public class Part1ViewModel : ViewModelBase
{ {
private readonly Func<Task> _finishAction; private readonly Action _finishAction;
public Part1ViewModel(Func<Task> finishAction) public Part1ViewModel(Action finishAction)
{ {
_finishAction = finishAction; _finishAction = finishAction;
FinishCommand = new CustomCommand(Finish); FinishCommand = new CustomCommand(Finish);

2
WpfViewModelFirst/ViewModelFactory.cs
View File

@@ -8,7 +8,7 @@ namespace WpfViewModelFirst
{ {
public class ViewModelFactory : IViewModelFactory public class ViewModelFactory : IViewModelFactory
{ {
public Part1.Part1ViewModel GetPart1ViewModel(Func<Task> finishAction) public Part1.Part1ViewModel GetPart1ViewModel(Action finishAction)
{ {
return new(finishAction); return new(finishAction);
} }