Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -14,6 +14,7 @@ using System.Runtime.InteropServices;
using System.Text;
using System.Diagnostics;
using System.Runtime.ExceptionServices;
using System.Linq;
using NUnit.Framework;
@ -517,7 +518,10 @@ namespace MonoTests.System.Reflection.Emit
invoke (456324);
Assert.IsNotNull (ExceptionHandling_Test_Support.Caught, "#1");
Assert.AreEqual (2, ExceptionHandling_Test_Support.CaughtStackTrace.Split (new[] { Environment.NewLine }, StringSplitOptions.None).Length, "#2");
var lines = ExceptionHandling_Test_Support.CaughtStackTrace.Split (new[] { Environment.NewLine }, StringSplitOptions.None);
lines = lines.Where (l => !l.StartsWith ("[")).ToArray ();
Assert.AreEqual (2, lines.Length, "#2");
var st = new StackTrace (ExceptionHandling_Test_Support.Caught, 0, true);
@ -552,9 +556,12 @@ namespace MonoTests.System.Reflection.Emit
public static void Handler (Exception e)
{
var split = e.StackTrace.Split (new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
Assert.AreEqual (5, split.Length, "#1");
Assert.IsTrue (split [1].Contains ("---"), "#2");
var lines = e.StackTrace.Split (new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
// Ignore Metadata
lines = lines.Where (l => !l.StartsWith ("[")).ToArray ();
Assert.AreEqual (5, lines.Length, "#1");
Assert.IsTrue (lines [1].Contains ("---"), "#2");
}
}