mirror of
https://github.com/wiremock/WireMock.Net.git
synced 2026-04-26 10:18:26 +02:00
Fix Testcontainers AddProtoDefinition (#1405)
* Fix Testcontainers AddProtoDefinition
* .
* UntilHttpRequestIsSucceeded
* WireMockContainer.ContainerPort
* System.Net/System.Net.Http
* ...
* WithWaitStrategy
* MaxHealthCheckRetries
* for
* _adminApi
* static
* ...
* testOutputHelper.WriteLine("Dumping WireMock logs:");
* Console.WriteLine(
* testOutputHelper.WriteLine("Dumping WireMock.Net mappings:");
* fix WithWaitStrategy
* [Fact]
* <PackageReference Include="ProtoBufJsonConverter" Version="0.11.0" />
* [Collection("Grpc")] / [Fact(Skip = "TODO")]
* ...
This commit is contained in:
20
src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs
Normal file
20
src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
// Copyright © WireMock.Net
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace WireMock.Net.Testcontainers.Utils;
|
||||
|
||||
internal static class CombineUtils
|
||||
{
|
||||
internal static List<T> Combine<T>(List<T> oldValue, List<T> newValue)
|
||||
{
|
||||
return oldValue.Union(newValue).ToList();
|
||||
}
|
||||
|
||||
internal static Dictionary<TKey, TValue> Combine<TKey, TValue>(Dictionary<TKey, TValue> oldValue, Dictionary<TKey, TValue> newValue)
|
||||
where TKey : notnull
|
||||
{
|
||||
return oldValue.Union(newValue).ToDictionary(item => item.Key, item => item.Value);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user