Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -310,9 +310,6 @@ namespace MonoTests.System.Diagnostics
/// Tests whether getting file line number works.
/// </summary>
[Test]
#if ONLY_1_1
[Category ("NotDotNet")] // .NET 1.1 is off by one
#endif
[Category ("LLVMNotWorking")]
public void TestGetFileLineNumber ()
{
@@ -332,9 +329,6 @@ namespace MonoTests.System.Diagnostics
/// Tests whether getting file column number works.
/// </summary>
[Test]
#if ONLY_1_1
[Category ("NotDotNet")] // .NET 1.1 is off by one
#endif
[Category ("NotWorking")] // bug #45730 - Column numbers always zero
public void TestGetFileColumnNumber ()
{

View File

@@ -58,22 +58,15 @@ namespace MonoCasTests.System.Diagnostics {
Assert.IsNotNull (st.GetFrame (0), "GetFrame");
else
Assert.IsNull (st.GetFrame (0), "GetFrame");
#if NET_2_0
if (st.FrameCount > 0)
Assert.IsNotNull (st.GetFrames (), "GetFrames");
else
Assert.IsNull (st.GetFrames (), "GetFrames");
#endif
Assert.IsNotNull (st.ToString (), "ToString");
}
[Test]
#if NET_2_0
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#else
[ReflectionPermission (SecurityAction.Deny, TypeInformation = true)]
[ExpectedException (typeof (SecurityException))]
#endif
public void StackTrace_DefaultConstructor ()
{
StackTrace st = new StackTrace ();
@@ -81,12 +74,7 @@ namespace MonoCasTests.System.Diagnostics {
}
[Test]
#if NET_2_0
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#else
[ReflectionPermission (SecurityAction.Deny, TypeInformation = true)]
[ExpectedException (typeof (SecurityException))]
#endif
public void StackTrace_BoolConstructor ()
{
StackTrace st = new StackTrace (true);
@@ -94,12 +82,7 @@ namespace MonoCasTests.System.Diagnostics {
}
[Test]
#if NET_2_0
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#else
[ReflectionPermission (SecurityAction.Deny, TypeInformation = true)]
[ExpectedException (typeof (SecurityException))]
#endif
public void StackTrace_IntConstructor ()
{
StackTrace st = new StackTrace (1);
@@ -107,12 +90,7 @@ namespace MonoCasTests.System.Diagnostics {
}
[Test]
#if NET_2_0
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#else
[ReflectionPermission (SecurityAction.Deny, TypeInformation = true)]
[ExpectedException (typeof (SecurityException))]
#endif
public void StackTrace_IntBoolConstructor ()
{
StackTrace st = new StackTrace (1, true);
@@ -152,12 +130,7 @@ namespace MonoCasTests.System.Diagnostics {
}
[Test]
#if NET_2_0
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#else
[ReflectionPermission (SecurityAction.Deny, TypeInformation = true)]
[ExpectedException (typeof (SecurityException))]
#endif
public void StackTrace_StackFrameConstructor ()
{
StackTrace st = new StackTrace (new StackFrame ());
@@ -165,12 +138,7 @@ namespace MonoCasTests.System.Diagnostics {
}
[Test]
#if NET_2_0
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#else
[ReflectionPermission (SecurityAction.Deny, TypeInformation = true)]
[ExpectedException (typeof (SecurityException))]
#endif
[Category ("NotWorking")]
public void StackTrace_ThreadBoolConstructor ()
{

View File

@@ -133,10 +133,6 @@ namespace MonoTests.System.Diagnostics {
}
[Test]
#if !NET_2_0
// on MS .NET 1.x, ThreadState after Start() is Unstarted
[Category ("NotDotNet")]
#endif
[ExpectedException (typeof (ThreadStateException))]
[Ignore ("Not supported in Mono")]
public void StackTrace_Thread_NotSuspended ()
@@ -179,7 +175,6 @@ namespace MonoTests.System.Diagnostics {
{
Assert.AreEqual (frame, trace.GetFrame (0), "0");
}
#if NET_2_0
[Test]
public void GetFrames ()
{
@@ -190,7 +185,6 @@ namespace MonoTests.System.Diagnostics {
Assert.AreEqual (sf [i], st.GetFrame (i), i.ToString ());
}
}
#endif
[Test]
public void UnthrownException ()
{