From b8c4c0e873d60da9925245ac10f56659fa02b8fb Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 24 Jul 2019 16:23:07 +0200 Subject: [PATCH] Fix failing tests. --- .../Media/Immutable/ImmutableDashStyle.cs | 2 +- .../Media/PenTests.cs | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs index dbd681931c..e9a52fe6ed 100644 --- a/src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs +++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs @@ -28,7 +28,7 @@ namespace Avalonia.Media.Immutable public double Offset { get; } /// - public override bool Equals(object obj) => Equals(this, obj as IDashStyle); + public override bool Equals(object obj) => Equals(obj as IDashStyle); /// public bool Equals(IDashStyle other) diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs index d5601c7497..418ac7576b 100644 --- a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs @@ -45,20 +45,20 @@ namespace Avalonia.Visuals.UnitTests.Media } [Fact] - public void Equality_Is_Implemented_Between_Mutable_And_Immutable_Pens() + public void Equality_Is_Implemented_Between_Immutable_And_Mmutable_Pens() { var brush = new SolidColorBrush(Colors.Red); - var target1 = new Pen( + var target1 = new ImmutablePen( brush: brush, thickness: 2, - dashStyle: DashStyle.Dash, + dashStyle: (ImmutableDashStyle)DashStyle.Dash, lineCap: PenLineCap.Round, lineJoin: PenLineJoin.Round, miterLimit: 21); - var target2 = new ImmutablePen( + var target2 = new Pen( brush: brush, thickness: 2, - dashStyle: (ImmutableDashStyle)DashStyle.Dash, + dashStyle: DashStyle.Dash, lineCap: PenLineCap.Round, lineJoin: PenLineJoin.Round, miterLimit: 21); @@ -70,17 +70,17 @@ namespace Avalonia.Visuals.UnitTests.Media public void Equality_Is_Implemented_Between_Mutable_And_Immutable_DashStyles() { var brush = new SolidColorBrush(Colors.Red); - var target1 = new Pen( + var target1 = new ImmutablePen( brush: brush, thickness: 2, - dashStyle: new DashStyle(new[] { 0.1, 0.2 }, 5), + dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5), lineCap: PenLineCap.Round, lineJoin: PenLineJoin.Round, miterLimit: 21); - var target2 = new ImmutablePen( + var target2 = new Pen( brush: brush, thickness: 2, - dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5), + dashStyle: new DashStyle(new[] { 0.1, 0.2 }, 5), lineCap: PenLineCap.Round, lineJoin: PenLineJoin.Round, miterLimit: 21);