Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -9,7 +9,7 @@
//
using System;
using System.Collections;
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Threading;
@ -55,8 +55,9 @@ namespace MonoTests.System.Net
IAsyncResult async = Dns.BeginResolve (site1Dot, null, null);
IPHostEntry entry = Dns.EndResolve (async);
SubTestValidIPHostEntry (entry);
Assert.AreEqual (site1Dot, entry.AddressList [0].ToString ());
SubTestValidIPHostEntry (entry);
var ip = GetIPv4Address (entry);
Assert.AreEqual (site1Dot, ip.ToString ());
}
void ResolveCallback (IAsyncResult ar)
@ -205,12 +206,21 @@ namespace MonoTests.System.Net
}
}
static IPAddress GetIPv4Address (IPHostEntry h)
{
var al = h.AddressList.FirstOrDefault (x => x.AddressFamily == AddressFamily.InterNetwork);
if (al == null)
Assert.Ignore ("Could not resolve an IPv4 address as required by this test case, e.g. running on an IPv6 only network");
return al;
}
void SubTestGetHostByName (string siteName, string siteDot)
{
IPHostEntry h = Dns.GetHostByName (siteName);
SubTestValidIPHostEntry (h);
Assert.AreEqual (siteName, h.HostName, "siteName");
Assert.AreEqual (siteDot, h.AddressList [0].ToString (), "siteDot");
var ip = GetIPv4Address (h);
Assert.AreEqual (siteDot, ip.ToString (), "siteDot");
}
[Test]
@ -287,7 +297,8 @@ namespace MonoTests.System.Net
IPAddress addr = new IPAddress (IPAddress.NetworkToHostOrder ((int) site1IP));
IPHostEntry h = Dns.GetHostByAddress (addr);
SubTestValidIPHostEntry (h);
Assert.AreEqual (addr.ToString (), h.AddressList [0].ToString ());
var ip = GetIPv4Address (h);
Assert.AreEqual (addr.ToString (), ip.ToString ());
}
[Test]
@ -295,8 +306,9 @@ namespace MonoTests.System.Net
{
IPAddress addr = new IPAddress (IPAddress.NetworkToHostOrder ((int) site2IP));
IPHostEntry h = Dns.GetHostByAddress (addr);
SubTestValidIPHostEntry (h);
Assert.AreEqual (addr.ToString (), h.AddressList [0].ToString ());
SubTestValidIPHostEntry (h);
var ip = GetIPv4Address (h);
Assert.AreEqual (addr.ToString (), ip.ToString ());
}
[Test]