mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.20.0.180

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

30
mcs/class/System.Runtime.Serialization/Makefile
View File

@@ -17,9 +17,13 @@ XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq Facades/System.Th
ifneq ($(PROFILE),monodroid)
ifneq ($(PROFILE),monotouch)
ifneq ($(PROFILE),monotouch_tv)
ifneq ($(PROFILE),monotouch_watch)
XTEST_LIB_REFS += System.Drawing
endif
endif
endif
endif
ifneq (2.1, $(FRAMEWORK_VERSION))
LIB_REFS += System.Data System.Configuration SMDiagnostics
@@ -33,15 +37,27 @@ LIB_MCS_FLAGS += /d:NO_CONFIGURATION
endif
TEST_RESOURCE_FILES = \
Test/Resources/WSDL/collections.wsdl \
Test/Resources/WSDL/custom-collections.wsdl
$(wildcard Test/Resources/FrameworkTypes/*.xml) \
$(wildcard Test/Resources/Schemas/*.xsd) \
Test/Resources/WSDL/collections.wsdl \
Test/Resources/WSDL/custom-collections.wsdl \
Test/Resources/one.xml
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(TEST_RESOURCE_FILES:%=/resource:%)
# we need to write the test resource args into a response file to avoid
# hitting "argument list too long" errors because of too many files
TEST_RESOURCES_RESPONSE_FILE = $(depsdir)/$(LIBRARY)_test.resources.response
$(TEST_RESOURCES_RESPONSE_FILE): $(TEST_RESOURCE_FILES)
@echo Creating $@ ...
@echo $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r)) > $(TEST_RESOURCES_RESPONSE_FILE)
test-local: $(TEST_RESOURCES_RESPONSE_FILE)
CLEAN_FILES += $(TEST_RESOURCES_RESPONSE_FILE)
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) @$(TEST_RESOURCES_RESPONSE_FILE)
TEST_LIB_REFS = System.ServiceModel System.Web.Services
EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_RESOURCE_FILES) \
Test/Resources/FrameworkTypes/* \
Test/Resources/Schemas/*.xsd \
Test/System.Runtime.Serialization/one.xml
EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_RESOURCE_FILES)
include ../../build/library.make

1
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization_test.dll.sources
View File

@@ -1,3 +1,4 @@
../../test-helpers/TestResourceHelper.cs
System.Runtime.Serialization.Json/DataContractJsonSerializerTest.cs
System.Runtime.Serialization.Json/JsonReaderTest.cs
System.Runtime.Serialization.Json/JsonWriterTest.cs

0
mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/one.xml → mcs/class/System.Runtime.Serialization/Test/Resources/one.xml
View File

100
mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs
View File

@@ -50,6 +50,8 @@ using NUnit.Framework;
using QName = System.Xml.XmlQualifiedName;
using MonoTests.Helpers;
namespace MonoTests.System.Runtime.Serialization
{
[TestFixture]
@@ -61,7 +63,7 @@ namespace MonoTests.System.Runtime.Serialization
[SetUp]
public void Setup ()
{
XmlReader xr = XmlTextReader.Create ("Test/System.Runtime.Serialization/one.xml");
XmlReader xr = XmlTextReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/Resources/one.xml"));
metadata = MetadataSet.ReadFrom (xr);
NewXmlSchemaSet ();
}
@@ -374,8 +376,8 @@ namespace MonoTests.System.Runtime.Serialization
var ccu = new CodeCompileUnit ();
var xdi = new XsdDataContractImporter (ccu);
var xss = new XmlSchemaSet ();
xss.Add (null, "Test/Resources/Schemas/schema1.xsd");
xss.Add (null, "Test/Resources/Schemas/schema2.xsd");
xss.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/schema1.xsd"));
xss.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/schema2.xsd"));
xdi.Import (xss);
var sw = new StringWriter ();
new CSharpCodeProvider ().GenerateCodeFromCompileUnit (ccu, sw, null);
@@ -388,9 +390,9 @@ namespace MonoTests.System.Runtime.Serialization
var ccu = new CodeCompileUnit ();
var xdi = new XsdDataContractImporter (ccu);
var xss = new XmlSchemaSet ();
xss.Add (null, "Test/Resources/Schemas/schema1.xsd");
xss.Add (null, "Test/Resources/Schemas/schema2.xsd");
xss.Add (null, "Test/Resources/Schemas/schema3.xsd");
xss.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/schema1.xsd"));
xss.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/schema2.xsd"));
xss.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/schema3.xsd"));
xdi.Import (xss);
var sw = new StringWriter ();
bool t = false, te = false;
@@ -446,52 +448,52 @@ namespace MonoTests.System.Runtime.Serialization
[Test]
public void ImportTestX0 ()
{
DoImport ("Test/Resources/Schemas/ns0.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns0.xsd"));
}
[Test]
public void ImportTestX0_2 ()
{
var ccu = DoImport (true, "Test/Resources/Schemas/ns0.xsd");
var ccu = DoImport (true, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns0.xsd"));
Assert.IsTrue (GenerateCode (ccu).IndexOf ("class") < 0, "#1");
}
[Test]
public void ImportTestX1 ()
{
DoImport ("Test/Resources/Schemas/ns1.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns1.xsd"));
}
[Test]
public void ImportTestX1_2 ()
{
Assert.AreEqual (GenerateCode (DoImport ("Test/Resources/Schemas/ns1.xsd")), GenerateCode (DoImport (true, "Test/Resources/Schemas/ns1.xsd")), "#1");
Assert.AreEqual (GenerateCode (DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns1.xsd"))), GenerateCode (DoImport (true, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns1.xsd"))), "#1");
}
[Test]
public void ImportTestX2 ()
{
DoImport ("Test/Resources/Schemas/ns2.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns2.xsd"));
}
[Test]
public void ImportTestX2_2 ()
{
Assert.AreEqual (GenerateCode (DoImport ("Test/Resources/Schemas/ns2.xsd")), GenerateCode (DoImport (true, "Test/Resources/Schemas/ns2.xsd")), "#1");
Assert.AreEqual (GenerateCode (DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns2.xsd"))), GenerateCode (DoImport (true, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns2.xsd"))), "#1");
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX3 ()
{
DoImport ("Test/Resources/Schemas/ns3.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns3.xsd"));
}
[Test]
[Category ("NotWorking")]
public void ImportTestX3_2 ()
{
var ccu = DoImport (true, "Test/Resources/Schemas/ns3.xsd");
var ccu = DoImport (true, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns3.xsd"));
var code = GenerateCode (ccu);
Assert.IsTrue (code.IndexOf ("class T2") > 0, "#1");
Assert.IsTrue (code.IndexOf ("IXmlSerializable") > 0, "#2");
@@ -504,208 +506,208 @@ namespace MonoTests.System.Runtime.Serialization
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX4 ()
{
DoImport ("Test/Resources/Schemas/ns4.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns4.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX5 ()
{
DoImport ("Test/Resources/Schemas/ns5.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns5.xsd"));
}
[Test]
public void ImportTestX6 ()
{
DoImport ("Test/Resources/Schemas/ns6.xsd",
"Test/Resources/Schemas/ns0.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns6.xsd"),
TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns0.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX7 ()
{
DoImport ("Test/Resources/Schemas/ns7.xsd",
"Test/Resources/Schemas/ns0.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns7.xsd"),
TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns0.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX8 ()
{
DoImport ("Test/Resources/Schemas/ns8.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns8.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX9 ()
{
DoImport ("Test/Resources/Schemas/ns9.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns9.xsd"));
}
[Test]
public void ImportTestX10 ()
{
DoImport ("Test/Resources/Schemas/ns10.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns10.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX11 ()
{
DoImport ("Test/Resources/Schemas/ns11.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns11.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX12 ()
{
DoImport ("Test/Resources/Schemas/ns12.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns12.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX13 ()
{
DoImport ("Test/Resources/Schemas/ns13.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns13.xsd"));
}
[Test]
public void ImportTestX14 ()
{
DoImport ("Test/Resources/Schemas/ns14.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns14.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX15 ()
{
DoImport ("Test/Resources/Schemas/ns15.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns15.xsd"));
}
[Test]
public void ImportTestX16 ()
{
DoImport ("Test/Resources/Schemas/ns16.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns16.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX17 ()
{
DoImport ("Test/Resources/Schemas/ns17.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns17.xsd"));
}
[Test]
public void ImportTestX18 ()
{
DoImport ("Test/Resources/Schemas/ns18.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns18.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX19 ()
{
DoImport ("Test/Resources/Schemas/ns19.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns19.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX20 ()
{
DoImport ("Test/Resources/Schemas/ns20.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns20.xsd"));
}
[Test]
public void ImportTestX21 ()
{
DoImport ("Test/Resources/Schemas/ns21.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns21.xsd"));
}
[Test]
public void ImportTestX22 ()
{
DoImport ("Test/Resources/Schemas/ns22.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns22.xsd"));
}
[Test]
public void ImportTestX23 ()
{
DoImport ("Test/Resources/Schemas/ns23.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns23.xsd"));
}
[ExpectedException (typeof (InvalidDataContractException))]
[Test]
public void ImportTestX24 ()
{
DoImport ("Test/Resources/Schemas/ns24.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns24.xsd"));
}
[Test]
public void ImportTestX25 ()
{
DoImport ("Test/Resources/Schemas/ns25.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns25.xsd"));
}
[Test]
public void ImportTestX26 ()
{
DoImport ("Test/Resources/Schemas/ns26.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns26.xsd"));
}
[Test]
public void ImportTestX27 ()
{
DoImport ("Test/Resources/Schemas/ns27.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns27.xsd"));
}
[Test]
public void ImportTestX28 ()
{
DoImport ("Test/Resources/Schemas/ns28.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns28.xsd"));
}
[Test]
[ExpectedException (typeof (InvalidDataContractException))]
public void ImportTestX29 ()
{
DoImport ("Test/Resources/Schemas/ns29.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns29.xsd"));
}
[Test]
public void ImportTestX30 ()
{
DoImport ("Test/Resources/Schemas/ns30.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns30.xsd"));
}
[Test]
public void ImportTestX31 ()
{
DoImport ("Test/Resources/Schemas/ns31.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns31.xsd"));
}
[Test]
public void ImportTestX32 ()
{
DoImport ("Test/Resources/Schemas/ns32.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns32.xsd"));
}
[Test]
public void ImportTestX33 ()
{
DoImport ("Test/Resources/Schemas/ns33.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns33.xsd"));
}
[Test]
public void ImportTestX34 ()
{
DoImport (true, "Test/Resources/Schemas/ns34.xsd", "Test/Resources/Schemas/ns34_2.xsd");
DoImport (true, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns34.xsd"), TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns34_2.xsd"));
}
[Test]
public void CanImportTestX34 ()
{
DoCanImport (false, "Test/Resources/Schemas/ns34.xsd", "Test/Resources/Schemas/ns34_2.xsd");
DoCanImport (false, TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns34.xsd"), TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/ns34_2.xsd"));
}
/* Helper methods */
@@ -780,7 +782,7 @@ namespace MonoTests.System.Runtime.Serialization
[Test]
public void ImportXsdBuiltInTypes ()
{
DoImport ("Test/Resources/Schemas/xml.xsd");
DoImport (TestResourceHelper.GetFullPathOfResource ("Test/Resources/Schemas/xml.xsd"));
}
}

4
mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
View File

@@ -57,8 +57,8 @@ namespace MonoTests.System.Runtime.Serialization
[SetUp]
public void Setup ()
{
collectionsMetadata = WsdlHelper.GetMetadataSet ("collections.wsdl");
customCollectionsMetadata = WsdlHelper.GetMetadataSet ("custom-collections.wsdl");
collectionsMetadata = WsdlHelper.GetMetadataSet ("Test/Resources/WSDL/collections.wsdl");
customCollectionsMetadata = WsdlHelper.GetMetadataSet ("Test/Resources/WSDL/custom-collections.wsdl");
}
[Test]

1
mcs/class/System.Runtime.Serialization/monotouch_tv_System.Runtime.Serialization_xtest.dll.exclude.sources Normal file
View File

@@ -0,0 +1 @@
#include monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources

1
mcs/class/System.Runtime.Serialization/monotouch_watch_System.Runtime.Serialization_xtest.dll.exclude.sources Normal file
View File

@@ -0,0 +1 @@
#include monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources