Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -171,8 +171,8 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
private object Serialize(object objGraph) {
MemoryStream stream = new MemoryStream();
Assertion.Assert(objGraph != null);
Assertion.Assert(stream != null);
Assert.IsTrue(objGraph != null);
Assert.IsTrue(stream != null);
_soapFormatter.SurrogateSelector = _surrogate;
_soapFormatter.Serialize(stream, objGraph);
@ -182,8 +182,8 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
stream.Position = 0;
object objReturn = _soapFormatterDeserializer.Deserialize(stream);
Assertion.Assert(objReturn != null);
Assertion.AssertEquals("#Tests "+objGraph.GetType(), objGraph.GetType(), objReturn.GetType());
Assert.IsTrue(objReturn != null);
Assert.AreEqual(objGraph.GetType(), objReturn.GetType(), "#Tests "+objGraph.GetType());
stream = new MemoryStream();
_soapFormatter.Serialize(stream, objReturn);
stream.Position = 0;
@ -209,19 +209,19 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
public void TestValueTypes() {
object objReturn;
objReturn = Serialize((short)1);
Assertion.AssertEquals("#int16", objReturn, 1);
Assert.AreEqual(objReturn, 1, "#int16");
objReturn = Serialize(1);
Assertion.AssertEquals("#int32", objReturn, 1);
Assert.AreEqual(objReturn, 1, "#int32");
objReturn = Serialize((Single)0.1234);
Assertion.AssertEquals("#Single", objReturn, 0.123400003f);
Assert.AreEqual(objReturn, 0.123400003f, "#Single");
objReturn = Serialize((Double)1234567890.0987654321);
Assertion.AssertEquals("#iDouble", objReturn, 1234567890.0987654321);
Assert.AreEqual(objReturn, 1234567890.0987654321, "#iDouble");
objReturn = Serialize(true);
Assertion.AssertEquals("#Bool", objReturn, true);
Assert.AreEqual(objReturn, true, "#Bool");
objReturn = Serialize((Int64) 1234567890);
Assertion.AssertEquals("#Int64", objReturn, 1234567890);
Assert.AreEqual(objReturn, 1234567890, "#Int64");
objReturn = Serialize('c');
Assertion.AssertEquals("#Char", objReturn, 'c');
Assert.AreEqual(objReturn, 'c', "#Char");
}
[Test]
@ -229,7 +229,7 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
object objReturn;
objReturn = Serialize("");
objReturn = Serialize("hello world!");
Assertion.AssertEquals("#string", "hello world!", objReturn);
Assert.AreEqual("hello world!", objReturn, "#string");
SoapMessage soapMsg = new SoapMessage();
soapMsg.Headers = new Header[0];
soapMsg.MethodName = "Equals";
@ -242,27 +242,27 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
_soapFormatterDeserializer.TopObject = null;
SimpleObject obj = new SimpleObject("simple object", 1);
objReturn = Serialize(obj);
Assertion.AssertEquals("#SimpleObject", obj, objReturn);
Assert.AreEqual(obj, objReturn, "#SimpleObject");
objReturn = Serialize(typeof(SimpleObject));
Assertion.AssertEquals("#Type", typeof(SimpleObject), (Type)objReturn);
Assert.AreEqual(typeof(SimpleObject), (Type)objReturn, "#Type");
objReturn = Serialize(obj.GetType().Assembly);
Assertion.AssertEquals("#Assembly", obj.GetType().Assembly, objReturn);
Assert.AreEqual(obj.GetType().Assembly, objReturn, "#Assembly");
}
public static bool CheckArray(object objTest, object objReturn) {
Array objTestAsArray = objTest as Array;
Array objReturnAsArray = objReturn as Array;
Assertion.Assert("#Not an Array "+objTest, objReturnAsArray != null);
Assertion.AssertEquals("#Different lengths "+objTest, objTestAsArray.Length, objReturnAsArray.Length);
Assert.IsTrue(objReturnAsArray != null, "#Not an Array "+objTest);
Assert.AreEqual(objTestAsArray.Length, objReturnAsArray.Length, "#Different lengths "+objTest);
IEnumerator iEnum = objReturnAsArray.GetEnumerator();
iEnum.Reset();
object obj2;
foreach(object obj1 in objTestAsArray) {
iEnum.MoveNext();
obj2 = iEnum.Current;
Assertion.AssertEquals("#The content of the 2 arrays is different", obj1, obj2);
Assert.AreEqual(obj1, obj2, "#The content of the 2 arrays is different");
}
return true;
@ -315,9 +315,9 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
MoreComplexObject objReturn;
MoreComplexObject objTest = new MoreComplexObject();
objReturn = (MoreComplexObject) Serialize(objTest);
Assertion.AssertEquals("#Equals", objTest, objReturn);
Assert.AreEqual(objTest, objReturn, "#Equals");
objReturn.OnTrucEvent("bidule");
Assertion.AssertEquals("#dlg", "bidule", objReturn.ObjString);
Assert.AreEqual("bidule", objReturn.ObjString, "#dlg");
}
[Test]
@ -333,9 +333,9 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
_soapFormatterDeserializer.Binder = new Version1ToVersion2Binder();
objReturn = _soapFormatterDeserializer.Deserialize(stream);
Assertion.AssertEquals("#Version1 Version2", "Version2", objReturn.GetType().Name);
Assertion.AssertEquals("#_value", 123, ((Version2) objReturn)._value);
Assertion.AssertEquals("#_foo", "Default value", ((Version2) objReturn)._foo);
Assert.AreEqual("Version2", objReturn.GetType().Name, "#Version1 Version2");
Assert.AreEqual(123, ((Version2) objReturn)._value, "#_value");
Assert.AreEqual("Default value", ((Version2) objReturn)._foo, "#_foo");
}
[Test]
@ -360,17 +360,17 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
sf.TopObject = t;
t = (SoapMessage) sf.Deserialize (ms);
Assertion.AssertNotNull ("#1", t.Headers[0].Value);
Assertion.AssertEquals ("#2", t.Headers[0].Value.GetType (), typeof(Type[]));
Assert.IsNotNull (t.Headers[0].Value, "#1");
Assert.AreEqual (t.Headers[0].Value.GetType (), typeof(Type[]), "#2");
Type[] ts = (Type[]) t.Headers[0].Value;
Assertion.AssertEquals ("#3", 2, ts.Length);
Assertion.AssertNotNull ("#4", ts[0]);
Assertion.AssertNotNull ("#5", ts[1]);
Assert.AreEqual (2, ts.Length, "#3");
Assert.IsNotNull (ts[0], "#4");
Assert.IsNotNull (ts[1], "#5");
Console.WriteLine ("PPP:" + ts[0].GetType());
Assertion.AssertEquals ("#6", typeof(string), ts[0]);
Assertion.AssertEquals ("#7", typeof(SignatureTest[]), ts[1]);
Assert.AreEqual (typeof(string), ts[0], "#6");
Assert.AreEqual (typeof(SignatureTest[]), ts[1], "#7");
}
[Test]
@ -398,14 +398,14 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
public void OnDeserialization (StreamingContext context)
{
var ci = Thread.CurrentThread.CurrentCulture;
Assertion.AssertEquals("#1", "German (Germany)", ci.EnglishName);
Assert.AreEqual("German (Germany)", ci.EnglishName, "#1");
}
[OnSerialized]
public void OnSerialized (StreamingContext context)
{
var ci = Thread.CurrentThread.CurrentCulture;
Assertion.AssertEquals("#2", "German (Germany)", ci.EnglishName);
Assert.AreEqual("German (Germany)", ci.EnglishName, "#2");
}
}
}