From acbe1c62697ada5c2e4523c4cf122babcbc12bf4 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 24 May 2024 13:58:28 -0700 Subject: [PATCH] Fix tests --- tests/OmniSharp.Cake.Tests/BlockStructureFacts.cs | 7 +++++-- .../OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/OmniSharp.Cake.Tests/BlockStructureFacts.cs b/tests/OmniSharp.Cake.Tests/BlockStructureFacts.cs index a170950055..e6cd409202 100644 --- a/tests/OmniSharp.Cake.Tests/BlockStructureFacts.cs +++ b/tests/OmniSharp.Cake.Tests/BlockStructureFacts.cs @@ -4,6 +4,7 @@ using OmniSharp.Cake.Services.RequestHandlers.Structure; using OmniSharp.Models.UpdateBuffer; using OmniSharp.Models.V2; +using Roslyn.Test.Utilities; using TestUtility; using Xunit; using Xunit.Abstractions; @@ -38,9 +39,11 @@ void M()[| .ToArray(); var expected = testFile.Content.GetSpans() - .Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()).ToArray(); + .Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()) + .Reverse() + .ToArray(); - Assert.Equal(expected, lineSpans); + AssertEx.Equal(expected, lineSpans); } private async Task<(BlockStructureResponse, TestFile)> GetResponseAsync(string code) diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs index 2579e0baba..da551751fd 100644 --- a/tests/OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs +++ b/tests/OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using OmniSharp.Models.V2; using OmniSharp.Roslyn.CSharp.Services.Structure; +using Roslyn.Test.Utilities; using TestUtility; using Xunit; using Xunit.Abstractions; @@ -37,9 +38,11 @@ void M()[| .ToArray(); var expected = testFile.Content.GetSpans() - .Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()).ToArray(); + .Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()) + .Reverse() + .ToArray(); - Assert.Equal(expected, lineSpans); + AssertEx.Equal(expected, lineSpans); } [Fact] @@ -89,7 +92,7 @@ private Task GetResponseAsync(TestFile testFile) FileName = testFile.FileName, }; - var requestHandler = GetRequestHandler(SharedOmniSharpTestHost); + BlockStructureService requestHandler = GetRequestHandler(SharedOmniSharpTestHost); return requestHandler.Handle(request); } }