Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -77,7 +77,6 @@ namespace MonoTests.System.Web.Configuration {
o = cv.ConvertFrom (null, null, "AES");
Assert.AreEqual ("AES", o.ToString (), "AES");
#if NET_4_0
o = cv.ConvertFrom (null, null, "HMACSHA256");
Assert.AreEqual ("HMACSHA256", o.ToString (), "HMACSHA256");
@ -86,10 +85,8 @@ namespace MonoTests.System.Web.Configuration {
o = cv.ConvertFrom (null, null, "HMACSHA512");
Assert.AreEqual ("HMACSHA512", o.ToString (), "HMACSHA512");
#endif
}
#if NET_4_0
[Test]
[ExpectedException (typeof (ArgumentException))]
public void ConvertFrom_Custom ()
@ -97,7 +94,6 @@ namespace MonoTests.System.Web.Configuration {
MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
cv.ConvertFrom (null, null, "Custom");
}
#endif
[Test]
[ExpectedException (typeof (ArgumentException))]
@ -126,14 +122,11 @@ namespace MonoTests.System.Web.Configuration {
Assert.AreEqual ("MD5", cv.ConvertTo (null, null, MachineKeyValidation.MD5, typeof (string)), "A1");
Assert.AreEqual ("SHA1", cv.ConvertTo (null, null, MachineKeyValidation.SHA1, typeof (string)), "A2");
Assert.AreEqual ("3DES", cv.ConvertTo (null, null, MachineKeyValidation.TripleDES, typeof (string)), "A3");
#if NET_4_0
Assert.AreEqual ("HMACSHA256", cv.ConvertTo (null, null, MachineKeyValidation.HMACSHA256, typeof (string)), "HMACSHA256");
Assert.AreEqual ("HMACSHA384", cv.ConvertTo (null, null, MachineKeyValidation.HMACSHA384, typeof (string)), "HMACSHA384");
Assert.AreEqual ("HMACSHA512", cv.ConvertTo (null, null, MachineKeyValidation.HMACSHA512, typeof (string)), "HMACSHA512");
#endif
}
#if NET_4_0
[Test]
[ExpectedException (typeof (ArgumentException))]
public void ConvertTo_Custom ()
@ -141,14 +134,9 @@ namespace MonoTests.System.Web.Configuration {
MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
cv.ConvertTo (null, null, MachineKeyValidation.Custom, typeof (string));
}
#endif
[Test]
#if NET_4_0
[ExpectedException (typeof (ArgumentException))]
#else
[ExpectedException (typeof (NullReferenceException))]
#endif
public void ConvertTo_NullError ()
{
MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
@ -157,11 +145,7 @@ namespace MonoTests.System.Web.Configuration {
}
[Test]
#if NET_4_0
[ExpectedException (typeof (ArgumentException))]
#else
[ExpectedException (typeof (FormatException))]
#endif
public void ConvertTo_TypeError1 ()
{
MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
@ -179,11 +163,7 @@ namespace MonoTests.System.Web.Configuration {
}
[Test]
#if NET_4_0
[ExpectedException (typeof (ArgumentException))]
#else
[ExpectedException (typeof (FormatException))]
#endif
public void ConvertTo_TypeError3 ()
{
MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();