You've already forked linux-packaging-mono
Imported Upstream version 4.0.0~alpha1
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
@ -60,52 +60,42 @@ namespace MonoTests.System.ComponentModel
|
||||
"nl-BE");
|
||||
Assert.AreEqual (new CultureInfo ("nl-BE"), c, "#2");
|
||||
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"Dut");
|
||||
Assert.AreEqual (new CultureInfo ("nl"), c, "#3");
|
||||
try {
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"Dut");
|
||||
Assert.Fail ("#3");
|
||||
} catch (ArgumentException) {
|
||||
}
|
||||
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"Dutch (Bel");
|
||||
Assert.AreEqual (new CultureInfo ("nl-BE"), c, "#4");
|
||||
try {
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"Dutch (Bel");
|
||||
Assert.Fail ("#4");
|
||||
} catch (ArgumentException) {
|
||||
}
|
||||
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"duTcH (Bel");
|
||||
Assert.AreEqual (new CultureInfo ("nl-BE"), c, "#5");
|
||||
try {
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"duTcH (Bel");
|
||||
Assert.Fail ("#5");
|
||||
} catch (ArgumentException) {
|
||||
}
|
||||
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"(Default)");
|
||||
Assert.AreEqual (CultureInfo.InvariantCulture, c, "#6");
|
||||
|
||||
#if ONLY_1_1
|
||||
c = (CultureInfo) converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"(defAuLt)");
|
||||
Assert.AreEqual (CultureInfo.InvariantCulture, c, "#6");
|
||||
#endif
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ConvertFrom_String_IncompleteName ()
|
||||
{
|
||||
try {
|
||||
converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"nl-B");
|
||||
Assert.Fail ("#1");
|
||||
} catch (ArgumentException ex) {
|
||||
// The nl-B culture cannot be converted to a
|
||||
// CultureInfo object on this computer
|
||||
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
|
||||
Assert.IsNull (ex.InnerException, "#3");
|
||||
Assert.IsNotNull (ex.Message, "#4");
|
||||
Assert.IsTrue (ex.Message.IndexOf (typeof (CultureInfo).Name) != -1, "#5");
|
||||
Assert.IsTrue (ex.Message.IndexOf ("nl-B") != -1, "#6");
|
||||
Assert.IsNull (ex.ParamName, "#7");
|
||||
}
|
||||
converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"nl-B");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ConvertFrom_String_InvalidCulture ()
|
||||
{
|
||||
#if NET_2_0
|
||||
try {
|
||||
converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
"(default)");
|
||||
@ -120,7 +110,6 @@ namespace MonoTests.System.ComponentModel
|
||||
Assert.IsTrue (ex.Message.IndexOf ("(default)") != -1, "#A6");
|
||||
Assert.IsNull (ex.ParamName, "#A7");
|
||||
}
|
||||
#endif
|
||||
|
||||
try {
|
||||
converter.ConvertFrom (null, CultureInfo.InvariantCulture,
|
||||
@ -177,7 +166,7 @@ namespace MonoTests.System.ComponentModel
|
||||
|
||||
result = converter.ConvertToString (null, CultureInfo.InvariantCulture,
|
||||
new MyCultureInfo ());
|
||||
Assert.AreEqual ("display", result, "#1");
|
||||
Assert.AreEqual ("nl-BE", result, "#1");
|
||||
|
||||
result = converter.ConvertToString (null, CultureInfo.InvariantCulture,
|
||||
null);
|
||||
@ -189,7 +178,7 @@ namespace MonoTests.System.ComponentModel
|
||||
|
||||
result = converter.ConvertToString (null, CultureInfo.InvariantCulture,
|
||||
new CultureInfo ("nl-BE"));
|
||||
Assert.AreEqual ("Dutch (Belgium)", result, "#4");
|
||||
Assert.AreEqual ("nl-BE", result, "#4");
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
|
Reference in New Issue
Block a user