Fix tests

OmniSharp · May 24, 2024 · acbe1c6 · acbe1c6
1 parent 1dcb349
commit acbe1c6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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<BlockStructureResponse> GetResponseAsync(TestFile testFile)
                 FileName = testFile.FileName,
             };
 
-            var requestHandler = GetRequestHandler(SharedOmniSharpTestHost);
+            BlockStructureService requestHandler = GetRequestHandler(SharedOmniSharpTestHost);
             return requestHandler.Handle(request);
         }
     }