summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorE.Z. Hart <hartez@gmail.com>2017-06-27 10:34:59 -0600
committerE.Z. Hart <hartez@gmail.com>2017-06-27 10:34:59 -0600
commit318b50aa755674c86229295611efbcacb6520fbd (patch)
tree4fa5626721196f61fc018d072d5549ce5c699d26
parent80ac8be42cdd39bcb06ede75dcbfebae1a598e84 (diff)
downloadxamarin-forms-318b50aa755674c86229295611efbcacb6520fbd.tar.gz
xamarin-forms-318b50aa755674c86229295611efbcacb6520fbd.tar.bz2
xamarin-forms-318b50aa755674c86229295611efbcacb6520fbd.zip
Use built-in Nunit method for waiting;
Avoid problems with Assert.Success throwing exception on wrong thread
-rw-r--r--Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs b/Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs
index f6863f30..dd5a3810 100644
--- a/Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs
@@ -605,7 +605,7 @@ namespace Xamarin.Forms.Core.UnitTests
}
[Test]
- public async Task PropertyChangeBindingsOccurThroughMainThread()
+ public void PropertyChangeBindingsOccurThroughMainThread()
{
var vm = new MockViewModel { Text = "text" };
@@ -614,13 +614,13 @@ namespace Xamarin.Forms.Core.UnitTests
bindable.BindingContext = vm;
bindable.SetBinding(MockBindable.TextProperty, binding);
- Device.PlatformServices = new MockPlatformServices(a => Assert.Pass());
+ bool invokeOnMainThreadWasCalled = false;
+ Device.PlatformServices = new MockPlatformServices(a => invokeOnMainThreadWasCalled = true);
vm.Text = "updated";
- // If we wait five seconds and Assert.Pass still hasn't been called, something is very wrong
- await Task.Delay(5000);
- Assert.Fail();
+ // If we wait five seconds and invokeOnMainThreadWasCalled still hasn't been set, something is very wrong
+ Assert.That(invokeOnMainThreadWasCalled, Is.True.After(5000, 10));
}
}