Browse Source

fix tests

pull/1503/head
Benedikt Schroeder 8 years ago
parent
commit
87cc247100
  1. 2
      tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
  2. 20
      tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs

2
tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs

@ -233,7 +233,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
target.Arrange(new Rect(0, 0, 100, 100)); target.Arrange(new Rect(0, 0, 100, 100));
Assert.Equal(new Rect(48, 48, 0, 0), content.Bounds); Assert.Equal(new Rect(32, 32, 0, 0), content.Bounds);
} }
} }
} }

20
tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs

@ -58,7 +58,7 @@ namespace Avalonia.Markup.UnitTests.Data
[Fact] [Fact]
public async Task Should_Convert_Get_String_To_Double() public async Task Should_Convert_Get_String_To_Double()
{ {
var data = new Class1 { StringValue = "5.6" }; var data = new Class1 { StringValue = 5.6.ToString(CultureInfo.CurrentCulture) };
var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double)); var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double));
var result = await target.Take(1); var result = await target.Take(1);
@ -94,12 +94,12 @@ namespace Avalonia.Markup.UnitTests.Data
[Fact] [Fact]
public void Should_Convert_Set_String_To_Double() public void Should_Convert_Set_String_To_Double()
{ {
var data = new Class1 { StringValue = (5.6).ToString() }; var data = new Class1 { StringValue = 5.6.ToString(CultureInfo.CurrentCulture) };
var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double)); var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double));
target.OnNext(6.7); target.OnNext(6.7);
Assert.Equal((6.7).ToString(), data.StringValue); Assert.Equal(6.7.ToString(CultureInfo.CurrentCulture), data.StringValue);
GC.KeepAlive(data); GC.KeepAlive(data);
} }
@ -111,7 +111,7 @@ namespace Avalonia.Markup.UnitTests.Data
var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string)); var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string));
var result = await target.Take(1); var result = await target.Take(1);
Assert.Equal((5.6).ToString(), result); Assert.Equal((5.6).ToString(CultureInfo.CurrentCulture), result);
GC.KeepAlive(data); GC.KeepAlive(data);
} }
@ -122,7 +122,7 @@ namespace Avalonia.Markup.UnitTests.Data
var data = new Class1 { DoubleValue = 5.6 }; var data = new Class1 { DoubleValue = 5.6 };
var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string)); var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string));
target.OnNext("6.7"); target.OnNext(6.7.ToString(CultureInfo.CurrentCulture));
Assert.Equal(6.7, data.DoubleValue); Assert.Equal(6.7, data.DoubleValue);
@ -296,7 +296,7 @@ namespace Avalonia.Markup.UnitTests.Data
var data = new Class1 { DoubleValue = 5.6 }; var data = new Class1 { DoubleValue = 5.6 };
var converter = new Mock<IValueConverter>(); var converter = new Mock<IValueConverter>();
var target = new BindingExpression( var target = new BindingExpression(
new ExpressionObserver(data, "DoubleValue"), new ExpressionObserver(data, "DoubleValue"),
typeof(string), typeof(string),
converter.Object, converter.Object,
converterParameter: "foo"); converterParameter: "foo");
@ -318,15 +318,15 @@ namespace Avalonia.Markup.UnitTests.Data
target.Subscribe(x => result.Add(x)); target.Subscribe(x => result.Add(x));
target.OnNext(1.2); target.OnNext(1.2);
target.OnNext("3.4"); target.OnNext(3.4.ToString(CultureInfo.CurrentCulture));
target.OnNext("bar"); target.OnNext("bar");
Assert.Equal( Assert.Equal(
new[] new[]
{ {
new BindingNotification("5.6"), new BindingNotification(5.6.ToString(CultureInfo.CurrentCulture)),
new BindingNotification("1.2"), new BindingNotification(1.2.ToString(CultureInfo.CurrentCulture)),
new BindingNotification("3.4"), new BindingNotification(3.4.ToString(CultureInfo.CurrentCulture)),
new BindingNotification( new BindingNotification(
new InvalidCastException("'bar' is not a valid number."), new InvalidCastException("'bar' is not a valid number."),
BindingErrorType.Error) BindingErrorType.Error)

Loading…
Cancel
Save