From b8a3245599305241b9fe69fb6b0b5feba6712025 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sun, 28 Oct 2018 19:14:02 +0100 Subject: [PATCH] use OpenSans-Regular.ttf in tests --- .../Drawing/Text/DrawTextOnImageTests.cs | 11 ++--------- tests/Images/External | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs b/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs index c1aeebed8..46251cdcf 100644 --- a/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs +++ b/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs @@ -165,18 +165,11 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Text } [Theory] - [WithSolidFilledImages(1000, 1500, "White", PixelTypes.Rgba32, "Baskerville Old Face")] - [WithSolidFilledImages(1000, 1500, "White", PixelTypes.Rgba32, "Arial")] + [WithSolidFilledImages(1000, 1500, "White", PixelTypes.Rgba32, "OpenSans-Regular.ttf")] public void TextPositioningIsRobust(TestImageProvider provider, string fontName) where TPixel : struct, IPixel { - if (!TestEnvironment.IsWindows) - { - // Does the system font "Baskerville Old Face" exist on most Linux/MAC machines? - return; - } - - Font font = SystemFonts.CreateFont(fontName, 30, FontStyle.Regular); + Font font = CreateFont(fontName, 30); string text = Repeat("Beware the Jabberwock, my son! The jaws that bite, the claws that catch! Beware the Jubjub bird, and shun The frumious Bandersnatch!\n", 20); diff --git a/tests/Images/External b/tests/Images/External index b7a7eacc0..f41ae0327 160000 --- a/tests/Images/External +++ b/tests/Images/External @@ -1 +1 @@ -Subproject commit b7a7eacc0446a1acc266f30ddadbda40fccde231 +Subproject commit f41ae0327a3ab21ab2388c32160bda67debcc082