Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -2548,6 +2548,33 @@ public class ArrayTest
Assert.AreEqual (4, indices [0]);
}
[Test]
public void TestSortComparable()
{
int[] source = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
int[] expected = { 6, 5, 4, 3, 2, 1, 7, 8, 9 };
Comp[] c = { new Comp (100), new Comp (16), new Comp (11), new Comp (9), new Comp (0), new Comp (-100) };
IComparer<Comp> comp = null;
Array.Sort<Comp, int> (c, source, comp);
Assert.AreEqual (expected, source);
}
class Comp : IComparable
{
readonly int val;
public Comp (int a)
{
val = a;
}
int IComparable.CompareTo (object obj)
{
return val.CompareTo ((obj as Comp).val);
}
}
[Test]
public void TestInitializeEmpty()
{
@ -3449,7 +3476,6 @@ public class ArrayTest
Assert.AreEqual (input, expected);
}
#if NET_4_0
[Test]
[ExpectedException (typeof (ArgumentException))]
public void CompareToWithJaggedArray () {
@ -3616,7 +3642,6 @@ public class ArrayTest
Assert.AreEqual (3, c.Counter);
}
#endif
[Test]
public void JaggedArrayCtor ()