Skip to content

Commit 8ac9547

Browse files
authored
Prepend MSTest to log messages, without formatting (#785)
There are some strings that are not correctly formatted, and the previous code was not taking that into account, but because it worked before, then EqtTrace must be protecting against that. So I just prepend MSTest, and let EqtTrace format the result
1 parent 764842c commit 8ac9547

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/Adapter/PlatformServices.Desktop/Services/DesktopAdapterTraceLogger.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void LogError(string format, params object[] args)
2222
{
2323
if (EqtTrace.IsErrorEnabled)
2424
{
25-
EqtTrace.Error(this.PrependAdapterName(format, args));
25+
EqtTrace.Error(this.PrependAdapterName(format), args);
2626
}
2727
}
2828

@@ -35,7 +35,7 @@ public void LogWarning(string format, params object[] args)
3535
{
3636
if (EqtTrace.IsWarningEnabled)
3737
{
38-
EqtTrace.Warning(this.PrependAdapterName(format, args));
38+
EqtTrace.Warning(this.PrependAdapterName(format), args);
3939
}
4040
}
4141

@@ -48,13 +48,13 @@ public void LogInfo(string format, params object[] args)
4848
{
4949
if (EqtTrace.IsInfoEnabled)
5050
{
51-
EqtTrace.Info(this.PrependAdapterName(format, args));
51+
EqtTrace.Info(this.PrependAdapterName(format), args);
5252
}
5353
}
5454

55-
private string PrependAdapterName(string format, params object[] args)
55+
private string PrependAdapterName(string format)
5656
{
57-
return string.Format($"MSTest - {string.Format(format, args)}");
57+
return $"MSTest - {format}";
5858
}
5959
}
6060

src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TraceLogger.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void LogError(string format, params object[] args)
2222
{
2323
if (EqtTrace.IsErrorEnabled)
2424
{
25-
EqtTrace.Error(this.PrependAdapterName(format, args));
25+
EqtTrace.Error(this.PrependAdapterName(format), args);
2626
}
2727
}
2828

@@ -35,7 +35,7 @@ public void LogWarning(string format, params object[] args)
3535
{
3636
if (EqtTrace.IsWarningEnabled)
3737
{
38-
EqtTrace.Warning(this.PrependAdapterName(format, args));
38+
EqtTrace.Warning(this.PrependAdapterName(format), args);
3939
}
4040
}
4141

@@ -48,13 +48,13 @@ public void LogInfo(string format, params object[] args)
4848
{
4949
if (EqtTrace.IsInfoEnabled)
5050
{
51-
EqtTrace.Info(this.PrependAdapterName(format, args));
51+
EqtTrace.Info(this.PrependAdapterName(format), args);
5252
}
5353
}
5454

55-
private string PrependAdapterName(string format, params object[] args)
55+
private string PrependAdapterName(string format)
5656
{
57-
return string.Format($"MSTest - {string.Format(format, args)}");
57+
return $"MSTest - {format}";
5858
}
5959
}
6060

0 commit comments

Comments
 (0)