Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb

mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/MetadataResolverTest.cs

@@ -52,7 +52,7 @@ namespace MonoTests.System.ServiceModel.Description
 		IAsyncResult current_request;
 		int remaining, port;
 
-		static readonly string mex = File.ReadAllText ("Test/System.ServiceModel.Description/dump.xml");
+		static readonly string mex = File.ReadAllText (TestResourceHelper.GetFullPathOfResource ("Test/Resources/dump.xml"));
 
 		[SetUp]
 		public void StartupServer ()

mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/MetadataSetTest.cs

@@ -37,6 +37,8 @@ using System.Xml;
 
 using NUnit.Framework;
 
+using MonoTests.Helpers;
+
 namespace MonoTests.System.ServiceModel.Description
 {
 	[TestFixture]
@@ -52,7 +54,7 @@ namespace MonoTests.System.ServiceModel.Description
 		[Test]
 		public void ReadFrom ()
 		{
-			XmlReader xr = XmlTextReader.Create ("Test/XmlFiles/one.xml");
+			XmlReader xr = XmlTextReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/Resources/one.xml"));
 			var metadata = MetadataSet.ReadFrom (xr);
 			Assert.AreEqual (5, metadata.MetadataSections.Count, "#1");
 			Assert.AreEqual (2, metadata.MetadataSections.Where (m => m.Dialect == MetadataSection.ServiceDescriptionDialect).Count (), "#2");

mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/WsdlImporterTest.cs

@@ -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];