From af4c1f06ad8f1be9ca2770d256478e28e1817cc8 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 27 Aug 2019 16:56:01 +0300
Subject: [PATCH] Extra tests for markup extensions

---
 .../Xaml/BindingTests.cs                         | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
index 7281542bc1..8681722e57 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
@@ -309,8 +309,12 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
-        [Fact]
-        public void Binding_To_TextBlock_Text_With_StringConverter_Works()
+        [Theory,
+            InlineData(@"Hello \{0\}"),
+            InlineData(@"'Hello {0}'"),
+            InlineData(@"Hello {0}")]
+        
+        public void Binding_To_TextBlock_Text_With_StringConverter_Works(string fmt)
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -318,8 +322,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Window xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
-    <TextBlock Name='textBlock' Text='{Binding Foo, StringFormat=Hello \{0\}}'/> 
-</Window>"; 
+    <TextBlock Name='textBlock' Text=""{Binding Foo, StringFormat=" + fmt + @"}""/> 
+</Window>";
                 var loader = new AvaloniaXamlLoader();
                 var window = (Window)loader.Load(xaml); 
                 var textBlock = window.FindControl<TextBlock>("textBlock"); 
@@ -331,7 +335,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
-        [Fact(Skip="Issue #2592")]
+        [Fact]
         public void MultiBinding_To_TextBlock_Text_With_StringConverter_Works()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
@@ -342,7 +346,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <TextBlock Name='textBlock'>
         <TextBlock.Text>
-            <MultiBinding StringFormat='\{0\} \{1\}!'>
+            <MultiBinding StringFormat='{}{0} {1}!'>
                 <Binding Path='Greeting1'/>
                 <Binding Path='Greeting2'/>
             </MultiBinding>