Fix System.Diagnostics.StackTrace tests

sepidehkh · sepidehkh · commit feaa38de15f4 · 2017-06-29T10:20:36.000-07:00
diff --git a/src/System.Diagnostics.StackTrace/tests/StackFrameTests.cs b/src/System.Diagnostics.StackTrace/tests/StackFrameTests.cs
@@ -143,13 +143,7 @@ private class ClassWithConstructor
 
         private static void VerifyStackFrame(StackFrame stackFrame, bool hasFileInfo, int skipFrames, MethodInfo expectedMethod, bool isCurrentFrame = false)
         {
-            // It appears that .NET Core on Windows strips this metadata in Debug mode.
-#if DEBUG
-            bool hasNoMetadata = PlatformDetection.IsWindows && !PlatformDetection.IsFullFramework;
-#else
-            bool hasNoMetadata = false;
-#endif
-            if (hasNoMetadata || !hasFileInfo)
+            if (!hasFileInfo)
             {
                 Assert.Null(stackFrame.GetFileName());
                 Assert.Equal(0, stackFrame.GetFileLineNumber());
diff --git a/src/System.Diagnostics.StackTrace/tests/StackTraceTests.cs b/src/System.Diagnostics.StackTrace/tests/StackTraceTests.cs
@@ -364,13 +364,7 @@ private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo)
             {
                 StackFrame stackFrame = stackFrames[i];
 
-                // It appears that .NET Core on Windows strips this metadata.
-#if DEBUG
-                bool hasNoMetadata = PlatformDetection.IsWindows && !PlatformDetection.IsFullFramework;
-#else
-                bool hasNoMetadata = false;
-#endif
-                if (hasNoMetadata || !hasFileInfo)
+                if (!hasFileInfo)
                 {
                     Assert.Null(stackFrame.GetFileName());
                     Assert.Equal(0, stackFrame.GetFileLineNumber());

Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,7 @@ private class ClassWithConstructor`
`143`	`143`
`144`	`144`	`private static void VerifyStackFrame(StackFrame stackFrame, bool hasFileInfo, int skipFrames, MethodInfo expectedMethod, bool isCurrentFrame = false)`
`145`	`145`	`{`
`146`		`- // It appears that .NET Core on Windows strips this metadata in Debug mode.`
`147`		`-#if DEBUG`
`148`		`- bool hasNoMetadata = PlatformDetection.IsWindows && !PlatformDetection.IsFullFramework;`
`149`		`-#else`
`150`		`- bool hasNoMetadata = false;`
`151`		`-#endif`
`152`		`- if (hasNoMetadata \|\| !hasFileInfo)`
	`146`	`+ if (!hasFileInfo)`
`153`	`147`	`{`
`154`	`148`	`Assert.Null(stackFrame.GetFileName());`
`155`	`149`	`Assert.Equal(0, stackFrame.GetFileLineNumber());`
Original file line number	Diff line number	Diff line change
`@@ -364,13 +364,7 @@ private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo)`
`364`	`364`	`{`
`365`	`365`	`StackFrame stackFrame = stackFrames[i];`
`366`	`366`
`367`		`- // It appears that .NET Core on Windows strips this metadata.`
`368`		`-#if DEBUG`
`369`		`- bool hasNoMetadata = PlatformDetection.IsWindows && !PlatformDetection.IsFullFramework;`
`370`		`-#else`
`371`		`- bool hasNoMetadata = false;`
`372`		`-#endif`
`373`		`- if (hasNoMetadata \|\| !hasFileInfo)`
	`367`	`+ if (!hasFileInfo)`
`374`	`368`	`{`
`375`	`369`	`Assert.Null(stackFrame.GetFileName());`
`376`	`370`	`Assert.Equal(0, stackFrame.GetFileLineNumber());`