Fix ProtoBuf mapping.json (#1236)

* Fix ProtoBuf Mappings

* [Fact(Skip = "#1233")]

* fix?

* PortUtils

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs

@@ -37,7 +37,32 @@ message HelloReply {
     public async Task IWireMockAdminApi_GetMappingsAsync_WithBodyAsProtoBuf_ShouldReturnCorrectMappingModels()
     {
         // Arrange
-        using var server = WireMockServer.StartWithAdminInterface();
+        using var server = Given_WithBodyAsProtoBuf_AddedToServer();
+
+        // Act
+        var api = RestClient.For<IWireMockAdminApi>(server.Url);
+        var getMappingsResult = await api.GetMappingsAsync().ConfigureAwait(false);
+
+        await Verifier.Verify(getMappingsResult, VerifySettings);
+    }
+
+    [Fact]
+    public async Task HttpClient_GetMappingsAsync_WithBodyAsProtoBuf_ShouldReturnCorrectMappingModels()
+    {
+        // Arrange
+        using var server = Given_WithBodyAsProtoBuf_AddedToServer();
+
+        // Act
+        var client = server.CreateClient();
+        var getMappingsResult = await client.GetStringAsync("/__admin/mappings").ConfigureAwait(false);
+
+        await Verifier.VerifyJson(getMappingsResult, VerifySettings);
+    }
+
+    public WireMockServer Given_WithBodyAsProtoBuf_AddedToServer()
+    {
+        // Arrange
+        var server = WireMockServer.StartWithAdminInterface();
 
         var protoBufJsonMatcher = new JsonPartialWildcardMatcher(new { name = "*" });
 
@@ -122,13 +147,7 @@ message HelloReply {
                 .WithTransformer()
             );
 
-        // Act
-        var api = RestClient.For<IWireMockAdminApi>(server.Url);
-        var getMappingsResult = await api.GetMappingsAsync().ConfigureAwait(false);
-
-        await Verifier.Verify(getMappingsResult, VerifySettings);
-
-        server.Stop();
+        return server;
     }
 }
 #endif

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.HttpClient_GetMappingsAsync_WithBodyAsProtoBuf_ShouldReturnCorrectMappingModels.verified.txt

@@ -0,0 +1,235 @@
+[
+  {
+    Guid: Guid_1,
+    UpdatedAt: DateTimeOffset_1,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /grpc/greet.Greeter/SayHello,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        POST
+      ],
+      Body: {
+        Matcher: {
+          Name: ProtoBufMatcher,
+          Pattern:
+syntax = "proto3";
+
+package greet;
+
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply);
+}
+
+message HelloRequest {
+  string name = 1;
+}
+
+message HelloReply {
+  string message = 1;
+}
+,
+          ContentMatcher: {
+            Name: JsonPartialWildcardMatcher,
+            Pattern: {
+              name: *
+            },
+            IgnoreCase: false,
+            Regex: false
+          },
+          ProtoBufMessageType: greet.HelloRequest
+        }
+      }
+    },
+    Response: {
+      BodyAsJson: {
+        message: hello {{request.BodyAsJson.name}}
+      },
+      UseTransformer: true,
+      TransformerType: Handlebars,
+      TransformerReplaceNodeOptions: EvaluateAndTryToConvert,
+      Headers: {
+        Content-Type: application/grpc
+      },
+      TrailingHeaders: {
+        grpc-status: 0
+      },
+      ProtoDefinition:
+syntax = "proto3";
+
+package greet;
+
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply);
+}
+
+message HelloRequest {
+  string name = 1;
+}
+
+message HelloReply {
+  string message = 1;
+}
+,
+      ProtoBufMessageType: greet.HelloReply
+    }
+  },
+  {
+    Guid: Guid_2,
+    UpdatedAt: DateTimeOffset_2,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /grpc2/greet.Greeter/SayHello,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        POST
+      ],
+      Body: {
+        Matcher: {
+          Name: ProtoBufMatcher,
+          ContentMatcher: {
+            Name: JsonPartialWildcardMatcher,
+            Pattern: {
+              name: *
+            },
+            IgnoreCase: false,
+            Regex: false
+          },
+          ProtoBufMessageType: greet.HelloRequest
+        }
+      }
+    },
+    Response: {
+      BodyAsJson: {
+        message: hello {{request.BodyAsJson.name}}
+      },
+      UseTransformer: true,
+      TransformerType: Handlebars,
+      TransformerReplaceNodeOptions: EvaluateAndTryToConvert,
+      Headers: {
+        Content-Type: application/grpc
+      },
+      TrailingHeaders: {
+        grpc-status: 0
+      },
+      ProtoBufMessageType: greet.HelloReply
+    },
+    ProtoDefinition:
+syntax = "proto3";
+
+package greet;
+
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply);
+}
+
+message HelloRequest {
+  string name = 1;
+}
+
+message HelloReply {
+  string message = 1;
+}
+
+  },
+  {
+    Guid: Guid_3,
+    UpdatedAt: DateTimeOffset_3,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /grpc3/greet.Greeter/SayHello,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        POST
+      ],
+      Body: {
+        Matcher: {
+          Name: ProtoBufMatcher,
+          ContentMatcher: {
+            Name: JsonPartialWildcardMatcher,
+            Pattern: {
+              name: *
+            },
+            IgnoreCase: false,
+            Regex: false
+          },
+          ProtoBufMessageType: greet.HelloRequest
+        }
+      }
+    },
+    Response: {
+      BodyAsJson: {
+        message: hello {{request.BodyAsJson.name}}
+      },
+      UseTransformer: true,
+      TransformerType: Handlebars,
+      TransformerReplaceNodeOptions: EvaluateAndTryToConvert,
+      Headers: {
+        Content-Type: application/grpc
+      },
+      TrailingHeaders: {
+        grpc-status: 0
+      },
+      ProtoBufMessageType: greet.HelloReply
+    },
+    ProtoDefinition: my-greeter
+  },
+  {
+    Guid: Guid_4,
+    UpdatedAt: DateTimeOffset_4,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /grpc4/greet.Greeter/SayHello,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        POST
+      ],
+      Body: {
+        Matcher: {
+          Name: ProtoBufMatcher,
+          ProtoBufMessageType: greet.HelloRequest
+        }
+      }
+    },
+    Response: {
+      BodyAsJson: {
+        message: hello {{request.BodyAsJson.name}}
+      },
+      UseTransformer: true,
+      TransformerType: Handlebars,
+      TransformerReplaceNodeOptions: EvaluateAndTryToConvert,
+      Headers: {
+        Content-Type: application/grpc
+      },
+      TrailingHeaders: {
+        grpc-status: 0
+      },
+      ProtoBufMessageType: greet.HelloReply
+    },
+    ProtoDefinition: my-greeter
+  }
+]

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs

@@ -0,0 +1,172 @@
+// Copyright © WireMock.Net
+
+#if !(NET452 || NET461 || NETCOREAPP3_1)
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using NFluent;
+using RestEase;
+using WireMock.Admin.Mappings;
+using WireMock.Client;
+using WireMock.Constants;
+using WireMock.Models;
+using WireMock.Server;
+using Xunit;
+
+namespace WireMock.Net.Tests.AdminApi;
+
+public partial class WireMockAdminApiTests
+{
+    public static string RemoveLineContainingUpdatedAt(string text)
+    {
+        var lines = text.Split([Environment.NewLine], StringSplitOptions.None);
+        var filteredLines = lines.Where(line => !line.Contains("\"UpdatedAt\": "));
+        return string.Join(Environment.NewLine, filteredLines);
+    }
+
+    [Theory]
+    [InlineData("protobuf-mapping-1.json", "351f0240-bba0-4bcb-93c6-1feba0fe0001")]
+    [InlineData("protobuf-mapping-2.json", "351f0240-bba0-4bcb-93c6-1feba0fe0002")]
+    [InlineData("protobuf-mapping-3.json", "351f0240-bba0-4bcb-93c6-1feba0fe0003")]
+    [InlineData("protobuf-mapping-4.json", "351f0240-bba0-4bcb-93c6-1feba0fe0004")]
+    public async Task HttpClient_PostMappingsAsync_ForProtoBufMapping(string mappingFile, string guid)
+    {
+        // Arrange
+        var mappingsJson = ReadMappingFile(mappingFile);
+
+        using var server = WireMockServer.StartWithAdminInterface();
+        var httpClient = server.CreateClient();
+
+        // Act
+        var result = await httpClient.PostAsync("/__admin/mappings", new StringContent(mappingsJson, Encoding.UTF8, WireMockConstants.ContentTypeJson));
+        result.EnsureSuccessStatusCode();
+
+        // Assert
+        var mapping = await httpClient.GetStringAsync($"/__admin/mappings/{guid}");
+        mapping = RemoveLineContainingUpdatedAt(mapping);
+        mapping.Should().Be(mappingsJson);
+    }
+
+    [Fact]
+    public async Task IWireMockAdminApi_PostMappingsAsync()
+    {
+        // Arrange
+        var server = WireMockServer.StartWithAdminInterface();
+        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
+
+        // Act
+        var model1 = new MappingModel
+        {
+            Request = new RequestModel { Path = "/1" },
+            Response = new ResponseModel { Body = "txt 1" },
+            Title = "test 1"
+        };
+        var model2 = new MappingModel
+        {
+            Request = new RequestModel { Path = "/2" },
+            Response = new ResponseModel { Body = "txt 2" },
+            Title = "test 2"
+        };
+        var result = await api.PostMappingsAsync(new[] { model1, model2 }).ConfigureAwait(false);
+
+        // Assert
+        Check.That(result).IsNotNull();
+        Check.That(result.Status).IsNotNull();
+        Check.That(result.Guid).IsNull();
+        Check.That(server.Mappings.Where(m => !m.IsAdminInterface)).HasSize(2);
+
+        server.Stop();
+    }
+
+    [Theory]
+    [InlineData(null, null)]
+    [InlineData(-1, -1)]
+    [InlineData(0, 0)]
+    [InlineData(200, 200)]
+    [InlineData("200", "200")]
+    public async Task IWireMockAdminApi_PostMappingAsync_WithStatusCode(object statusCode, object expectedStatusCode)
+    {
+        // Arrange
+        var server = WireMockServer.StartWithAdminInterface();
+        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
+
+        // Act
+        var model = new MappingModel
+        {
+            Request = new RequestModel { Path = "/1" },
+            Response = new ResponseModel { Body = "txt", StatusCode = statusCode },
+            Priority = 500,
+            Title = "test"
+        };
+        var result = await api.PostMappingAsync(model).ConfigureAwait(false);
+
+        // Assert
+        Check.That(result).IsNotNull();
+        Check.That(result.Status).IsNotNull();
+        Check.That(result.Guid).IsNotNull();
+
+        var mapping = server.Mappings.Single(m => m.Priority == 500);
+        Check.That(mapping).IsNotNull();
+        Check.That(mapping.Title).Equals("test");
+
+        var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")).ConfigureAwait(false);
+        Check.That(response.Message.StatusCode).Equals(expectedStatusCode);
+
+        server.Stop();
+    }
+
+    [Fact]
+    public async Task IWireMockAdminApi_PostMappingsAsync_WithDuplicateGuids_Should_Return_400()
+    {
+        // Arrange
+        var guid = Guid.Parse("1b731398-4a5b-457f-a6e3-d65e541c428f");
+        var server = WireMockServer.StartWithAdminInterface();
+        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
+
+        // Act
+        var model1WithGuid = new MappingModel
+        {
+            Guid = guid,
+            Request = new RequestModel { Path = "/1g" },
+            Response = new ResponseModel { Body = "txt 1g" },
+            Title = "test 1g"
+        };
+        var model2WithGuid = new MappingModel
+        {
+            Guid = guid,
+            Request = new RequestModel { Path = "/2g" },
+            Response = new ResponseModel { Body = "txt 2g" },
+            Title = "test 2g"
+        };
+        var model1 = new MappingModel
+        {
+            Request = new RequestModel { Path = "/1" },
+            Response = new ResponseModel { Body = "txt 1" },
+            Title = "test 1"
+        };
+        var model2 = new MappingModel
+        {
+            Request = new RequestModel { Path = "/2" },
+            Response = new ResponseModel { Body = "txt 2" },
+            Title = "test 2"
+        };
+
+        var models = new[]
+        {
+                model1WithGuid,
+                model2WithGuid,
+                model1,
+                model2
+            };
+
+        var sutMethod = async () => await api.PostMappingsAsync(models);
+        var exceptionAssertions = await sutMethod.Should().ThrowAsync<ApiException>();
+        exceptionAssertions.Which.Content.Should().Be(@"{""Status"":""The following Guids are duplicate : '1b731398-4a5b-457f-a6e3-d65e541c428f' (Parameter 'mappingModels')""}");
+
+        server.Stop();
+    }
+}
+#endif

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs

@@ -184,124 +184,7 @@ public partial class WireMockAdminApiTests
         server.Stop();
     }
 
-    [Theory]
-    [InlineData(null, null)]
-    [InlineData(-1, -1)]
-    [InlineData(0, 0)]
-    [InlineData(200, 200)]
-    [InlineData("200", "200")]
-    public async Task IWireMockAdminApi_PostMappingAsync_WithStatusCode(object statusCode, object expectedStatusCode)
-    {
-        // Arrange
-        var server = WireMockServer.StartWithAdminInterface();
-        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
-
-        // Act
-        var model = new MappingModel
-        {
-            Request = new RequestModel { Path = "/1" },
-            Response = new ResponseModel { Body = "txt", StatusCode = statusCode },
-            Priority = 500,
-            Title = "test"
-        };
-        var result = await api.PostMappingAsync(model).ConfigureAwait(false);
-
-        // Assert
-        Check.That(result).IsNotNull();
-        Check.That(result.Status).IsNotNull();
-        Check.That(result.Guid).IsNotNull();
-
-        var mapping = server.Mappings.Single(m => m.Priority == 500);
-        Check.That(mapping).IsNotNull();
-        Check.That(mapping.Title).Equals("test");
-
-        var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")).ConfigureAwait(false);
-        Check.That(response.Message.StatusCode).Equals(expectedStatusCode);
-
-        server.Stop();
-    }
-
-    [Fact]
-    public async Task IWireMockAdminApi_PostMappingsAsync()
-    {
-        // Arrange
-        var server = WireMockServer.StartWithAdminInterface();
-        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
-
-        // Act
-        var model1 = new MappingModel
-        {
-            Request = new RequestModel { Path = "/1" },
-            Response = new ResponseModel { Body = "txt 1" },
-            Title = "test 1"
-        };
-        var model2 = new MappingModel
-        {
-            Request = new RequestModel { Path = "/2" },
-            Response = new ResponseModel { Body = "txt 2" },
-            Title = "test 2"
-        };
-        var result = await api.PostMappingsAsync(new[] { model1, model2 }).ConfigureAwait(false);
-
-        // Assert
-        Check.That(result).IsNotNull();
-        Check.That(result.Status).IsNotNull();
-        Check.That(result.Guid).IsNull();
-        Check.That(server.Mappings.Where(m => !m.IsAdminInterface)).HasSize(2);
-
-        server.Stop();
-    }
-
-    [Fact]
-    public async Task IWireMockAdminApi_PostMappingsAsync_WithDuplicateGuids_Should_Return_400()
-    {
-        // Arrange
-        var guid = Guid.Parse("1b731398-4a5b-457f-a6e3-d65e541c428f");
-        var server = WireMockServer.StartWithAdminInterface();
-        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
-
-        // Act
-        var model1WithGuid = new MappingModel
-        {
-            Guid = guid,
-            Request = new RequestModel { Path = "/1g" },
-            Response = new ResponseModel { Body = "txt 1g" },
-            Title = "test 1g"
-        };
-        var model2WithGuid = new MappingModel
-        {
-            Guid = guid,
-            Request = new RequestModel { Path = "/2g" },
-            Response = new ResponseModel { Body = "txt 2g" },
-            Title = "test 2g"
-        };
-        var model1 = new MappingModel
-        {
-            Request = new RequestModel { Path = "/1" },
-            Response = new ResponseModel { Body = "txt 1" },
-            Title = "test 1"
-        };
-        var model2 = new MappingModel
-        {
-            Request = new RequestModel { Path = "/2" },
-            Response = new ResponseModel { Body = "txt 2" },
-            Title = "test 2"
-        };
-
-        var models = new[]
-        {
-                model1WithGuid,
-                model2WithGuid,
-                model1,
-                model2
-            };
-
-        var sutMethod = async () => await api.PostMappingsAsync(models);
-        var exceptionAssertions = await sutMethod.Should().ThrowAsync<ApiException>();
-        exceptionAssertions.Which.Content.Should().Be(@"{""Status"":""The following Guids are duplicate : '1b731398-4a5b-457f-a6e3-d65e541c428f' (Parameter 'mappingModels')""}");
-
-        server.Stop();
-    }
+    
 
     [Fact]
     public async Task IWireMockAdminApi_FindRequestsAsync()
@@ -1140,5 +1023,10 @@ text
         // Assert
         status.Status.Should().Be("Static Mappings reloaded");
     }
+
+    private static string ReadMappingFile(string filename)
+    {
+        return File.ReadAllText(Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings", filename));
+    }
 }
 #endif