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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs.REMOVED.git-id
View File

@@ -1 +1 @@
e4e38befd16529ef227dec132fab73663e37d8b2
ee5dab5feff42ad4fdb081eb40b62a41efcf24e7

5
mcs/class/corlib/Test/System.Collections.Generic/DictionaryTest.cs
View File

@@ -29,7 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -741,7 +740,7 @@ namespace MonoTests.System.Collections.Generic {
}
[Test]
[ExpectedException (typeof (ArgumentException))]
[ExpectedException (typeof (ArgumentNullException))]
public void IDictionary_Add_Null_2 ()
{
IDictionary d = new Dictionary<int, int> ();
@@ -1130,7 +1129,6 @@ namespace MonoTests.System.Collections.Generic {
c.CopyTo (new MyClass [1], 0);
}
[Test, ExpectedException (typeof (ArgumentException))]
public void ICollectionCopyTo_ex1 ()
{
var d = new Dictionary<int, string> ();
@@ -1232,4 +1230,3 @@ BgcAAAABMQEAAAAL";
}
}
#endif // NET_2_0

2
mcs/class/corlib/Test/System.Collections.Generic/EqualityComparerTest.cs
View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -63,4 +62,3 @@ namespace MonoTests.System.Collections.Generic {
}
}
#endif

2
mcs/class/corlib/Test/System.Collections.Generic/IListTest.cs
View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Collections.Generic;
@@ -49,5 +48,4 @@ namespace MonoTests.System.Collections.Generic
}
}
}
#endif

16
mcs/class/corlib/Test/System.Collections.Generic/ListTest.cs
View File

@@ -195,7 +195,7 @@ namespace MonoTests.System.Collections.Generic {
list.Insert(0, new object());
}
[Test, ExpectedException(typeof (ArgumentException))]
[Test, ExpectedException(typeof (ArgumentNullException))]
public void IList_InsertInvalidType2 ()
{
IList list = _list1 as IList;
@@ -209,7 +209,7 @@ namespace MonoTests.System.Collections.Generic {
list.Add(new object());
}
[Test, ExpectedException(typeof (ArgumentException))]
[Test, ExpectedException(typeof (ArgumentNullException))]
public void IList_AddInvalidType2()
{
IList list = _list1 as IList;
@@ -623,6 +623,16 @@ namespace MonoTests.System.Collections.Generic {
Assert.AreEqual (418, i);
}
[Test]
public void ForEach_Modified ()
{
try {
_list1.ForEach (l => _list1.Add (0));
Assert.Fail ();
} catch (InvalidOperationException) {
}
}
[Test]
public void FindLastIndexTest ()
{
@@ -1401,7 +1411,7 @@ namespace MonoTests.System.Collections.Generic {
x.CopyTo (Array.CreateInstance (typeof (int), new int [] { 10 }, new int[] { 1 }), 0);
Assert.Fail ("#7");
} catch (Exception e) {
Assert.IsTrue (e is ArgumentException, "#8");
Assert.IsTrue (e is ArgumentOutOfRangeException, "#8");
}
l.Add (10); l.Add (20);

2
mcs/class/corlib/Test/System.Collections.ObjectModel/CollectionTest.cs
View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -187,4 +186,3 @@ namespace MonoTests.System.Collections.ObjectModel
}
}
#endif

2
mcs/class/corlib/Test/System.Collections.ObjectModel/KeyedCollectionTest.cs
View File

@@ -5,7 +5,6 @@
// (C) Carlo Kok
//
#if NET_2_0
using NUnit.Framework;
using System;
using System.Globalization;
@@ -222,4 +221,3 @@ namespace MonoTests.System.Collections.ObjectModel
}
}
}
#endif

2
mcs/class/corlib/Test/System.Collections.ObjectModel/ReadOnlyCollectionTest.cs
View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -128,4 +127,3 @@ namespace MonoTests.System.Collections.ObjectModel
}
}
#endif

15
mcs/class/corlib/Test/System.Collections/ArrayListTest.cs
View File

@@ -64,13 +64,8 @@ namespace MonoTests.System.Collections
[Test]
public void TestCapacity ()
{
#if NET_2_0
int default_capacity = 4;
int unspecified_capacity = 0;
#else
int default_capacity = 16;
int unspecified_capacity = 16;
#endif
for (int i = 1; i < 100; i++) {
ArrayList al1 = new ArrayList (i);
Assert.AreEqual (i, al1.Capacity, "Bad capacity of " + i);
@@ -1761,12 +1756,8 @@ namespace MonoTests.System.Collections
public void TrimToSize ()
{
ArrayList al1 = new ArrayList ();
#if NET_2_0
// Capacity is 0 under 2.0
int capacity = 4;
#else
int capacity = al1.Capacity;
#endif
int size = capacity / 2;
for (int i = 1; i <= size; i++) {
al1.Add ('?');
@@ -1830,9 +1821,6 @@ namespace MonoTests.System.Collections
}
[Test]
#if ONLY_1_1
[Category ("NotDotNet")] // MS bug
#endif
public void AddRange_GetRange ()
{
ArrayList source = ArrayList.Adapter (new object [] { "1", "2" });
@@ -1849,9 +1837,6 @@ namespace MonoTests.System.Collections
}
[Test]
#if ONLY_1_1
[Category ("NotDotNet")] // MS bug
#endif
public void IterateSelf ()
{
ArrayList list = new ArrayList ();

32
mcs/class/corlib/Test/System.Collections/CaseInsensitiveComparerTest.cs
View File

@@ -182,11 +182,7 @@ namespace MonoTests.System.Collections {
ms.Position = 0;
ms.Read (buffer, 0, buffer.Length);
#if NET_2_0
Assert.AreEqual (_serializedCultureV20, buffer);
#else
Assert.AreEqual (_serializedCultureV11, buffer);
#endif
} finally {
// restore original culture
Thread.CurrentThread.CurrentCulture = originalCulture;
@@ -194,11 +190,7 @@ namespace MonoTests.System.Collections {
}
[Test]
#if NET_2_0
[Category ("NotWorking")] // bug #80082
#else
[Category ("NotWorking")] // bug #80076
#endif
public void Deserialize_Culture ()
{
CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;
@@ -215,7 +207,6 @@ namespace MonoTests.System.Collections {
bf.Deserialize (ms);
Assert.IsNotNull (cic, "#1");
#if NET_2_0
ms = new MemoryStream ();
ms.Write (_serializedCultureV20, 0, _serializedCultureV20.Length);
ms.Position = 0;
@@ -223,7 +214,6 @@ namespace MonoTests.System.Collections {
bf = new BinaryFormatter ();
cic = (CaseInsensitiveComparer) bf.Deserialize (ms);
Assert.IsNotNull (cic, "#2");
#endif
} finally {
// restore original culture
Thread.CurrentThread.CurrentCulture = originalCulture;
@@ -249,11 +239,7 @@ namespace MonoTests.System.Collections {
ms.Position = 0;
ms.Read (buffer, 0, buffer.Length);
#if NET_2_0
Assert.AreEqual (_serializedDefaultV20, buffer);
#else
Assert.AreEqual (_serializedDefaultV11, buffer);
#endif
} finally {
// restore original culture
Thread.CurrentThread.CurrentCulture = originalCulture;
@@ -261,11 +247,7 @@ namespace MonoTests.System.Collections {
}
[Test]
#if NET_2_0
[Category ("NotWorking")] // bug #80082
#else
[Category ("NotWorking")] // bug #80076
#endif
public void Deserialize_Default ()
{
CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;
@@ -282,7 +264,6 @@ namespace MonoTests.System.Collections {
bf.Deserialize (ms);
Assert.IsNotNull (cic, "#1");
#if NET_2_0
ms = new MemoryStream ();
ms.Write (_serializedDefaultV20, 0, _serializedDefaultV20.Length);
ms.Position = 0;
@@ -290,7 +271,6 @@ namespace MonoTests.System.Collections {
bf = new BinaryFormatter ();
cic = (CaseInsensitiveComparer) bf.Deserialize (ms);
Assert.IsNotNull (cic, "#2");
#endif
} finally {
// restore original culture
Thread.CurrentThread.CurrentCulture = originalCulture;
@@ -316,11 +296,7 @@ namespace MonoTests.System.Collections {
ms.Position = 0;
ms.Read (buffer, 0, buffer.Length);
#if NET_2_0
Assert.AreEqual (_serializedDefaultInvariantV20, buffer);
#else
Assert.AreEqual (_serializedDefaultInvariantV11, buffer);
#endif
} finally {
// restore original culture
Thread.CurrentThread.CurrentCulture = originalCulture;
@@ -328,11 +304,7 @@ namespace MonoTests.System.Collections {
}
[Test]
#if NET_2_0
[Category ("NotWorking")] // bug #80082
#else
[Category ("NotWorking")] // bug #80076
#endif
public void Deserialize_DefaultInvariant ()
{
CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;
@@ -349,7 +321,6 @@ namespace MonoTests.System.Collections {
bf.Deserialize (ms);
Assert.IsNotNull (cic, "#1");
#if NET_2_0
ms = new MemoryStream ();
ms.Write (_serializedDefaultInvariantV20, 0, _serializedDefaultInvariantV20.Length);
ms.Position = 0;
@@ -357,7 +328,6 @@ namespace MonoTests.System.Collections {
bf = new BinaryFormatter ();
cic = (CaseInsensitiveComparer) bf.Deserialize (ms);
Assert.IsNotNull (cic, "#2");
#endif
} finally {
// restore original culture
Thread.CurrentThread.CurrentCulture = originalCulture;
@@ -424,7 +394,6 @@ namespace MonoTests.System.Collections {
0x75, 0x6c, 0x74, 0x75, 0x72, 0x65, 0x00, 0x00, 0x08, 0x08, 0x7f,
0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x0b };
#if NET_2_0
private static byte [] _serializedDefaultV20 = new byte [] {
0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00,
@@ -489,6 +458,5 @@ namespace MonoTests.System.Collections {
0x6d, 0x65, 0x00, 0x00, 0x01, 0x08, 0x08, 0x1f, 0x04, 0x00, 0x00,
0x1f, 0x04, 0x00, 0x00, 0x06, 0x03, 0x00, 0x00, 0x00, 0x05, 0x74,
0x72, 0x2d, 0x54, 0x52, 0x0b };
#endif
}
}

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

@@ -54,17 +54,6 @@ namespace MonoTests.System.Collections
}
[Test]
[Category ("NotDotNet")]
public void Default_Mono ()
{
// we return same instance if current culture did not change
CaseInsensitiveHashCodeProvider cih1 = CaseInsensitiveHashCodeProvider.Default;
CaseInsensitiveHashCodeProvider cih2 = CaseInsensitiveHashCodeProvider.Default;
Assert.IsTrue (object.ReferenceEquals (cih1, cih2));
}
[Test]
[Category ("NotWorking")]
public void Default_MS ()
{
// MS always returns new instance
@@ -73,7 +62,6 @@ namespace MonoTests.System.Collections
Assert.IsFalse (object.ReferenceEquals (cih1, cih2));
}
#if NET_2_0
[Test]
public void DefaultInvariant ()
{
@@ -90,7 +78,6 @@ namespace MonoTests.System.Collections
CaseInsensitiveHashCodeProvider cih2 = CaseInsensitiveHashCodeProvider.DefaultInvariant;
Assert.IsTrue (object.ReferenceEquals (cih1, cih2));
}
#endif
[Test]
public void HashCode ()
@@ -147,7 +134,6 @@ namespace MonoTests.System.Collections
}
}
#if NET_2_0
[Test]
public void Constructor1_Serialization ()
{
@@ -164,7 +150,6 @@ namespace MonoTests.System.Collections
Assert.AreEqual (ser1, ser2, "#1");
}
#endif
[Test]
public void SerializationRoundtrip ()
@@ -195,7 +180,6 @@ namespace MonoTests.System.Collections
}
private static byte [] serialized_en_us = new byte [] {
#if NET_2_0
0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x32, 0x53, 0x79, 0x73,
0x74, 0x65, 0x6D, 0x2E, 0x43, 0x6F, 0x6C, 0x6C, 0x65, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x2E,
@@ -214,26 +198,9 @@ namespace MonoTests.System.Collections
0x64, 0x65, 0x0D, 0x6D, 0x5F, 0x77, 0x69, 0x6E, 0x33, 0x32, 0x4C, 0x61, 0x6E, 0x67, 0x49, 0x44,
0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x01, 0x08, 0x0A, 0x00, 0x0A, 0x29, 0x00, 0x00,
0x00, 0x01, 0x09, 0x04, 0x00, 0x00, 0x0B
#else
0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x32, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x2E, 0x43, 0x6F,
0x6C, 0x6C, 0x65, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x2E, 0x43, 0x61, 0x73, 0x65, 0x49, 0x6E,
0x73, 0x65, 0x6E, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6F, 0x64,
0x65, 0x50, 0x72, 0x6F, 0x76, 0x69, 0x64, 0x65, 0x72, 0x01, 0x00, 0x00, 0x00, 0x06, 0x6D, 0x5F,
0x74, 0x65, 0x78, 0x74, 0x03, 0x1D, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x2E, 0x47, 0x6C, 0x6F,
0x62, 0x61, 0x6C, 0x69, 0x7A, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2E, 0x54, 0x65, 0x78, 0x74, 0x49,
0x6E, 0x66, 0x6F, 0x09, 0x02, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x1D, 0x53, 0x79,
0x73, 0x74, 0x65, 0x6D, 0x2E, 0x47, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x69, 0x7A, 0x61, 0x74, 0x69,
0x6F, 0x6E, 0x2E, 0x54, 0x65, 0x78, 0x74, 0x49, 0x6E, 0x66, 0x6F, 0x03, 0x00, 0x00, 0x00, 0x0B,
0x6D, 0x5F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x49, 0x74, 0x65, 0x6D, 0x11, 0x6D, 0x5F, 0x75, 0x73,
0x65, 0x55, 0x73, 0x65, 0x72, 0x4F, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x0D, 0x6D, 0x5F,
0x77, 0x69, 0x6E, 0x33, 0x32, 0x4C, 0x61, 0x6E, 0x67, 0x49, 0x44, 0x00, 0x00, 0x00, 0x08, 0x01,
0x08, 0x29, 0x00, 0x00, 0x00, 0x01, 0x09, 0x04, 0x00, 0x00, 0x0B
#endif
};
private static byte [] serialized_fr_ca = new byte [] {
#if NET_2_0
0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x32, 0x53, 0x79, 0x73,
0x74, 0x65, 0x6D, 0x2E, 0x43, 0x6F, 0x6C, 0x6C, 0x65, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x2E,
@@ -252,22 +219,6 @@ namespace MonoTests.System.Collections
0x64, 0x65, 0x0D, 0x6D, 0x5F, 0x77, 0x69, 0x6E, 0x33, 0x32, 0x4C, 0x61, 0x6E, 0x67, 0x49, 0x44,
0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x01, 0x08, 0x0A, 0x00, 0x0A, 0x50, 0x00, 0x00,
0x00, 0x01, 0x0C, 0x0C, 0x00, 0x00, 0x0B
#else
0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x32, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x2E, 0x43, 0x6F,
0x6C, 0x6C, 0x65, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x2E, 0x43, 0x61, 0x73, 0x65, 0x49, 0x6E,
0x73, 0x65, 0x6E, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6F, 0x64,
0x65, 0x50, 0x72, 0x6F, 0x76, 0x69, 0x64, 0x65, 0x72, 0x01, 0x00, 0x00, 0x00, 0x06, 0x6D, 0x5F,
0x74, 0x65, 0x78, 0x74, 0x03, 0x1D, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x2E, 0x47, 0x6C, 0x6F,
0x62, 0x61, 0x6C, 0x69, 0x7A, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2E, 0x54, 0x65, 0x78, 0x74, 0x49,
0x6E, 0x66, 0x6F, 0x09, 0x02, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x1D, 0x53, 0x79,
0x73, 0x74, 0x65, 0x6D, 0x2E, 0x47, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x69, 0x7A, 0x61, 0x74, 0x69,
0x6F, 0x6E, 0x2E, 0x54, 0x65, 0x78, 0x74, 0x49, 0x6E, 0x66, 0x6F, 0x03, 0x00, 0x00, 0x00, 0x0B,
0x6D, 0x5F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x49, 0x74, 0x65, 0x6D, 0x11, 0x6D, 0x5F, 0x75, 0x73,
0x65, 0x55, 0x73, 0x65, 0x72, 0x4F, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x0D, 0x6D, 0x5F,
0x77, 0x69, 0x6E, 0x33, 0x32, 0x4C, 0x61, 0x6E, 0x67, 0x49, 0x44, 0x00, 0x00, 0x00, 0x08, 0x01,
0x08, 0x50, 0x00, 0x00, 0x00, 0x01, 0x0C, 0x0C, 0x00, 0x00, 0x0B
#endif
};
}
}

15
mcs/class/corlib/Test/System.Collections/DictionaryBaseTest.cs
View File

@@ -469,14 +469,9 @@ namespace MonoTests.System.Collections
Assert.IsFalse (myDictionary.onSetFired, "#B8");
Assert.IsFalse (myDictionary.onSetCompleteFired, "#B9");
Assert.IsFalse (myDictionary.onGetFired, "#B10");
#if NET_2_0
myDictionary.onGetExist = true;
Assert.AreEqual (28, myDictionary.Count, "#B11");
Assert.AreEqual (22, myDictionary.BaseDictionary [11], "#B12");
#else
Assert.AreEqual (27, myDictionary.Count, "#B11");
Assert.IsNull (myDictionary.BaseDictionary [11], "#B12");
#endif
}
[Test]
@@ -487,15 +482,9 @@ namespace MonoTests.System.Collections
Assert.IsFalse (myDictionary.onInsertFired, "#B1");
Assert.IsFalse (myDictionary.onInsertCompleteFired, "#B2");
#if NET_2_0
Assert.IsFalse (myDictionary.onValidateFired, "#1");
Assert.IsFalse (myDictionary.onRemoveFired, "#2");
Assert.IsFalse (myDictionary.onRemoveCompleteFired, "#3");
#else
Assert.IsTrue (myDictionary.onValidateFired, "#1");
Assert.IsTrue (myDictionary.onRemoveFired, "#2");
Assert.IsTrue (myDictionary.onRemoveCompleteFired, "#3");
#endif
Assert.IsFalse (myDictionary.onClearFired, "#B6");
Assert.IsFalse (myDictionary.onClearCompleteFired, "#B7");
Assert.IsFalse (myDictionary.onSetFired, "#B8");
@@ -805,12 +794,8 @@ namespace MonoTests.System.Collections
{
IDictionary dictionary = new ModifyDictionary ();
dictionary ["a"] = "b";
#if NET_2_0
// first time we return "b" - because the value was cached
Assert.AreEqual ("b", dictionary ["a"], "#1");
#else
Assert.AreEqual ("a", dictionary ["a"], "#1");
#endif
// second time we return "a" - because it's the value in the dictionary
Assert.AreEqual ("a", dictionary ["a"], "#2");
}

6
mcs/class/corlib/Test/System.Collections/DictionaryEntryTest.cs
View File

@@ -32,18 +32,12 @@ namespace MonoTests.System.Collections {
}
[Test]
#if ONLY_1_1
[ExpectedException (typeof (ArgumentNullException))]
#endif
public void NullKeyCtor ()
{
DictionaryEntry d = new DictionaryEntry (null, "bar");
}
[Test]
#if ONLY_1_1
[ExpectedException (typeof (ArgumentNullException))]
#endif
public void NullKeySetter ()
{
DictionaryEntry d = new DictionaryEntry ("foo", "bar");

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

@@ -275,7 +275,6 @@ public class HashtableTest {
Assert.AreEqual (0, h.Count, "Table should be cleared");
}
#if NET_2_0
public class MyEqualityComparer : IEqualityComparer {
bool IEqualityComparer.Equals (object x, object y) { return x == y; }
public int GetHashCode (object obj) { return 1; }
@@ -283,10 +282,9 @@ public class HashtableTest {
static IEqualityComparer GetEqualityComparer (Hashtable h)
{
return (IEqualityComparer) typeof (Hashtable).GetField ("equalityComparer",
return (IEqualityComparer) typeof (Hashtable).GetField ("_keycomparer",
BindingFlags.NonPublic | BindingFlags.Instance).GetValue (h);
}
#endif
[Test]
public void TestClone() {
@@ -324,7 +322,6 @@ public class HashtableTest {
((char[])h1[c1[0]])[0] = 'z';
Assert.AreEqual (h1[c1[0]], h2[c1[0]], "shallow copy");
#if NET_2_0
// NET 2.0 stuff
MyEqualityComparer a = new MyEqualityComparer ();
Hashtable mh1 = new Hashtable (a);
@@ -332,7 +329,6 @@ public class HashtableTest {
// warning, depends on the field name.
Assert.AreEqual (GetEqualityComparer (mh1), GetEqualityComparer (mh1clone), "EqualityComparer");
#endif
}
}
@@ -812,6 +808,19 @@ public class HashtableTest {
dd.Remove (v);
}
}
[Test]
public void HashtableCopyWithCustomComparer ()
{
var ht = new Hashtable ();
ht.Add ("a", "b");
try {
new Hashtable (ht, new IEqualityComparer_ApplicationException ());
Assert.Fail ("custom comparer not used");
} catch (ApplicationException) {
}
}
}
class IDHashtable : Hashtable {
@@ -857,5 +866,17 @@ public class Bug :ISerializable {
}
};
class IEqualityComparer_ApplicationException : IEqualityComparer
{
public new bool Equals (object x, object y)
{
return false;
}
public int GetHashCode (object obj)
{
throw new ApplicationException ();
}
}
}

7
mcs/class/corlib/Test/System.Collections/QueueTest.cs
View File

@@ -140,14 +140,9 @@ namespace MonoTests.System.Collections {
[Test]
public void TestSyncRoot()
{
#if !NET_2_0 // umm, why on earth do you expect SyncRoot is the Queue itself?
Assert.AreEqual (q1, q1.SyncRoot, "SyncRoot q1");
Assert.AreEqual (q2, q2.SyncRoot, "SyncRoot q2");
Assert.AreEqual (emptyQueue, emptyQueue.SyncRoot, "SyncRoot emptyQueue");
#endif
Queue q1sync = Queue.Synchronized(q1);
Assert.AreEqual (q1, q1sync.SyncRoot, "SyncRoot value of a synchronized queue");
Assert.AreNotSame (q1, q1sync.SyncRoot, "SyncRoot value of a synchronized queue");
}
[Test]

6
mcs/class/corlib/Test/System.Collections/ReadOnlyCollectionBaseTest.cs
View File

@@ -18,9 +18,7 @@ namespace MonoTests.System.Collections {
// We need a concrete class to test the abstract base class
public class ConcreteReadOnlyCollection : ReadOnlyCollectionBase
{
#if NET_2_0
public override int Count { get { return -1; }}
#endif
}
// Make sure that the Count is 0 for a new object
@@ -29,11 +27,7 @@ namespace MonoTests.System.Collections {
{
ConcreteReadOnlyCollection myCollection;
myCollection = new ConcreteReadOnlyCollection();
#if NET_2_0
Assert.IsTrue (-1 == myCollection.Count);
#else
Assert.IsTrue ( 0 == myCollection.Count);
#endif
}
// Make sure we get an object from GetEnumerator()

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

@@ -44,9 +44,6 @@ namespace MonoTests.System.Collections
{
SortedList temp1 = new SortedList ();
Assert.IsNotNull (temp1, "#1");
#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
Assert.AreEqual (icap, temp1.Capacity, "#2");
#endif
}
[Test]
@@ -55,9 +52,6 @@ namespace MonoTests.System.Collections
Comparer c = Comparer.Default;
SortedList temp1 = new SortedList (c);
Assert.IsNotNull (temp1, "#1");
#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
Assert.AreEqual (icap, temp1.Capacity, "#2");
#endif
}
[Test]
@@ -125,25 +119,6 @@ namespace MonoTests.System.Collections
}
}
#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
[Test]
public void Constructor_Capacity ()
{
SortedList sl = new SortedList (0);
Assert.AreEqual (0, sl.Capacity, "#A1");
sl.Capacity = 0;
// doesn't reset to class default (16)
Assert.AreEqual (0, sl.Capacity, "#A2");
for (int i = 1; i <= 16; i++) {
sl = new SortedList (i);
Assert.AreEqual (i, sl.Capacity, "#B1:" + i);
sl.Capacity = 0;
// reset to class default (16)
Assert.AreEqual (16, sl.Capacity, "#B2:" + i);
}
}
#endif
[Test]
public void TestIsSynchronized ()
@@ -317,38 +292,8 @@ namespace MonoTests.System.Collections
Assert.AreEqual (2, sl1.Count, "#A2");
sl1.Clear ();
Assert.AreEqual (0, sl1.Count, "#B1");
#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
Assert.AreEqual (16, sl1.Capacity, "#B2");
#endif
}
#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
[Test]
public void Clear_Capacity ()
{
// strangely Clear change the default capacity (while Capacity doesn't)
for (int i = 0; i <= 16; i++) {
SortedList sl = new SortedList (i);
Assert.AreEqual (i, sl.Capacity, "#1:"+ i);
sl.Clear ();
// reset to class default (16)
Assert.AreEqual (16, sl.Capacity, "#2:" + i);
}
}
[Test]
public void Clear_Capacity_Reset ()
{
SortedList sl = new SortedList (0);
Assert.AreEqual (0, sl.Capacity, "#1");
sl.Clear ();
// reset to class default (16)
Assert.AreEqual (16, sl.Capacity, "#2");
sl.Capacity = 0;
Assert.AreEqual (16, sl.Capacity, "#3");
// note: we didn't return to 0 - so Clear cahnge the default capacity
}
#endif
[Test]
public void ClearDoesNotTouchCapacity ()
@@ -868,16 +813,10 @@ namespace MonoTests.System.Collections
SortedList sl1 = new SortedList (24);
sl1.TrimToSize ();
#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
Assert.AreEqual (icap, sl1.Capacity, "#1");
#endif
for (int i = 72; i >= 0; i--)
sl1.Add (100 + i, i);
sl1.TrimToSize ();
#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
Assert.AreEqual (73, sl1.Capacity, "#2");
#endif
}
[Test]

10
mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssertTest.cs
View File

@@ -30,21 +30,21 @@ namespace MonoTests.System.Diagnostics.Contracts {
/// Contract.Assert(false) will cause an assert to be triggered with the correct message.
/// </summary>
[Test]
[Ignore ("This causes NUnit crash on .NET 4.0")]
// [Ignore ("This causes NUnit crash on .NET 4.0")]
public void TestAssertNoEventHandler ()
{
try {
Contract.Assert (false);
Assert.Fail ("TestAssertNoEventHandler() exception not thrown #1");
} catch (Exception ex) {
Assert.IsInstanceOfType (typeof (NotImplementedException), ex, "TestAssertNoEventHandler() wrong exception type #1");
Assert.AreEqual ("Assertion failed.", ex.Message);
}
try {
Contract.Assert (false, "Message");
Assert.Fail ("TestAssertNoEventHandler() exception not thrown #2");
} catch (Exception ex) {
Assert.IsInstanceOfType (typeof (NotImplementedException), ex, "TestAssertNoEventHandler() wrong exception type #2");
Assert.AreEqual ("Assertion failed. Message", ex.Message);
}
}
@@ -54,7 +54,7 @@ namespace MonoTests.System.Diagnostics.Contracts {
/// Because nothing is done in the event handler, an assert should be triggered.
/// </summary>
[Test]
[Ignore ("This causes NUnit crash on .NET 4.0")]
// [Ignore ("This causes NUnit crash on .NET 4.0")]
public void TestAssertEventHandlerNoAction ()
{
bool visitedEventHandler = false;
@@ -70,7 +70,7 @@ namespace MonoTests.System.Diagnostics.Contracts {
Contract.Assert (false);
Assert.Fail ("TestAssertEventHandlerNoAction() exception not thrown");
} catch (Exception ex) {
Assert.IsInstanceOfType (typeof (NotImplementedException), ex, "TestAssertEventHandlerNoAction() wrong exception type");
Assert.AreEqual ("Assertion failed.", ex.Message);
}
Assert.IsTrue (visitedEventHandler, "TestAssertEventHandlerNoAction() handler not visited");

6
mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssumeTest.cs
View File

@@ -21,21 +21,21 @@ namespace MonoTests.System.Diagnostics.Contracts {
/// or exception is slightly different.
/// </summary>
[Test]
[Ignore ("This causes NUnit crash on .NET 4.0")]
//[Ignore ("This causes NUnit crash on .NET 4.0")]
public void TestAssumeMessage ()
{
try {
Contract.Assume (false);
Assert.Fail ("TestAssumeMessage() exception not thrown #1");
} catch (Exception ex) {
Assert.IsInstanceOfType (typeof(NotImplementedException), ex, "TestAssumeMessage() wrong exception type #1");
Assert.AreEqual ("Assumption failed.", ex.Message);
}
try {
Contract.Assume (false, "Message");
Assert.Fail ("TestAssumeMessage() exception not thrown #1");
} catch (Exception ex) {
Assert.IsInstanceOfType (typeof(NotImplementedException), ex, "TestAssumeMessage() wrong exception type #1");
Assert.AreEqual ("Assumption failed. Message", ex.Message);
}
}

5
mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractHelperTest.cs
View File

@@ -240,15 +240,14 @@ namespace MonoTests.System.Diagnostics.Contracts {
/// Contract.TriggerFailure() triggers the assert. Check that the assert is triggered, with the correct text.
/// </summary>
[Test]
[Ignore ("This causes NUnit crash on .NET 4.0")]
// [Ignore ("This causes NUnit crash on .NET 4.0")]
public void TestTriggerFailure ()
{
try {
ContractHelper.TriggerFailure (ContractFailureKind.Assert, "Display", null, "Condition", null);
Assert.Fail ("TestTriggerFailure() failed to throw exception");
} catch (Exception ex) {
Assert.IsInstanceOfType(typeof(NotImplementedException), ex, "TestTriggerFailure() wrong exception type");
//Assert.AreEqual ("Expression: Condition" + Environment.NewLine + "Description: Display", ex.Message, "TestTriggerFailure() wrong message");
Assert.AreEqual ("Display", ex.Message, "TestTriggerFailure() wrong message");
}
}

Some files were not shown because too many files have changed in this diff Show More