Stop ExceptionTests.cs from spamming console output (dotnet#29237)

The VerifyCallStack test helper method is doing a Console.WriteLine regardless of whether anything failed. I'm moving it to only happen if something actually goes wrong.
MaximLipnin · Apr 20, 2018 · 23096f8 · 23096f8
1 parent e3f4a92
commit 23096f8
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/src/System.Runtime/tests/System/ExceptionTests.cs b/src/System.Runtime/tests/System/ExceptionTests.cs
@@ -132,20 +132,27 @@ private static void VerifyCallStack(
             (string CallerMemberName, string SourceFilePath, int SourceLineNumber) expectedStackFrame,
             string reportedCallStack, int skipFrames)
         {
-            Console.WriteLine("* ExceptionTests - reported call stack:\n{0}", reportedCallStack);
-            const string frameParserRegex = @"\s+at\s.+\.(?<memberName>[^(.]+)\([^)]*\)\sin\s(?<filePath>.*)\:line\s(?<lineNumber>[\d]+)";
-
-            using (var sr = new StringReader(reportedCallStack))
+            try
+            {
+                const string frameParserRegex = @"\s+at\s.+\.(?<memberName>[^(.]+)\([^)]*\)\sin\s(?<filePath>.*)\:line\s(?<lineNumber>[\d]+)";
+
+                using (var sr = new StringReader(reportedCallStack))
+                {
+                    for (int i = 0; i < skipFrames; i++)
+                        sr.ReadLine();
+                    string frame = sr.ReadLine();
+                    Assert.NotNull(frame);
+                    var match = Regex.Match(frame, frameParserRegex);
+                    Assert.True(match.Success);
+                    Assert.Equal(expectedStackFrame.CallerMemberName, match.Groups["memberName"].Value);
+                    Assert.Equal(expectedStackFrame.SourceFilePath, match.Groups["filePath"].Value);
+                    Assert.Equal(expectedStackFrame.SourceLineNumber, Convert.ToInt32(match.Groups["lineNumber"].Value));
+                }
+            }
+            catch
             {
-                for (int i = 0; i < skipFrames; i++)
-                    sr.ReadLine();
-                string frame = sr.ReadLine();
-                Assert.NotNull(frame);
-                var match = Regex.Match(frame, frameParserRegex);
-                Assert.True(match.Success);
-                Assert.Equal(expectedStackFrame.CallerMemberName, match.Groups["memberName"].Value);
-                Assert.Equal(expectedStackFrame.SourceFilePath, match.Groups["filePath"].Value);
-                Assert.Equal(expectedStackFrame.SourceLineNumber, Convert.ToInt32(match.Groups["lineNumber"].Value));
+                Console.WriteLine("* ExceptionTests - reported call stack:\n{0}", reportedCallStack);
+                throw;
             }
         }