Skip to content

Commit 956f367

Browse files
authored
Forward logs to EqtTrace on netcore (#776)
1 parent 9d92f65 commit 956f367

File tree

3 files changed

+38
-9
lines changed

3 files changed

+38
-9
lines changed

src/Adapter/MSTest.CoreAdapter/MSTestExecutor.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public MSTestExecutor()
4444

4545
public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
4646
{
47+
PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("MSTestExecutor.RunTests: Running tests from testcases.");
48+
4749
ValidateArg.NotNull(frameworkHandle, "frameworkHandle");
4850
ValidateArg.NotNullOrEmpty(tests, "tests");
4951

@@ -76,6 +78,7 @@ public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrame
7678

7779
public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
7880
{
81+
PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("MSTestExecutor.RunTests: Running tests from sources.");
7982
ValidateArg.NotNull(frameworkHandle, "frameworkHandle");
8083
ValidateArg.NotNullOrEmpty(sources, "sources");
8184

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ public class AdapterTraceLogger : IAdapterTraceLogger
2020
/// <param name="args"> The args. </param>
2121
public void LogError(string format, params object[] args)
2222
{
23-
EqtTrace.ErrorIf(EqtTrace.IsErrorEnabled, format, args);
23+
if (EqtTrace.IsErrorEnabled)
24+
{
25+
EqtTrace.Error(this.PrependAdapterName(format, args));
26+
}
2427
}
2528

2629
/// <summary>
@@ -30,7 +33,10 @@ public void LogError(string format, params object[] args)
3033
/// <param name="args"> The args. </param>
3134
public void LogWarning(string format, params object[] args)
3235
{
33-
EqtTrace.WarningIf(EqtTrace.IsWarningEnabled, format, args);
36+
if (EqtTrace.IsWarningEnabled)
37+
{
38+
EqtTrace.Warning(this.PrependAdapterName(format, args));
39+
}
3440
}
3541

3642
/// <summary>
@@ -40,7 +46,15 @@ public void LogWarning(string format, params object[] args)
4046
/// <param name="args"> The args. </param>
4147
public void LogInfo(string format, params object[] args)
4248
{
43-
EqtTrace.InfoIf(EqtTrace.IsInfoEnabled, format, args);
49+
if (EqtTrace.IsInfoEnabled)
50+
{
51+
EqtTrace.Info(this.PrependAdapterName(format, args));
52+
}
53+
}
54+
55+
private string PrependAdapterName(string format, params object[] args)
56+
{
57+
return string.Format($"MSTest - {string.Format(format, args)}");
4458
}
4559
}
4660

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
55
{
66
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
7+
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
78

89
#pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName
910

@@ -17,32 +18,43 @@ public class AdapterTraceLogger : IAdapterTraceLogger
1718
/// </summary>
1819
/// <param name="format"> The format. </param>
1920
/// <param name="args"> The args. </param>
20-
/// <exception cref="System.NotImplementedException"> This is currently not implemented. </exception>
2121
public void LogError(string format, params object[] args)
2222
{
23-
// Do Nothing.
23+
if (EqtTrace.IsErrorEnabled)
24+
{
25+
EqtTrace.Error(this.PrependAdapterName(format, args));
26+
}
2427
}
2528

2629
/// <summary>
2730
/// Log a warning in a given format.
2831
/// </summary>
2932
/// <param name="format"> The format. </param>
3033
/// <param name="args"> The args. </param>
31-
/// <exception cref="System.NotImplementedException"> This is currently not implemented. </exception>
3234
public void LogWarning(string format, params object[] args)
3335
{
34-
// Do Nothing.
36+
if (EqtTrace.IsWarningEnabled)
37+
{
38+
EqtTrace.Warning(this.PrependAdapterName(format, args));
39+
}
3540
}
3641

3742
/// <summary>
3843
/// Log an information message in a given format.
3944
/// </summary>
4045
/// <param name="format"> The format. </param>
4146
/// <param name="args"> The args. </param>
42-
/// <exception cref="System.NotImplementedException"> This is currently not implemented. </exception>
4347
public void LogInfo(string format, params object[] args)
4448
{
45-
// Do Nothing.
49+
if (EqtTrace.IsInfoEnabled)
50+
{
51+
EqtTrace.Info(this.PrependAdapterName(format, args));
52+
}
53+
}
54+
55+
private string PrependAdapterName(string format, params object[] args)
56+
{
57+
return string.Format($"MSTest - {string.Format(format, args)}");
4658
}
4759
}
4860

0 commit comments

Comments
 (0)