Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@ -135,7 +135,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@ -149,7 +149,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString(CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@ -162,7 +162,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@ -175,7 +175,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString ("256");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@ -188,7 +188,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@ -201,7 +201,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (null, CultureInfo.InvariantCulture, "256");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@ -214,7 +214,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@ -227,7 +227,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("256");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@ -240,7 +240,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("#0b10");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}