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

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/corlib/Test/System.Collections/CaseInsensitiveHashCodeProviderTest.cs
View File

@ -183,11 +183,7 @@ namespace MonoTests.System.Collections
[Test]
public void Deserialize ()
{
#if TARGET_JVM
BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
#else
BinaryFormatter bf = new BinaryFormatter ();
#endif // TARGET_JVM
MemoryStream ms = new MemoryStream (serialized_en_us);
CaseInsensitiveHashCodeProvider enus = (CaseInsensitiveHashCodeProvider) bf.Deserialize (ms);

8
mcs/class/corlib/Test/System.Collections/HashtableTest.cs
View File

@ -491,13 +491,6 @@ public class HashtableTest {
h['b'] = 2;
DictionaryEntry[] o = new DictionaryEntry[2];
h.CopyTo(o,0);
#if TARGET_JVM // Hashtable is not an ordered collection!
if (o[0].Key.Equals('b')) {
DictionaryEntry v = o[0];
o[0] = o[1];
o[1] = v;
}
#endif // TARGET_JVM
Assert.AreEqual ('a', o[0].Key, "first copy fine.");
Assert.AreEqual (1, o[0].Value, "first copy fine.");
Assert.AreEqual ('b', o[1].Key, "second copy fine.");
@ -543,7 +536,6 @@ public class HashtableTest {
}
[Test]
[Category ("TargetJvmNotWorking")]
public void TestSerialization2 () {
// Test from bug #70570
MemoryStream stream = new MemoryStream();

19
mcs/class/corlib/Test/System.Collections/SortedListTest.cs
View File

@ -881,7 +881,6 @@ namespace MonoTests.System.Collections
}
[Test]
[Category ("TargetJvmNotWorking")]
public void SerializeTest ()
{
SortedList sl1 = new SortedList ();
@ -889,11 +888,7 @@ namespace MonoTests.System.Collections
sl1.Add (0, "B");
sl1.Add (7, "C");
#if TARGET_JVM
BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
#else
BinaryFormatter bf = new BinaryFormatter ();
#endif // TARGET_JVM
bf.AssemblyFormat = FormatterAssemblyStyle.Full;
MemoryStream ms = new MemoryStream ();
bf.Serialize (ms, sl1);
@ -908,7 +903,6 @@ namespace MonoTests.System.Collections
}
[Test]
[Category ("TargetJvmNotWorking")]
public void Keys_Serialize ()
{
SortedList sl = new SortedList ();
@ -917,11 +911,7 @@ namespace MonoTests.System.Collections
sl.Add (7, "C");
IList keys1 = (IList) sl.Keys;
#if TARGET_JVM
BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
#else
BinaryFormatter bf = new BinaryFormatter ();
#endif // TARGET_JVM
bf.AssemblyFormat = FormatterAssemblyStyle.Full;
MemoryStream ms = new MemoryStream ();
bf.Serialize (ms, keys1);
@ -936,7 +926,6 @@ namespace MonoTests.System.Collections
}
[Test]
[Category ("TargetJvmNotWorking")]
public void Values_Serialize ()
{
SortedList sl = new SortedList ();
@ -945,11 +934,7 @@ namespace MonoTests.System.Collections
sl.Add (7, "C");
IList values1 = (IList) sl.Values;
#if TARGET_JVM
BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
#else
BinaryFormatter bf = new BinaryFormatter ();
#endif // TARGET_JVM
bf.AssemblyFormat = FormatterAssemblyStyle.Full;
MemoryStream ms = new MemoryStream ();
bf.Serialize (ms, values1);
@ -967,11 +952,7 @@ namespace MonoTests.System.Collections
[Category ("NotWorking")]
public void Values_Deserialize ()
{
#if TARGET_JVM
BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
#else
BinaryFormatter bf = new BinaryFormatter ();
#endif // TARGET_JVM
MemoryStream ms = new MemoryStream ();
ms.Write (_serializedValues, 0, _serializedValues.Length);