Imported Upstream version 3.10.0

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

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();