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

@@ -44,11 +44,15 @@ ifndef NO_THREAD_SUSPEND_RESUME
TEST_MCS_FLAGS += -d:MONO_FEATURE_THREAD_SUSPEND_RESUME
endif
TEST_RESOURCE_FILES = $(wildcard Test/System.Web.Services.Description/*.wsdl)
TEST_MCS_FLAGS += $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
EXTRA_DISTFILES = \
System.Web.Services.Description/web-reference.xsd \
System.Web.Services.Description/wsdl-1.1.xsd \
System.Web.Services.Description/wsdl-1.1-soap.xsd \
System.Web.Services.Description/wsdl.genxs \
Test/System.Web.Services.Description/*.wsdl
$(TEST_RESOURCE_FILES)
include ../../build/library.make

View File

@@ -35,3 +35,4 @@ System.Web.Services.Protocols/SoapHttpClientProtocolTest.cs
System.Web.Services.Protocols/WebClientProtocolTest.cs
System.Web.Services.Protocols/SoapServerTypeTest.cs
../../test-helpers/SocketResponder.cs
../../test-helpers/TestResourceHelper.cs

View File

@@ -17,6 +17,8 @@ using System.CodeDom.Compiler;
using Microsoft.CSharp;
using System.Web.Services.Description;
using MonoTests.Helpers;
namespace MonoTests.System.Web.Services.Description
{
[TestFixture]
@@ -68,7 +70,7 @@ namespace MonoTests.System.Web.Services.Description
public void GenerateNullableTypes ()
{
CodeNamespace cns = GenerateCodeFromWsdl (
ServiceDescription.Read ("Test/System.Web.Services.Description/test2.wsdl"));
ServiceDescription.Read (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/test2.wsdl")));
CodeTypeDeclaration td = FindTypeFrom (cns, "Service");
foreach (CodeTypeMember member in td.Members) {
CodeMemberMethod method = member as CodeMemberMethod;
@@ -101,7 +103,7 @@ namespace MonoTests.System.Web.Services.Description
{
ServiceDescriptionImporter imp =
new ServiceDescriptionImporter ();
imp.AddServiceDescription (ServiceDescription.Read ("Test/System.Web.Services.Description/test3.wsdl"), null, null);
imp.AddServiceDescription (ServiceDescription.Read (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/test3.wsdl")), null, null);
CodeNamespace cns = new CodeNamespace ();
CodeCompileUnit ccu = new CodeCompileUnit ();
ccu.Namespaces.Add (cns);

View File

@@ -18,6 +18,8 @@ using System.Xml;
using System.Xml.Serialization;
using System.Collections;
using MonoTests.Helpers;
namespace MonoTests.System.Web.Services.Description
{
[TestFixture]
@@ -52,14 +54,14 @@ namespace MonoTests.System.Web.Services.Description
public void ReadAndRetrievalUrl ()
{
Assert.AreEqual (String.Empty, new ServiceDescription ().RetrievalUrl, "#1");
ServiceDescription sd = ServiceDescription.Read ("Test/System.Web.Services.Description/test2.wsdl");
ServiceDescription sd = ServiceDescription.Read (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/test2.wsdl"));
Assert.AreEqual (String.Empty, sd.RetrievalUrl, "#2");
}
[Test]
public void Namespaces ()
{
FileStream fs = new FileStream ("Test/System.Web.Services.Description/test.wsdl", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/test.wsdl"), FileMode.Open, FileAccess.Read);
XmlTextReader xtr = new XmlTextReader (fs);
ServiceDescription sd = ServiceDescription.Read (xtr);
@@ -84,7 +86,7 @@ namespace MonoTests.System.Web.Services.Description
[Test]
public void ExtensibleAttributes ()
{
FileStream fs = new FileStream ("Test/System.Web.Services.Description/test.wsdl", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/test.wsdl"), FileMode.Open, FileAccess.Read);
XmlTextReader xtr = new XmlTextReader(fs);
ServiceDescription sd = ServiceDescription.Read(xtr);
@@ -105,7 +107,7 @@ namespace MonoTests.System.Web.Services.Description
[Test]
public void Extensions ()
{
FileStream fs = new FileStream("Test/System.Web.Services.Description/test.wsdl", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream(TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/test.wsdl"), FileMode.Open, FileAccess.Read);
XmlTextReader xtr = new XmlTextReader(fs);
ServiceDescription sd = ServiceDescription.Read(xtr);

View File

@@ -20,6 +20,8 @@ using System.Xml.Schema;
using System.Xml.Serialization;
using System.Collections;
using MonoTests.Helpers;
namespace MonoTests.System.Web.Services.Description
{
[TestFixture]
@@ -31,7 +33,7 @@ namespace MonoTests.System.Web.Services.Description
BasicProfileViolationCollection bc = new BasicProfileViolationCollection ();
WebServicesInteroperability.CheckConformance (
WsiProfiles.BasicProfile1_1,
ServiceDescription.Read ("Test/System.Web.Services.Description/check-import.wsdl"), bc);
ServiceDescription.Read (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/check-import.wsdl")), bc);
}
[Test]
@@ -40,7 +42,7 @@ namespace MonoTests.System.Web.Services.Description
BasicProfileViolationCollection bc = new BasicProfileViolationCollection ();
WebServicesInteroperability.CheckConformance (
WsiProfiles.BasicProfile1_1,
ServiceDescription.Read ("Test/System.Web.Services.Description/443095.wsdl"), bc);
ServiceDescription.Read (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/443095.wsdl")), bc);
}
[Test]
@@ -49,7 +51,7 @@ namespace MonoTests.System.Web.Services.Description
BasicProfileViolationCollection bc = new BasicProfileViolationCollection ();
WebServicesInteroperability.CheckConformance (
WsiProfiles.BasicProfile1_1,
ServiceDescription.Read ("Test/System.Web.Services.Description/6041.wsdl"), bc);
ServiceDescription.Read (TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Services.Description/6041.wsdl")), bc);
}
}

View File

@@ -5,4 +5,3 @@ System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
System.Web.Services.Configuration/TypeElementTest.cs
System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
System.Web.Services.Configuration/WsiProfilesElementTest.cs

View File

@@ -0,0 +1 @@
#include monotouch_System.Web.Services_test.dll.exclude.sources

View File

@@ -0,0 +1 @@
#include monotouch_System.Web.Services_test.dll.exclude.sources

View File

@@ -5,4 +5,3 @@ System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
System.Web.Services.Configuration/TypeElementTest.cs
System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
System.Web.Services.Configuration/WsiProfilesElementTest.cs