Version 2.x (#1359)

* Version 2.x * Setup .NET 9 * 12 * cleanup some #if for NETSTANDARD1_3 * cleanup + fix tests for net8 * openapi * NO ConfigureAwait(false) + cleanup * . * #endif * HashSet * WireMock.Net.NUnit * HttpContext * Add WebSockets (#1423) * Add WebSockets * Add tests * fix * more tests * Add tests * ... * remove IOwin * - * tests * fluent * ok * match * . * byte[] * x * func * func * byte * trans * ... * frameworks......... * jmes * xxx * sc * using var httpClient = new HttpClient(); * usings * maxRetries * up * xunit v3 * ct * --- * ct * ct2 * T Unit * WireMock.Net.TUnitTests / 10 * t unit first * --project * no tunit * t2 * --project * --project * ci - --project * publish ./test/wiremock-coverage.xml * windows * . * log * ... * log * goed * BodyType * . * . * --scenario * ... * pact * ct * . * WireMock.Net.RestClient.AwesomeAssertions (#1427) * WireMock.Net.RestClient.AwesomeAssertions * ok * atpath * fix test * sonar fixes * ports * proxy test * FIX? * --- * await Task.Delay(100, _ct); * ? * --project * Aspire: use IDistributedApplicationEventingSubscriber (#1428) * broadcast * ok * more tsts * . * Collection * up * . * 2 * remove nfluent * <VersionPrefix>2.0.0-preview-02</VersionPrefix> * ... * . * nuget icon * . * <PackageReference Include="JmesPath.Net" Version="1.1.0" /> * x * 500 * . * fix some warnings * ws
2026-04-24 01:08:28 +02:00 · 2026-03-11 17:02:47 +01:00
parent d6e19532bc
commit a292f28dda
521 changed files with 79740 additions and 5246 deletions
--- a/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs
+++ b/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs
@@ -1,12 +1,6 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using FluentAssertions;
 using WireMock.Util;
-using Xunit;

 namespace WireMock.Net.Tests.Grpc;

@@ -18,12 +12,13 @@ public class ProtoDefinitionHelperTests
    public async Task FromDirectory_Greet_ShouldReturnModifiedProtoFiles()
    {
        // Arrange
+        var cancellationToken = TestContext.Current.CancellationToken;
        var directory = Path.Combine(Directory.GetCurrentDirectory(), "Grpc", "Test");
        var expectedFilename = "SubFolder/request.proto";
        var expectedComment = $"// {expectedFilename}";

        // Act
-        var protoDefinitionData = await ProtoDefinitionDataHelper.FromDirectory(directory);
+        var protoDefinitionData = await ProtoDefinitionDataHelper.FromDirectory(directory, cancellationToken);
        var protoDefinitions = protoDefinitionData.ToList("greet");

        // Assert
@@ -39,7 +34,7 @@ public class ProtoDefinitionHelperTests
        resolver.Exists("x").Should().BeFalse();

        // Act + Assert
-        var text = await resolver.OpenText(expectedFilename).ReadToEndAsync();
+        var text = resolver.OpenText(expectedFilename).ReadToEnd();
        text.Should().StartWith(expectedComment);
        System.Action action = () => resolver.OpenText("x");
        action.Should().Throw<FileNotFoundException>();
@@ -52,7 +47,7 @@ public class ProtoDefinitionHelperTests
        var directory = Path.Combine(Directory.GetCurrentDirectory(), "Grpc", "ot");

        // Act
-        var protoDefinitionData = await ProtoDefinitionDataHelper.FromDirectory(directory);
+        var protoDefinitionData = await ProtoDefinitionDataHelper.FromDirectory(directory, TestContext.Current.CancellationToken);
        var protoDefinitions = protoDefinitionData.ToList("trace_service");

        // Assert
@@ -65,11 +60,11 @@ public class ProtoDefinitionHelperTests
            {
                rejected_spans = 1,
                error_message = "abc"
-            }
+            },
+            cancellationToken: TestContext.Current.CancellationToken
        );

        // Assert
        Convert.ToBase64String(responseBytes).Should().Be("AAAAAAcIARIDYWJj");
    }
-}
-#endif
+}