starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-05-04 06:34:45 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

fix

Browse Source
This commit is contained in:
Stef Heyenrath
2024-01-30 20:22:20 +01:00
parent 237cd227d9
commit 0185b116ca
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
View File

@@ -157,7 +157,7 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
return builder return builder
.WithPortBinding(WireMockContainer.ContainerPort, true) .WithPortBinding(WireMockContainer.ContainerPort, true)
.WithCommand($"--WireMockLogger {DefaultLogger}") .WithCommand($"--WireMockLogger {DefaultLogger}")
.WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("By Stef Heyenrath")); .WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("WireMock.Net server running"));
} }
/// <inheritdoc /> /// <inheritdoc />

5
src/WireMock.Net/Logging/WireMockConsoleLogger.cs
View File

@@ -10,6 +10,9 @@ namespace WireMock.Logging;
/// <seealso cref="IWireMockLogger" /> /// <seealso cref="IWireMockLogger" />
public class WireMockConsoleLogger : IWireMockLogger public class WireMockConsoleLogger : IWireMockLogger
{ {
private const string NewlineWindows = "\r\n";
private const string NewlineUnix = "\n";
private readonly bool _removeNewLines; private readonly bool _removeNewLines;
/// <summary> /// <summary>
@@ -81,6 +84,6 @@ public class WireMockConsoleLogger : IWireMockLogger
/// <param name="value">The value to write.</param> /// <param name="value">The value to write.</param>
private void WriteLine(string value) private void WriteLine(string value)
{ {
Console.WriteLine(!_removeNewLines ? value : value.Replace(Environment.NewLine, string.Empty)); Console.WriteLine(!_removeNewLines ? value : value.Replace(NewlineWindows, string.Empty).Replace(NewlineUnix, string.Empty));
} }
} }

4
src/WireMock.Net/Settings/WireMockServerSettingsParser.cs
View File

@@ -83,12 +83,12 @@ public static class WireMockServerSettingsParser
private static void ParseLoggerSettings(WireMockServerSettings settings, IWireMockLogger? logger, SimpleSettingsParser parser) private static void ParseLoggerSettings(WireMockServerSettings settings, IWireMockLogger? logger, SimpleSettingsParser parser)
{ {
var loggerType = parser.GetStringValue("WireMockLogger"); var loggerType = parser.GetStringValue("WireMockLogger");
var replaceNewLines = parser.GetBoolValue("ReplaceNewLines"); var removeNewLines = parser.GetBoolValue("RemoveNewLines");
switch (loggerType) switch (loggerType)
{ {
case nameof(WireMockConsoleLogger): case nameof(WireMockConsoleLogger):
settings.Logger = new WireMockConsoleLogger(replaceNewLines); settings.Logger = new WireMockConsoleLogger(removeNewLines);
break; break;
case "WireMockNoNewLinesConsoleLogger": case "WireMockNoNewLinesConsoleLogger":