Imported Upstream version 5.12.0.220

Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-04-24 09:31:23 +00:00
parent 8bd104cef2
commit 8fc30896db
1200 changed files with 29534 additions and 26161 deletions

View File

@ -66,7 +66,7 @@ namespace MonoTests.System.Runtime.ExceptionServices
}
[Test]
[Category ("InterpreterNotWorking")]
[Category ("NotWorkingRuntimeInterpreter")]
public void Throw ()
{
Exception orig = null;
@ -86,14 +86,14 @@ namespace MonoTests.System.Runtime.ExceptionServices
Assert.Fail ("#0");
} catch (Exception e) {
var s = GetLines (e.StackTrace);
Assert.AreEqual (4, s.Length, "#1");
Assert.AreEqual (3, s.Length, "#1");
Assert.AreEqual (orig, e, "#2");
Assert.AreNotEqual (orig_stack, e.StackTrace, "#3");
}
}
[Test]
[Category ("InterpreterNotWorking")]
[Category ("NotWorkingRuntimeInterpreter")]
public void ThrowWithEmptyFrames ()
{
var edi = ExceptionDispatchInfo.Capture (new OperationCanceledException ());
@ -103,12 +103,12 @@ namespace MonoTests.System.Runtime.ExceptionServices
} catch (OperationCanceledException e) {
Assert.IsTrue (!e.StackTrace.Contains("---"));
var lines = GetLines (e.StackTrace);
Assert.AreEqual (2, lines.Length, "#1");
Assert.AreEqual (1, lines.Length, "#1");
}
}
[Test]
[Category ("InterpreterNotWorking")]
[Category ("NotWorkingRuntimeInterpreter")]
public void LastThrowWins ()
{
Exception e;
@ -134,13 +134,13 @@ namespace MonoTests.System.Runtime.ExceptionServices
edi.Throw ();
} catch (Exception ex) {
var lines = GetLines (ex.StackTrace);
Assert.AreEqual (4, lines.Length, "#1");
Assert.AreEqual (3, lines.Length, "#1");
Assert.IsTrue (lines [1].Contains ("---"), "#2");
}
}
[Test]
[Category ("InterpreterNotWorking")]
[Category ("NotWorkingRuntimeInterpreter")]
public void ThrowMultipleCaptures ()
{
Exception e;
@ -162,14 +162,14 @@ namespace MonoTests.System.Runtime.ExceptionServices
edi.Throw ();
} catch (Exception ex) {
var lines = GetLines (ex.StackTrace);
Assert.AreEqual (7, lines.Length, "#1");
Assert.AreEqual (5, lines.Length, "#1");
Assert.IsTrue (lines [1].Contains ("---"), "#2");
Assert.IsTrue (lines [4].Contains ("---"), "#3");
Assert.IsTrue (lines [3].Contains ("---"), "#3");
}
}
[Test]
[Category ("InterpreterNotWorking")]
[Category ("NotWorkingRuntimeInterpreter")]
public void StackTraceUserCopy ()
{
try {
@ -182,7 +182,7 @@ namespace MonoTests.System.Runtime.ExceptionServices
} catch (Exception ex) {
var st = new StackTrace (ex, true);
var lines = GetLines (st.ToString ());
Assert.AreEqual (4, lines.Length, "#1");
Assert.AreEqual (3, lines.Length, "#1");
Assert.IsTrue (lines [1].Contains ("---"), "#2");
}
}