The tests are pasing. The UI is working. The tests sometimes hang.
This commit is contained in:
@@ -9,9 +9,9 @@ namespace WpfViewModelFirst.Tests
|
||||
[Fact]
|
||||
public void Part1WillSetPart1ViewModelToCurrentViewModel()
|
||||
{
|
||||
Part1ViewModel part1ViewModel = new(() => { });
|
||||
Part1ViewModel part1ViewModel = new(() => { return Task.CompletedTask; });
|
||||
Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>();
|
||||
mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Action>()))
|
||||
mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>()))
|
||||
.Returns(part1ViewModel);
|
||||
MainWindowViewModel main = new(mockViewModelFactory.Object);
|
||||
main.Part1(null);
|
||||
@@ -22,19 +22,21 @@ namespace WpfViewModelFirst.Tests
|
||||
{
|
||||
TaskCompletionSource<bool> taskCompletionSource = new TaskCompletionSource<bool>();
|
||||
Mock<IViewModelFactory> mockViewModelFactory = new Mock<IViewModelFactory>();
|
||||
mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Action>()))
|
||||
mockViewModelFactory.Setup(vmf => vmf.GetPart1ViewModel(It.IsAny<Func<Task>>()))
|
||||
|
||||
.Returns(() => new Part1ViewModel(() =>
|
||||
{
|
||||
//taskCompletionSource.SetResult(true);
|
||||
return Task.CompletedTask;
|
||||
|
||||
}))
|
||||
.Callback<Action>(c =>
|
||||
.Callback<Func<Task>>(c =>
|
||||
{
|
||||
//taskCompletionSource.SetResult(true);
|
||||
c.Invoke();
|
||||
})
|
||||
;
|
||||
Task.Run(() =>
|
||||
{
|
||||
c.Invoke();
|
||||
});
|
||||
});
|
||||
mockViewModelFactory.Setup(vmf => vmf.GetPart2ViewModel())
|
||||
.Returns(() => new Part2ViewModel());
|
||||
MainWindowViewModel main = new(mockViewModelFactory.Object);
|
||||
@@ -42,6 +44,10 @@ 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()
|
||||
|
||||
Reference in New Issue
Block a user