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

Imported Upstream version 4.2.1.36

Browse Source 
Former-commit-id: f3008ca867fe7e4b7ae9b9a8844c0ad5798925a9
This commit is contained in:
Xamarin Public Jenkins
2015-09-24 06:06:07 -04:00
committed by Jo Shields
parent afe402035c
commit ea5caba957
172 changed files with 6570 additions and 11015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mcs/class/corlib/System.Globalization/CultureInfo.cs
View File

@@ -816,8 +816,15 @@ namespace System.Globalization
CultureInfo ci = new CultureInfo ();
if (!ci.construct_internal_locale_from_name (name)) {
int idx = name.IndexOf ('-');
if (idx < 1 || !ci.construct_internal_locale_from_name (name.Substring (0, idx)))
int idx = name.Length - 1;
if (idx > 0) {
while ((idx = name.LastIndexOf ('-', idx - 1)) > 0) {
if (ci.construct_internal_locale_from_name (name.Substring (0, idx)))
break;
}
}
if (idx <= 0)
throw CreateNotFoundException (src_name);
}

8
mcs/class/corlib/System/TimeZoneInfo.cs
View File

@@ -870,12 +870,12 @@ namespace System
}
// DaylightTime.Start is relative to the Standard time.
if (start != DateTime.MinValue)
start += BaseUtcOffset;
if (!TryAddTicks (start, BaseUtcOffset.Ticks, out start))
start = DateTime.MinValue;
// DaylightTime.End is relative to the DST time.
if (end != DateTime.MinValue)
end += BaseUtcOffset + delta;
if (!TryAddTicks (end, BaseUtcOffset.Ticks + delta.Ticks, out end))
end = DateTime.MinValue;
} else {
AdjustmentRule first = null, last = null;

15
mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
View File

@@ -171,6 +171,21 @@ namespace MonoTests.System.Globalization
ci = CultureInfo.CreateSpecificCulture ("");
Assert.AreEqual (CultureInfo.InvariantCulture, ci, "#5");
ci = CultureInfo.CreateSpecificCulture ("zh-hant");
Assert.AreEqual ("zh-HK", ci.Name, "#6");
ci = CultureInfo.CreateSpecificCulture ("zh-hans");
Assert.AreEqual ("zh-CN", ci.Name, "#7");
ci = CultureInfo.CreateSpecificCulture ("zh-hans-CN");
Assert.AreEqual ("zh-CN", ci.Name, "#8");
ci = CultureInfo.CreateSpecificCulture ("zh-hant-US");
Assert.AreEqual ("zh-HK", ci.Name, "#9");
ci = CultureInfo.CreateSpecificCulture ("az-CyrlM-BR");
Assert.AreEqual ("az-Latn-AZ", ci.Name, "#10");
}
[Test]

2
mcs/class/corlib/Test/System/DateTimeTest.cs
View File

@@ -232,6 +232,7 @@ namespace MonoTests.System
[Test]
[ExpectedException (typeof (ArgumentOutOfRangeException))]
[Category("MobileNotWorking")]
public void AddHoursOutOfRangeException1 ()
{
DateTime t1 = new DateTime (myTicks [1]);
@@ -240,6 +241,7 @@ namespace MonoTests.System
[Test]
[ExpectedException (typeof (ArgumentOutOfRangeException))]
[Category("MobileNotWorking")]
public void AddHoursOutOfRangeException2 ()
{
DateTime t1 = new DateTime (myTicks [1]);

13
mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
View File

@@ -1062,6 +1062,19 @@ namespace MonoTests.System
Assert.AreEqual (new DateTime (2014, 10, 5, 2, 0, 0), changes.Start);
Assert.AreEqual (new DateTime (2014, 4, 6, 3, 0, 0), changes.End);
}
[Test]
public void AllTimeZonesDaylightChanges ()
{
foreach (var tz in TimeZoneInfo.GetSystemTimeZones ()) {
try {
for (var year = 1950; year <= DateTime.Now.Year; year++)
getChanges.Invoke (tz, new object [] {year} );
} catch (Exception e) {
Assert.Fail ("TimeZone " + tz.Id + " exception: " + e.ToString ());
}
}
}
}
}
}