From 3c1dfcfcf5e9eb4e05b596ad6d9f3203e1632911 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 16 Jul 2019 12:40:52 +0200 Subject: [PATCH] Added equality test. And fix bug in `DashStyle`. --- src/Avalonia.Visuals/Media/DashStyle.cs | 2 +- .../Media/PenTests.cs | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Visuals/Media/DashStyle.cs b/src/Avalonia.Visuals/Media/DashStyle.cs index c7e1db57b2..9f03a0bd85 100644 --- a/src/Avalonia.Visuals/Media/DashStyle.cs +++ b/src/Avalonia.Visuals/Media/DashStyle.cs @@ -10,7 +10,7 @@ namespace Avalonia.Media { get { - if (dashDotDot == null) + if (dash == null) { dash = new DashStyle(new double[] { 2, 2 }, 1); } diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs index a3746f80b5..c4fe0155f9 100644 --- a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs @@ -1,4 +1,5 @@ using Avalonia.Media; +using Avalonia.Media.Immutable; using Xunit; namespace Avalonia.Visuals.UnitTests.Media @@ -29,5 +30,27 @@ namespace Avalonia.Visuals.UnitTests.Media Assert.True(raised); } + + [Fact] + public void Equality_Is_Implemented_Between_Mutable_And_Immutable_Pens() + { + var brush = new SolidColorBrush(Colors.Red); + var target1 = new Pen( + brush: brush, + thickness: 2, + dashStyle: DashStyle.Dash, + lineCap: PenLineCap.Round, + lineJoin: PenLineJoin.Round, + miterLimit: 21); + var target2 = new ImmutablePen( + brush: brush, + thickness: 2, + dashStyle: DashStyle.Dash, + lineCap: PenLineCap.Round, + lineJoin: PenLineJoin.Round, + miterLimit: 21); + + Assert.True(Equals(target1, target2)); + } } }