System.Drawing.Common.Tests fail ToLogFont_Invoke tests on non Englis…

…h Windows (dotnet#59328)
Nisden · Oct 14, 2021 · 4768646 · 4768646
1 parent e7709b6
commit 4768646
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libraries/System.Drawing.Common/tests/FontTests.cs b/src/libraries/System.Drawing.Common/tests/FontTests.cs
@@ -800,7 +800,7 @@ public void ToLogFont_Invoke_ReturnsExpected(FontStyle fontStyle, byte gdiCharSe
                 Assert.Equal(font.Italic ? 1 : 0, logFont.lfItalic);
                 Assert.Equal(font.Underline ? 1 : 0, logFont.lfUnderline);
                 Assert.Equal(font.Strikeout ? 1 : 0, logFont.lfStrikeOut);
-                Assert.Equal(font.GdiCharSet, logFont.lfCharSet);
+                Assert.Equal(SystemFonts.DefaultFont.GdiCharSet <= 2 ? font.GdiCharSet : SystemFonts.DefaultFont.GdiCharSet, logFont.lfCharSet);
                 Assert.Equal(0, logFont.lfOutPrecision);
                 Assert.Equal(0, logFont.lfClipPrecision);
                 Assert.Equal(0, logFont.lfQuality);
@@ -837,7 +837,7 @@ public void ToLogFont_InvokeGraphics_ReturnsExpected(TextRenderingHint textRende
                 Assert.Equal(0, logFont.lfItalic);
                 Assert.Equal(0, logFont.lfUnderline);
                 Assert.Equal(0, logFont.lfStrikeOut);
-                Assert.Equal(1, logFont.lfCharSet);
+                Assert.Equal(SystemFonts.DefaultFont.GdiCharSet <= 2 ? font.GdiCharSet : SystemFonts.DefaultFont.GdiCharSet, logFont.lfCharSet);
                 Assert.Equal(0, logFont.lfOutPrecision);
                 Assert.Equal(0, logFont.lfClipPrecision);
                 Assert.Equal(0, logFont.lfQuality);