From 21fadbedd6734fd74e07fdeb7c2383b546ce6b38 Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Fri, 16 Oct 2020 12:43:17 +0300
Subject: [PATCH] add tests for text issue:4866

---
 .../Controls/TextBlockTests.cs                |  54 ++++++++++++++++++
 ...estrictedHeight_VerticalAlign.expected.png | Bin 0 -> 527 bytes
 ...estrictedHeight_VerticalAlign.expected.png | Bin 0 -> 527 bytes
 3 files changed, 54 insertions(+)
 create mode 100644 tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png

diff --git a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
index ab769e4ff0..53a2959848 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
@@ -40,5 +40,59 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             await RenderToFile(target);
             CompareImages();
         }
+
+
+        [Win32Fact("Has text")]
+        public async Task RestrictedHeight_VerticalAlign()
+        {
+            IControl text(VerticalAlignment verticalAlingnment, bool clip = true, bool restrictHeight = true)
+            {
+                return new Border()
+                {
+                    BorderBrush = Brushes.Blue,
+                    BorderThickness = new Thickness(1),
+                    VerticalAlignment = VerticalAlignment.Center,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    Height = restrictHeight ? 20 : double.NaN,
+                    Margin = new Thickness(1),
+                    Child = new TextBlock
+                    {
+                        FontFamily = new FontFamily("Courier New"),
+                        Background = Brushes.Red,
+                        FontSize = 24,
+                        Foreground = Brushes.Black,
+                        Text = "L",
+                        VerticalAlignment = verticalAlingnment,
+                        ClipToBounds = clip
+                    }
+                };
+            }
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 180,
+                Height = 80,
+
+                Child = new StackPanel()
+                {
+                    Orientation = Orientation.Horizontal,
+                    Children =
+                    {
+                        text(VerticalAlignment.Stretch, restrictHeight: false),
+                        text(VerticalAlignment.Center),
+                        text(VerticalAlignment.Stretch),
+                        text(VerticalAlignment.Top),
+                        text(VerticalAlignment.Bottom),
+                        text(VerticalAlignment.Center, clip:false),
+                        text(VerticalAlignment.Stretch, clip:false),
+                        text(VerticalAlignment.Top, clip:false),
+                        text(VerticalAlignment.Bottom, clip:false),
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
     }
 }
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a0a14e52616d76ebd7926248e785e0c6b42296
GIT binary patch
literal 527
zcmeAS@N?(olHy`uVBq!ia0vp^TYxx#gAGV-kceLfq*#ibJVQ8upoSx*gMoqZn5T<l
zNX4ADcTVTtb`W8`psoCLM|aNM##rYtJ>}U;+IFz$-)-2Qso+}Sug{{q>EZbaGG{*&
z^BrhqNHVFa5_;F;p$aq=4P+N;Sm#Ql+4(;Fe8A?um%ofx_5WVyv^uebmhOAP3E}(H
zCG9Noq|YTwv?afjs6ErKopYshQv6nS-E$W{D;@W4TQ~J+@8*An?<UzSTeJN1^@Ow1
zRr-&o?2FB=j@^1}X4w4or6(`&Th>jwXI=Mg#)U&G&X+8f+7-6YKb)<8(jSY;J4LA*
zLS7lie%u!OY5#?jJ6KrO-q@BLY*L~g?)mTQydzD%YtOHe-W9g&{YH-6{+~*gZH#}j
z(QdKPmrGYpeTj~h269&aYirvscK^brXV0%Z-@4hfWUbTo6SKC?Njp1RW&h{GZ);p@
z<E*2d*RQ;=wWdt-X7%yZ`I%*x7uj|9%NVq^r3LSbpL0bk``W25x?+j1jPE|_p8QN?
zm;1FfQ(s1};k}Z+>!i5)L7|fua=M~7lo_83w~vya^yjSMfh`j0J+JDUAFAD)x=QqT
z_~xVcen?B5^9CAdVlq2uPwsR5y=Y<0z|in+9^)@(Q)>rl$*mwsPgg&ebxsLQ0Q>~$
ATmS$7

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a0a14e52616d76ebd7926248e785e0c6b42296
GIT binary patch
literal 527
zcmeAS@N?(olHy`uVBq!ia0vp^TYxx#gAGV-kceLfq*#ibJVQ8upoSx*gMoqZn5T<l
zNX4ADcTVTtb`W8`psoCLM|aNM##rYtJ>}U;+IFz$-)-2Qso+}Sug{{q>EZbaGG{*&
z^BrhqNHVFa5_;F;p$aq=4P+N;Sm#Ql+4(;Fe8A?um%ofx_5WVyv^uebmhOAP3E}(H
zCG9Noq|YTwv?afjs6ErKopYshQv6nS-E$W{D;@W4TQ~J+@8*An?<UzSTeJN1^@Ow1
zRr-&o?2FB=j@^1}X4w4or6(`&Th>jwXI=Mg#)U&G&X+8f+7-6YKb)<8(jSY;J4LA*
zLS7lie%u!OY5#?jJ6KrO-q@BLY*L~g?)mTQydzD%YtOHe-W9g&{YH-6{+~*gZH#}j
z(QdKPmrGYpeTj~h269&aYirvscK^brXV0%Z-@4hfWUbTo6SKC?Njp1RW&h{GZ);p@
z<E*2d*RQ;=wWdt-X7%yZ`I%*x7uj|9%NVq^r3LSbpL0bk``W25x?+j1jPE|_p8QN?
zm;1FfQ(s1};k}Z+>!i5)L7|fua=M~7lo_83w~vya^yjSMfh`j0J+JDUAFAD)x=QqT
z_~xVcen?B5^9CAdVlq2uPwsR5y=Y<0z|in+9^)@(Q)>rl$*mwsPgg&ebxsLQ0Q>~$
ATmS$7

literal 0
HcmV?d00001