From c709b973140c0517da4da8e155ebd4ba688bcbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 13 Jul 2020 22:33:11 +0200 Subject: [PATCH 1/2] WASM: Fix System.Diagnostics.TraceSource tests One test was using `Assembly.GetEntryAssembly()` which returns null on WebAssembly. Others are testing that the output contains the stacktrace but it is empty on WASM right now. --- .../System.Diagnostics.TraceSource/tests/TraceClassTests.cs | 5 ++--- .../tests/TraceEventCacheClassTests.cs | 2 ++ .../tests/TraceListenerClassTests.cs | 1 + .../tests/System/Environment.StackTrace.cs | 2 +- src/libraries/tests.proj | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs b/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs index 05a6891e31cfbb..38893800960638 100644 --- a/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs +++ b/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs @@ -11,8 +11,6 @@ namespace System.Diagnostics.TraceSourceTests public class TraceClassTests : IDisposable { - private readonly string TestRunnerAssemblyName = Assembly.GetEntryAssembly().GetName().Name; - void IDisposable.Dispose() { TraceTestHelper.ResetState(); @@ -339,11 +337,12 @@ public void TraceTest01() Trace.IndentLevel = 0; Trace.WriteLine("Message end."); textTL.Flush(); + var testRunnerAssemblyName = Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty; string newLine = Environment.NewLine; var expected = string.Format( "Message start." + newLine + " This message should be indented.{0} Error: 0 : This error not be indented." + newLine + " {0} Error: 0 : This error is indented" + newLine + " {0} Warning: 0 : This warning is indented" + newLine + " {0} Warning: 0 : This warning is also indented" + newLine + " {0} Information: 0 : This information in indented" + newLine + " {0} Information: 0 : This information is also indented" + newLine + "Message end." + newLine + "", - TestRunnerAssemblyName + testRunnerAssemblyName ); Assert.Equal(expected, textTL.Output); diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs b/src/libraries/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs index 6933d0323daee2..680f8b620a1201 100644 --- a/src/libraries/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs +++ b/src/libraries/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs @@ -48,6 +48,7 @@ public void TimestampTest() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/39223", TestPlatforms.Browser)] public void CallstackTest_NotEmpty() { var cache = new TraceEventCache(); @@ -55,6 +56,7 @@ public void CallstackTest_NotEmpty() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/39223", TestPlatforms.Browser)] public void CallstackTest_ContainsExpectedFrames() { var cache = new TraceEventCache(); diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/TraceListenerClassTests.cs b/src/libraries/System.Diagnostics.TraceSource/tests/TraceListenerClassTests.cs index 08668fdd732106..fbe1193514260d 100644 --- a/src/libraries/System.Diagnostics.TraceSource/tests/TraceListenerClassTests.cs +++ b/src/libraries/System.Diagnostics.TraceSource/tests/TraceListenerClassTests.cs @@ -313,6 +313,7 @@ public void WriteFooterTest(TraceOptions opts, int flagCount) } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/39223", TestPlatforms.Browser)] [MethodImpl(MethodImplOptions.NoInlining)] public void WriteFooterTest_Callstack() { diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.StackTrace.cs b/src/libraries/System.Runtime.Extensions/tests/System/Environment.StackTrace.cs index d8505dd4e11c73..4077019d701009 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/Environment.StackTrace.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/Environment.StackTrace.cs @@ -68,7 +68,7 @@ public TestClass() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/38995", TestPlatforms.Browser)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/39223", TestPlatforms.Browser)] public void StackTraceDoesNotStartWithInternalFrame() { string stackTrace = Environment.StackTrace; diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index ec074e10721d43..5567e9d3ee33b6 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -31,7 +31,6 @@ - From 280b43904583770550a4a6e1b3ed22ed380faf96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 13 Jul 2020 22:45:28 +0200 Subject: [PATCH 2/2] PR feedback Co-authored-by: Stephen Toub --- .../System.Diagnostics.TraceSource/tests/TraceClassTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs b/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs index 38893800960638..b74f30dbb3e1b7 100644 --- a/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs +++ b/src/libraries/System.Diagnostics.TraceSource/tests/TraceClassTests.cs @@ -337,7 +337,7 @@ public void TraceTest01() Trace.IndentLevel = 0; Trace.WriteLine("Message end."); textTL.Flush(); - var testRunnerAssemblyName = Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty; + string testRunnerAssemblyName = Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty; string newLine = Environment.NewLine; var expected = string.Format(