Fix InvariantCultureFixture

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

@@ -51,11 +51,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public async void Should_Convert_Get_String_To_Double()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
             var data = new Class1 { StringValue = "5.6" };
             var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double));
             var result = await target.Take(1);
@@ -86,12 +81,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Convert_Set_String_To_Double()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { StringValue = (5.6).ToString() };
             var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double));
 
@@ -103,12 +92,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public async void Should_Convert_Get_Double_To_String()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { DoubleValue = 5.6 };
             var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string));
             var result = await target.Take(1);
@@ -119,12 +102,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Convert_Set_Double_To_String()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { DoubleValue = 5.6 };
             var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string));
 
@@ -136,12 +113,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public async void Should_Return_BindingNotification_With_FallbackValue_For_NonConvertibe_Target_Value()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { StringValue = "foo" };
             var target = new BindingExpression(
                 new ExpressionObserver(data, "StringValue"),
@@ -161,12 +132,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public async void Should_Return_BindingNotification_With_FallbackValue_For_NonConvertibe_Target_Value_With_Data_Validation()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { StringValue = "foo" };
             var target = new BindingExpression(
                 new ExpressionObserver(data, "StringValue", true),
@@ -186,12 +151,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact(Skip="Result is not always AggregateException.")]
         public async void Should_Return_BindingNotification_For_Invalid_FallbackValue()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { StringValue = "foo" };
             var target = new BindingExpression(
                 new ExpressionObserver(data, "StringValue"),
@@ -212,12 +171,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact(Skip="Result is not always AggregateException.")]
         public async void Should_Return_BindingNotification_For_Invalid_FallbackValue_With_Data_Validation()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { StringValue = "foo" };
             var target = new BindingExpression(
                 new ExpressionObserver(data, "StringValue", true),
@@ -286,12 +239,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Pass_ConverterParameter_To_Convert()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { DoubleValue = 5.6 };
             var converter = new Mock<IValueConverter>();
             var target = new BindingExpression(
@@ -308,12 +255,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Pass_ConverterParameter_To_ConvertBack()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { DoubleValue = 5.6 };
             var converter = new Mock<IValueConverter>();
             var target = new BindingExpression(
@@ -330,12 +271,6 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Handle_DataValidation()
         {
-#if NET461
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-#else
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-#endif
-
             var data = new Class1 { DoubleValue = 5.6 };
             var converter = new Mock<IValueConverter>();
             var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue", true), typeof(string));

tests/Avalonia.UnitTests/InvariantCultureFixture.cs

@@ -20,13 +20,22 @@ namespace Avalonia.UnitTests
 
         public InvariantCultureFixture()
         {
+#if NET461
+            _restore = Thread.CurrentThread.CurrentUICulture;
+            Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+#else
             _restore = CultureInfo.CurrentUICulture;
             CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
+#endif
         }
 
         public void Dispose()
         {
+#if NET461
+            Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = _restore;
+#else
             CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture = _restore;
+#endif
         }
     }
 }