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

@ -44,9 +44,6 @@ namespace MonoTests.System.Configuration
[TestFixture]
public class SettingsBaseTest
{
#if TARGET_JVM
class CustomerException : Exception { }
#endif
class MySettings : SettingsBase
{
[UserScopedSetting] // ignored in non-ApplicationSettingsBase
@ -235,11 +232,7 @@ namespace MonoTests.System.Configuration
try {
Assert.AreEqual (100, s.Foo, "#1");
Assert.Fail ("#2");
#if !TARGET_JVM
} catch (Win32Exception) {
#else
} catch (CustomerException) {
#endif
}
}
@ -264,11 +257,7 @@ namespace MonoTests.System.Configuration
{
public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext context, SettingsPropertyCollection props)
{
#if !TARGET_JVM
throw new Win32Exception (); // unlikely thrown otherwise.
#else
throw new CustomerException (); // unlikely thrown otherwise.
#endif
}
}