Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -146,6 +146,7 @@ namespace MonoTests.System.ComponentModel
}
[Test]
[SetCulture("en-GB")]
public void ConvertToString ()
{
CultureInfo culture = new MyCultureInfo ();
@@ -161,7 +162,7 @@ namespace MonoTests.System.ComponentModel
CultureInfo ciDE = new CultureInfo("de-DE");
//
date = new DateTime(2008, 12, 31, 23, 59, 58, 5);
DoTestToString("12/31/2008 11:59 PM", date, ciUS);
DoTestToString("12/31/2008 11:59 pm", date, ciUS);
DoTestToString("31/12/2008 23:59", date, ciGB);
DoTestToString("31.12.2008 23:59", date, ciDE);
DoTestToString("12/31/2008 23:59:58", date, CultureInfo.InvariantCulture);
@@ -189,15 +190,10 @@ namespace MonoTests.System.ComponentModel
DateTimeFormatInfo info = (DateTimeFormatInfo) culture.GetFormat (typeof (DateTimeFormatInfo));
DateTime date = DateTime.Now;
DateTime newDate = (DateTime) converter.ConvertFrom (null, culture, date.ToString("G", info));
Assert.AreEqual (date.Year, newDate.Year, "#1");
Assert.AreEqual (date.Month, newDate.Month, "#2");
Assert.AreEqual (date.Day, newDate.Day, "#3");
Assert.AreEqual (date.Hour, newDate.Hour, "#4");
Assert.AreEqual (date.Minute, newDate.Minute, "#5");
Assert.AreEqual (date.Second, newDate.Second, "#6");
Assert.AreEqual (0, newDate.Millisecond, "#7");
try {
converter.ConvertFrom (null, culture, date.ToString("G", info));
} catch (FormatException) {
}
}
[Test]