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

Imported Upstream version 5.16.0.100

Browse Source 
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mcs/class/System/Test/System.ComponentModel/ArrayConverterTests.cs
View File

@@ -86,7 +86,6 @@ namespace MonoTests.System.ComponentModel
}
[Test]
[ExpectedException (typeof (NullReferenceException))]
public void GetProperties_Value_Null ()
{
converter.GetProperties (null, null, null);

40
mcs/class/System/Test/System.ComponentModel/ByteConverterTests.cs
View File

@@ -169,7 +169,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -184,7 +184,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -202,7 +202,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -221,7 +221,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -239,7 +239,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -258,7 +258,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -276,7 +276,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -295,7 +295,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -313,7 +313,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -332,7 +332,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -347,7 +347,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -362,7 +362,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -380,7 +380,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -399,7 +399,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -417,7 +417,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -436,7 +436,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -454,7 +454,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -473,7 +473,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -491,7 +491,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -510,7 +510,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}

24
mcs/class/System/Test/System.ComponentModel/DecimalConverterTests.cs
View File

@@ -149,7 +149,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -164,7 +164,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -182,7 +182,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -201,7 +201,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -219,7 +219,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -238,7 +238,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -253,7 +253,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -268,7 +268,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -286,7 +286,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -305,7 +305,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -323,7 +323,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -342,7 +342,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}

24
mcs/class/System/Test/System.ComponentModel/DoubleConverterTests.cs
View File

@@ -150,7 +150,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -165,7 +165,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -183,7 +183,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -202,7 +202,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -220,7 +220,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -239,7 +239,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -254,7 +254,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -269,7 +269,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -287,7 +287,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -306,7 +306,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -324,7 +324,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -343,7 +343,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}

40
mcs/class/System/Test/System.ComponentModel/Int16ConverterTests.cs
View File

@@ -172,7 +172,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -187,7 +187,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -205,7 +205,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -224,7 +224,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -242,7 +242,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -261,7 +261,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -279,7 +279,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -298,7 +298,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#4");
}
@@ -327,7 +327,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#4");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#4");
Assert.IsNotNull (ex.InnerException, "#5");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#6");
}
@@ -356,7 +356,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#4");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#4");
Assert.IsNotNull (ex.InnerException, "#5");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#6");
}
@@ -371,7 +371,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -386,7 +386,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -404,7 +404,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -423,7 +423,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -441,7 +441,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -460,7 +460,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -478,7 +478,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -497,7 +497,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -523,7 +523,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#4");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#4");
Assert.IsNotNull (ex.InnerException, "#5");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#6");
}
@@ -546,7 +546,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#3");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#3");
Assert.IsNotNull (ex.InnerException, "#4");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#5");
}

16
mcs/class/System/Test/System.ComponentModel/Int32ConverterTests.cs
View File

@@ -138,7 +138,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -152,7 +152,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString(CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -165,7 +165,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -178,7 +178,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (double.MaxValue.ToString (CultureInfo.CurrentCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -191,7 +191,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -205,7 +205,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString (CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -218,7 +218,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -231,7 +231,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (double.MaxValue.ToString (CultureInfo.CurrentCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}

16
mcs/class/System/Test/System.ComponentModel/Int64ConverterTests.cs
View File

@@ -134,7 +134,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -150,7 +150,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -165,7 +165,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -180,7 +180,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -195,7 +195,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -211,7 +211,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -226,7 +226,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -241,7 +241,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}

18
mcs/class/System/Test/System.ComponentModel/SByteConverterTests.cs
View File

@@ -135,7 +135,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -149,7 +149,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString(CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -162,7 +162,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -175,7 +175,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString ("256");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -188,7 +188,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -201,7 +201,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (null, CultureInfo.InvariantCulture, "256");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -214,7 +214,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -227,7 +227,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("256");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}
@@ -240,7 +240,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("#0b10");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (OverflowException), ex.InnerException.GetType (), "#3");
}

16
mcs/class/System/Test/System.ComponentModel/SingleConverterTests.cs
View File

@@ -105,7 +105,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}
@@ -120,7 +120,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}
@@ -135,7 +135,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}
@@ -150,7 +150,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}
@@ -165,7 +165,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}
@@ -180,7 +180,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}
@@ -195,7 +195,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}
@@ -210,7 +210,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#4");
}

14
mcs/class/System/Test/System.ComponentModel/TypeDescriptorTests.cs
View File

@@ -1099,7 +1099,11 @@ namespace MonoTests.System.ComponentModel
public void TestCreateDesigner ()
{
IDesigner des = TypeDescriptor.CreateDesigner (com, typeof(int));
#if MOBILE
Assert.IsNull (des, "#1"); // We exclude DesignerAttribute on BCL types
#else
Assert.IsTrue (des is MyDesigner, "#1");
#endif
des = TypeDescriptor.CreateDesigner (com, typeof(string));
Assert.IsNull (des, "#2");
@@ -1133,24 +1137,33 @@ namespace MonoTests.System.ComponentModel
{
AttributeCollection col = TypeDescriptor.GetAttributes (typeof(MyComponent));
Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#A1");
#if !MOBILE
Assert.IsNotNull (col [typeof (DesignerAttribute)], "#A2");
#endif
Assert.IsNull (col [typeof (EditorAttribute)], "#A3");
col = TypeDescriptor.GetAttributes (com);
Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#B1");
#if !MOBILE
Assert.IsNotNull (col [typeof (DesignerAttribute)], "#B2");
#endif
Assert.IsNull (col [typeof (EditorAttribute)], "#B3");
col = TypeDescriptor.GetAttributes (sitedcom);
Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#C1");
#if !MOBILE
Assert.IsNotNull (col [typeof (DesignerAttribute)], "#C2");
#endif
Assert.IsNotNull (col [typeof (EditorAttribute)], "#C3");
col = TypeDescriptor.GetAttributes (nfscom);
Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#D1");
#if !MOBILE
Assert.IsNotNull (col [typeof (DesignerAttribute)], "#D2");
#endif
Assert.IsNull (col [typeof (EditorAttribute)], "#D3");
#if !MOBILE
col = TypeDescriptor.GetAttributes (typeof (MyDerivedComponent));
Assert.IsNotNull (col [typeof (DesignerAttribute)], "#E1");
Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#E2");
@@ -1171,6 +1184,7 @@ namespace MonoTests.System.ComponentModel
// Shows that attributes are retrieved from the current type, the base types
// and the implemented by the type interfaces.
Assert.AreEqual (3, TypeDescriptor.GetAttributes (typeof (TestDerivedClass)).Count, "#F1");
#endif
}
[Test]

16
mcs/class/System/Test/System.ComponentModel/UInt16ConverterTests.cs
View File

@@ -128,7 +128,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -142,7 +142,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString(CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -155,7 +155,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -168,7 +168,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (double.MaxValue.ToString (CultureInfo.CurrentCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -181,7 +181,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -195,7 +195,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString (CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -208,7 +208,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -221,7 +221,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (double.MaxValue.ToString (CultureInfo.CurrentCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}

16
mcs/class/System/Test/System.ComponentModel/UInt32ConverterTests.cs
View File

@@ -114,7 +114,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -128,7 +128,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString(CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -141,7 +141,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -154,7 +154,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFromString (double.MaxValue.ToString (CultureInfo.CurrentCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -167,7 +167,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (null, CultureInfo.InvariantCulture, "*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -181,7 +181,7 @@ namespace MonoTests.System.ComponentModel
double.MaxValue.ToString (CultureInfo.InvariantCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -194,7 +194,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom ("*1");
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -207,7 +207,7 @@ namespace MonoTests.System.ComponentModel
converter.ConvertFrom (double.MaxValue.ToString (CultureInfo.CurrentCulture));
Assert.Fail ("#1");
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}

16
mcs/class/System/Test/System.ComponentModel/UInt64ConverterTests.cs
View File

@@ -123,7 +123,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -139,7 +139,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -154,7 +154,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -169,7 +169,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -184,7 +184,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -200,7 +200,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -215,7 +215,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}
@@ -230,7 +230,7 @@ namespace MonoTests.System.ComponentModel
} catch (AssertionException) {
throw;
} catch (Exception ex) {
Assert.AreEqual (typeof (Exception), ex.GetType (), "#2");
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNotNull (ex.InnerException, "#3");
Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3");
}

2
mcs/class/System/Test/System.Diagnostics/EventLogTest.cs.REMOVED.git-id
View File

@@ -1 +1 @@
6e63058fed7d5ff90caac0148dcdd7a0b2c8652e
3b03dd8aaab8765848719d0193ce3b2db80cbf51

2
mcs/class/System/Test/System.IO/FileSystemWatcherTest.cs
View File

@@ -22,7 +22,7 @@ namespace MonoTests.System.IO
{
FileSystemWatcher fw = new FileSystemWatcher ();
Assert.AreEqual (fw.EnableRaisingEvents, false, "#01");
Assert.AreEqual (fw.Filter, "*.*", "#02");
Assert.AreEqual (fw.Filter, "*", "#02");
Assert.AreEqual (fw.IncludeSubdirectories, false, "#03");
Assert.AreEqual (fw.InternalBufferSize, 8192, "#04");
Assert.AreEqual (fw.NotifyFilter, NotifyFilters.FileName | NotifyFilters.DirectoryName | NotifyFilters.LastWrite, "#05");

108
mcs/class/System/Test/System.Net.Mail/MailAddressTest.cs
View File

@@ -41,20 +41,6 @@ namespace MonoTests.System.Net.Mail
Assert.AreEqual ("\"Mr. Foo Bar\" <foo@example.com>", address.ToString (), "#B4");
Assert.AreEqual ("foo", address.User, "#B5");
address = new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever@You@Want");
Assert.AreEqual ("foo@example.com", address.Address, "#C1");
Assert.AreEqual ("Mr. F@@ Bar", address.DisplayName, "#C2");
Assert.AreEqual ("example.com", address.Host, "#C3");
Assert.AreEqual ("\"Mr. F@@ Bar\" <foo@example.com>", address.ToString (), "#C4");
Assert.AreEqual ("foo", address.User, "#C5");
address = new MailAddress ("\"Mr. F@@ Bar\" <foo@example.com> Whatever@You@Want");
Assert.AreEqual ("foo@example.com", address.Address, "#D1");
Assert.AreEqual ("Mr. F@@ Bar", address.DisplayName, "#D2");
Assert.AreEqual ("example.com", address.Host, "#D3");
Assert.AreEqual ("\"Mr. F@@ Bar\" <foo@example.com>", address.ToString (), "#D4");
Assert.AreEqual ("foo", address.User, "#D5");
address = new MailAddress ("FooBar <foo@example.com>");
Assert.AreEqual ("foo@example.com", address.Address, "#E1");
Assert.AreEqual ("FooBar", address.DisplayName, "#E2");
@@ -71,9 +57,9 @@ namespace MonoTests.System.Net.Mail
address = new MailAddress ("\" FooBar \"< foo@example.com >");
Assert.AreEqual ("foo@example.com", address.Address, "#G1");
Assert.AreEqual ("FooBar", address.DisplayName, "#G2");
Assert.AreEqual (" FooBar ", address.DisplayName, "#G2");
Assert.AreEqual ("example.com", address.Host, "#G3");
Assert.AreEqual ("\"FooBar\" <foo@example.com>", address.ToString (), "#G4");
Assert.AreEqual ("\" FooBar \" <foo@example.com>", address.ToString (), "#G4");
Assert.AreEqual ("foo", address.User, "#G5");
address = new MailAddress ("<foo@example.com>");
@@ -214,6 +200,24 @@ namespace MonoTests.System.Net.Mail
Assert.IsNull (ex.InnerException, "#I3");
Assert.IsNotNull (ex.Message, "#I4");
}
try {
new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever@You@Want");
Assert.Fail ("#J1");
} catch (FormatException ex) {
Assert.AreEqual (typeof (FormatException), ex.GetType (), "#J2");
Assert.IsNull (ex.InnerException, "#J3");
Assert.IsNotNull (ex.Message, "#J4");
}
try {
new MailAddress ("\"Mr. F@@ Bar\" <foo@example.com> Whatever@You@Want");
Assert.Fail ("#K1");
} catch (FormatException ex) {
Assert.AreEqual (typeof (FormatException), ex.GetType (), "#K2");
Assert.IsNull (ex.InnerException, "#K3");
Assert.IsNotNull (ex.Message, "#K4");
}
}
[Test]
@@ -226,40 +230,50 @@ namespace MonoTests.System.Net.Mail
Assert.AreEqual ("foo@example.com", address.ToString (), "#A4");
Assert.AreEqual ("foo", address.User, "#A5");
address = new MailAddress ("<foo@example.com> WhatEver", " Mr. Foo Bar ");
Assert.AreEqual ("foo@example.com", address.Address, "#B1");
Assert.AreEqual ("Mr. Foo Bar", address.DisplayName, "#B2");
Assert.AreEqual ("example.com", address.Host, "#B3");
Assert.AreEqual ("\"Mr. Foo Bar\" <foo@example.com>", address.ToString (), "#B4");
Assert.AreEqual ("foo", address.User, "#B5");
try {
new MailAddress ("<foo@example.com> WhatEver", " Mr. Foo Bar ");
Assert.Fail ("#B1");
} catch (FormatException ex) {
Assert.AreEqual (typeof (FormatException), ex.GetType (), "#B2");
Assert.IsNull (ex.InnerException, "#B3");
Assert.IsNotNull (ex.Message, "#B4");
}
address = new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", "BarFoo");
Assert.AreEqual ("foo@example.com", address.Address, "#C1");
Assert.AreEqual ("BarFoo", address.DisplayName, "#C2");
Assert.AreEqual ("example.com", address.Host, "#C3");
Assert.AreEqual ("\"BarFoo\" <foo@example.com>", address.ToString (), "#C4");
Assert.AreEqual ("foo", address.User, "#C5");
try {
new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", "BarFoo");
Assert.Fail ("#C1");
} catch (FormatException ex) {
Assert.AreEqual (typeof (FormatException), ex.GetType (), "#C2");
Assert.IsNull (ex.InnerException, "#C3");
Assert.IsNotNull (ex.Message, "#C4");
}
address = new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", string.Empty);
Assert.AreEqual ("foo@example.com", address.Address, "#D1");
Assert.AreEqual (string.Empty, address.DisplayName, "#D2");
Assert.AreEqual ("example.com", address.Host, "#D3");
Assert.AreEqual ("foo@example.com", address.ToString (), "#D4");
Assert.AreEqual ("foo", address.User, "#D5");
try {
new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", string.Empty);
Assert.Fail ("#D1");
} catch (FormatException ex) {
Assert.AreEqual (typeof (FormatException), ex.GetType (), "#D2");
Assert.IsNull (ex.InnerException, "#D3");
Assert.IsNotNull (ex.Message, "#D4");
}
address = new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", (string) null);
Assert.AreEqual ("foo@example.com", address.Address, "#E1");
Assert.AreEqual ("Mr. F@@ Bar", address.DisplayName, "#E2");
Assert.AreEqual ("example.com", address.Host, "#E3");
Assert.AreEqual ("\"Mr. F@@ Bar\" <foo@example.com>", address.ToString (), "#E4");
Assert.AreEqual ("foo", address.User, "#E5");
try {
new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", (string) null);
Assert.Fail ("#E1");
} catch (FormatException ex) {
Assert.AreEqual (typeof (FormatException), ex.GetType (), "#E2");
Assert.IsNull (ex.InnerException, "#E3");
Assert.IsNotNull (ex.Message, "#E4");
}
address = new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", " ");
Assert.AreEqual ("foo@example.com", address.Address, "#F1");
Assert.AreEqual (string.Empty, address.DisplayName, "#F2");
Assert.AreEqual ("example.com", address.Host, "#F3");
Assert.AreEqual ("foo@example.com", address.ToString (), "#F4");
Assert.AreEqual ("foo", address.User, "#F5");
try {
new MailAddress ("Mr. F@@ Bar <foo@example.com> Whatever", " ");
Assert.Fail ("#F1");
} catch (FormatException ex) {
Assert.AreEqual (typeof (FormatException), ex.GetType (), "#F2");
Assert.IsNull (ex.InnerException, "#F3");
Assert.IsNotNull (ex.Message, "#F4");
}
}
[Test]
@@ -270,7 +284,7 @@ namespace MonoTests.System.Net.Mail
ma = new MailAddress ("Hola <foo@bar.com>", "Adios");
Assert.AreEqual (ma.DisplayName, "Adios");
ma = new MailAddress ("Hola <foo@bar.com>", "");
Assert.AreEqual (ma.DisplayName, "");
Assert.AreEqual (ma.DisplayName, "Hola");
}
[Test]

1
mcs/class/System/Test/System.Net.Security/SslStreamTest.cs
View File

@@ -60,6 +60,7 @@ public class SslStreamTest {
[Test] //bug https://bugzilla.novell.com/show_bug.cgi?id=457120
[Category ("MacNotWorking")] // Works but launches a prompt on 10.12 that will fail if you don't click in a few seconds
[Category ("NotWorking")] // https://github.com/mono/mono/issues/8450
#if FEATURE_NO_BSD_SOCKETS
[ExpectedException (typeof (PlatformNotSupportedException))]
#endif

3
mcs/class/System/Test/System.Net/HttpListenerTest.cs
View File

@@ -215,6 +215,7 @@ namespace MonoTests.System.Net {
#else
[ExpectedException (typeof (HttpListenerException))]
#endif
[Category ("NotWorkingRuntimeInterpreter")]
public void TwoListeners_SameURL ()
{
if (!CanOpenPort (port))
@@ -233,6 +234,7 @@ namespace MonoTests.System.Net {
#else
[ExpectedException (typeof (HttpListenerException))]
#endif
[Category ("NotWorkingRuntimeInterpreter")]
public void MultipleSlashes ()
{
if (!CanOpenPort (port))
@@ -249,6 +251,7 @@ namespace MonoTests.System.Net {
#else
[ExpectedException (typeof (HttpListenerException))]
#endif
[Category ("NotWorkingRuntimeInterpreter")]
public void PercentSign ()
{
if (!CanOpenPort (port))

2
mcs/class/System/Test/System.Net/HttpWebRequestTest.cs.REMOVED.git-id
View File

@@ -1 +1 @@
a0154e7ba83fa85a9caed000fd90aa90d75ae63b
0fd53cdea741d804cf43f8d862815523224ef66f

27
mcs/class/System/Test/System.Net/ServicePointTest.cs
View File

@@ -186,33 +186,6 @@ public class ServicePointTest
Assert.IsTrue (called, "#A2");
}
public static void GetRequestStreamCallback (IAsyncResult asynchronousResult)
{
}
[Test] //Covers #19823
#if FEATURE_NO_BSD_SOCKETS
// This test uses HttpWebRequest
[ExpectedException (typeof (PlatformNotSupportedException))]
#endif
public void CloseConnectionGroupConcurency ()
{
// Try with multiple service points
for (var i = 0; i < 10; i++) {
Uri targetUri = new Uri ("http://" + i + ".mono-project.com");
var req = (HttpWebRequest) HttpWebRequest.Create (targetUri);
req.ContentType = "application/x-www-form-urlencoded";
req.Method = "POST";
req.ConnectionGroupName = "" + i;
req.ServicePoint.MaxIdleTime = 1;
req.BeginGetRequestStream (new AsyncCallback (GetRequestStreamCallback), req);
Thread.Sleep (1);
req.ServicePoint.CloseConnectionGroup (req.ConnectionGroupName);
}
}
[Test]
[Category ("RequiresBSDSockets")] // Tests internals, so it doesn't make sense to assert that PlatformNotSupportedExceptions are thrown.
public void DnsRefreshTimeout ()