Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssertTest.cs

@@ -30,21 +30,21 @@ namespace MonoTests.System.Diagnostics.Contracts {
 		/// Contract.Assert(false) will cause an assert to be triggered with the correct message.
 		/// </summary>
 		[Test]
-		[Ignore ("This causes NUnit crash on .NET 4.0")]
+//		[Ignore ("This causes NUnit crash on .NET 4.0")]
 		public void TestAssertNoEventHandler ()
 		{
 			try {
 				Contract.Assert (false);
 				Assert.Fail ("TestAssertNoEventHandler() exception not thrown #1");
 			} catch (Exception ex) {
-				Assert.IsInstanceOfType (typeof (NotImplementedException), ex, "TestAssertNoEventHandler() wrong exception type #1");
+				Assert.AreEqual ("Assertion failed.", ex.Message);
 			}
 
 			try {
 				Contract.Assert (false, "Message");
 				Assert.Fail ("TestAssertNoEventHandler() exception not thrown #2");
 			} catch (Exception ex) {
-				Assert.IsInstanceOfType (typeof (NotImplementedException), ex, "TestAssertNoEventHandler() wrong exception type #2");
+				Assert.AreEqual ("Assertion failed.  Message", ex.Message);
 			}
 		}
 
@@ -54,7 +54,7 @@ namespace MonoTests.System.Diagnostics.Contracts {
 		/// Because nothing is done in the event handler, an assert should be triggered.
 		/// </summary>
 		[Test]
-		[Ignore ("This causes NUnit crash on .NET 4.0")]
+//		[Ignore ("This causes NUnit crash on .NET 4.0")]
 		public void TestAssertEventHandlerNoAction ()
 		{
 			bool visitedEventHandler = false;
@@ -70,7 +70,7 @@ namespace MonoTests.System.Diagnostics.Contracts {
 				Contract.Assert (false);
 				Assert.Fail ("TestAssertEventHandlerNoAction() exception not thrown");
 			} catch (Exception ex) {
-				Assert.IsInstanceOfType (typeof (NotImplementedException), ex, "TestAssertEventHandlerNoAction() wrong exception type");
+				Assert.AreEqual ("Assertion failed.", ex.Message);
 			}
 
 			Assert.IsTrue (visitedEventHandler, "TestAssertEventHandlerNoAction() handler not visited");

mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssumeTest.cs

@@ -21,21 +21,21 @@ namespace MonoTests.System.Diagnostics.Contracts {
 		/// or exception is slightly different.
 		/// </summary>
 		[Test]
-		[Ignore ("This causes NUnit crash on .NET 4.0")]
+		//[Ignore ("This causes NUnit crash on .NET 4.0")]
 		public void TestAssumeMessage ()
 		{
 			try {
 				Contract.Assume (false);
 				Assert.Fail ("TestAssumeMessage() exception not thrown #1");
 			} catch (Exception ex) {
-				Assert.IsInstanceOfType (typeof(NotImplementedException), ex, "TestAssumeMessage() wrong exception type #1");
+				Assert.AreEqual ("Assumption failed.", ex.Message);
 			}
 
 			try {
 				Contract.Assume (false, "Message");
 				Assert.Fail ("TestAssumeMessage() exception not thrown #1");
 			} catch (Exception ex) {
-				Assert.IsInstanceOfType (typeof(NotImplementedException), ex, "TestAssumeMessage() wrong exception type #1");
+				Assert.AreEqual ("Assumption failed.  Message", ex.Message);
 			}
 		}
 

mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractHelperTest.cs

@@ -240,15 +240,14 @@ namespace MonoTests.System.Diagnostics.Contracts {
 		/// Contract.TriggerFailure() triggers the assert. Check that the assert is triggered, with the correct text.
 		/// </summary>
 		[Test]
-		[Ignore ("This causes NUnit crash on .NET 4.0")]
+//		[Ignore ("This causes NUnit crash on .NET 4.0")]
 		public void TestTriggerFailure ()
 		{
 			try {
 				ContractHelper.TriggerFailure (ContractFailureKind.Assert, "Display", null, "Condition", null);
 				Assert.Fail ("TestTriggerFailure() failed to throw exception");
 			} catch (Exception ex) {
-				Assert.IsInstanceOfType(typeof(NotImplementedException), ex, "TestTriggerFailure() wrong exception type");
-				//Assert.AreEqual ("Expression: Condition" + Environment.NewLine + "Description: Display", ex.Message, "TestTriggerFailure() wrong message");
+				Assert.AreEqual ("Display", ex.Message, "TestTriggerFailure() wrong message");
 			}
 		}
 

mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/TestContractBase.cs

@@ -28,11 +28,7 @@ namespace MonoTests.System.Diagnostics.Contracts.Helpers {
 		[SetUp]
 		public void Setup() {
 			// Remove all event handlers from Contract.ContractFailed
-			var eventField = typeof(Contract).GetField("ContractFailed", BindingFlags.Static | BindingFlags.NonPublic);
-			if (eventField == null) {
-				// But in MS.NET it's done this way.
-				eventField = typeof(ContractHelper).GetField("contractFailedEvent", BindingFlags.Static | BindingFlags.NonPublic);
-			}
+			var eventField = typeof(global::System.Runtime.CompilerServices.ContractHelper).GetField("contractFailedEvent", BindingFlags.Static | BindingFlags.NonPublic);
 			eventField.SetValue(null, null);
 		}