Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -51,14 +51,14 @@ namespace MonoTests.System.Xml
public void CreateEvidenceForUrl_Basic ()
{
Evidence e = XmlSecureResolver.CreateEvidenceForUrl (null);
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
Assert.AreEqual (0, e.Count, "null");
#else
Assert.IsNull (e);
#endif
e = XmlSecureResolver.CreateEvidenceForUrl (String.Empty);
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
Assert.AreEqual (0, e.Count, "String.Empty");
#else
Assert.IsNull (e);
@ -136,7 +136,7 @@ namespace MonoTests.System.Xml
Assert.AreEqual ("file", resolved.Scheme);
var task = sr.GetEntityAsync (resolved, null, typeof (Stream));
Assert.That (task.Wait (3000));
Assert.IsTrue (task.Result is Stream, "Unexpected type: " + task.Result.GetType());
Assert.IsTrue (task.Result is FileStream, "Unexpected type: " + task.Result.GetType());
}
}