Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2017-11-23 08:32:33 +0300
committerGitHub <noreply@github.com>2017-11-23 08:32:33 +0300
commit718247da6f31bfa4d440c0530b9d35047f57d9bb (patch)
treea1b2457c471fb9d47c709ba0e9de6b5010119f18 /mcs/class/corlib
parentf1f3ae49f045bcb879825ee0dfeb305508117ed9 (diff)
[bcl] Remove an ObjCRuntime reference from the TimeZone tests, it shouldn't be needed any more, and it prevents the tests from compiling on the monotouch profile. (#6079)
Diffstat (limited to 'mcs/class/corlib')
-rw-r--r--mcs/class/corlib/Test/System/TimeZoneTest.cs24
1 files changed, 1 insertions, 23 deletions
diff --git a/mcs/class/corlib/Test/System/TimeZoneTest.cs b/mcs/class/corlib/Test/System/TimeZoneTest.cs
index 08761df8d3f..15c71a6cf9a 100644
--- a/mcs/class/corlib/Test/System/TimeZoneTest.cs
+++ b/mcs/class/corlib/Test/System/TimeZoneTest.cs
@@ -387,32 +387,10 @@ public class TimeZoneTest {
// two types - if they break then TimeZoneInfo work work at all
// ref: http://bugzilla.xamarin.com/show_bug.cgi?id=1790
- bool incomplete_data_on_simulator_only_bug;
-
[Test]
public void GetSystemTimeZones ()
{
- // if test is executed a second time then it report less than 400 (about 127) items available
- if (incomplete_data_on_simulator_only_bug)
- Assert.Ignore ("known to fail on some iOS simulator versions - see source comments");
-
- try {
- Assert.That (TimeZoneInfo.GetSystemTimeZones ().Count, Is.GreaterThan (400), "GetSystemTimeZones");
- } catch (NullReferenceException) {
- // that's a weird one. It failed on iOS 5.1 *beta* simulator (on Lion) but it worked on *final*
- // now it fails on Snow Leopard the same way (incomplete data) with iOS5 simulator (OS update ?)
- // but it *never*ever* failed on devices
- incomplete_data_on_simulator_only_bug = true;
-#if MONOTOUCH
-
-#if XAMCORE_2_0
- if (ObjCRuntime.Runtime.Arch == ObjCRuntime.Arch.SIMULATOR)
-#elif MONOTOUCH
- if (MonoTouch.ObjCRuntime.Runtime.Arch == MonoTouch.ObjCRuntime.Arch.SIMULATOR)
-#endif
- Assert.Ignore ("known to fail on some iOS simulator versions - see source comments");
-#endif // MONOTOUCH
- }
+ Assert.That (TimeZoneInfo.GetSystemTimeZones ().Count, Is.GreaterThan (400), "GetSystemTimeZones");
}
#endif
}