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

Imported Upstream version 3.10.0

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
View File

@@ -288,9 +288,7 @@ namespace MonoTests.System.Configuration {
// This test will fail when there are newer versions
// of the test assemblies - so conditionalize it in
// such cases.
#if TARGET_JVM
string expected = "MonoTests.System.Configuration.ProviderPoker, System.Test, Version=0.0.0.0";
#elif NET_4_5
#if NET_4_5
string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_5, Version=0.0.0.0";
#elif NET_4_0
string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_0, Version=0.0.0.0";

11
mcs/class/System/Test/System.Configuration/SettingsBaseTest.cs
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
}
}