Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@ -45,6 +45,8 @@ using NUnit.Framework;
using WSServiceDescription = System.Web.Services.Description.ServiceDescription;
using SMBinding = System.ServiceModel.Channels.Binding;
using MonoTests.Helpers;
namespace MonoTests.System.ServiceModel.Description
{
[TestFixture]
@ -58,7 +60,7 @@ namespace MonoTests.System.ServiceModel.Description
{
XmlReaderSettings xs = new XmlReaderSettings ();
xs.IgnoreWhitespace = true;
xtr = XmlTextReader.Create ("Test/System.ServiceModel.Description/dump.xml", xs);
xtr = XmlTextReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/Resources/dump.xml"), xs);
xtr.Read ();
@ -188,7 +190,7 @@ namespace MonoTests.System.ServiceModel.Description
{
XmlReaderSettings xs = new XmlReaderSettings ();
xs.IgnoreWhitespace = true;
xtr = XmlTextReader.Create ("Test/System.ServiceModel.Description/dump.xml", xs);
xtr = XmlTextReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/Resources/dump.xml"), xs);
xtr.Read ();
@ -473,7 +475,7 @@ namespace MonoTests.System.ServiceModel.Description
XmlReaderSettings xs = new XmlReaderSettings ();
xs.IgnoreWhitespace = true;
//xtr = XmlTextReader.Create ("Test/System.ServiceModel.Description/test2a.xml", xs);
xtr = XmlTextReader.Create ("Test/System.ServiceModel.Description/dump.xml", xs);
xtr = XmlTextReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/Resources/dump.xml"), xs);
xtr.Read ();
@ -546,7 +548,7 @@ namespace MonoTests.System.ServiceModel.Description
[Ignore ("Until make dist gets fixed I won't enable any of new external-source-dependent tests")]
public void ImportMethodWithArrayOfint ()
{
var ms = GetMetadataSetFromWsdl ("Test/Resources/xml/service1.wsdl");
var ms = GetMetadataSetFromWsdl (TestResourceHelper.GetFullPathOfResource ("Test/Resources/xml/service1.wsdl"));
var imp = new WsdlImporter (ms);
var cg = new ServiceContractGenerator ();
var cd = imp.ImportAllContracts () [0];
@ -566,7 +568,7 @@ namespace MonoTests.System.ServiceModel.Description
var mset = new MetadataSet ();
WSServiceDescription sd = null;
sd = WSServiceDescription.Read (XmlReader.Create ("Test/XmlFiles/670945.wsdl"));
sd = WSServiceDescription.Read (XmlReader.Create (TestResourceHelper.GetFullPathOfResource (TestResourceHelper.GetFullPathOfResource ("Test/Resources/670945.wsdl"))));
mset.MetadataSections.Add (new MetadataSection () {
Dialect = MetadataSection.ServiceDescriptionDialect,
Metadata = sd });
@ -581,7 +583,7 @@ namespace MonoTests.System.ServiceModel.Description
[Ignore ("FIXME: Using external source")]
public void ImportMethodWithDateTime ()
{
var ms = GetMetadataSetFromWsdl ("Test/Resources/DateTime.wsdl");
var ms = GetMetadataSetFromWsdl (TestResourceHelper.GetFullPathOfResource ("Test/Resources/DateTime.wsdl"));
var imp = new WsdlImporter (ms);
var cg = new ServiceContractGenerator ();
var cd = imp.ImportAllContracts () [0];