projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1695 from gregoryyoung/master
[mono.git]
/
mcs
/
class
/
System
/
Test
/
System.ComponentModel
/
CultureInfoConverterTest.cs
diff --git
a/mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
b/mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
index decc8dcdda139dca9c513bc79cec108563378ab4..c00738da1b0a236c46f660690484389228c78b21 100644
(file)
--- a/
mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
+++ b/
mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
@@
-96,7
+96,6
@@
namespace MonoTests.System.ComponentModel
[Test]
public void ConvertFrom_String_InvalidCulture ()
{
[Test]
public void ConvertFrom_String_InvalidCulture ()
{
-#if NET_2_0
try {
converter.ConvertFrom (null, CultureInfo.InvariantCulture,
"(default)");
try {
converter.ConvertFrom (null, CultureInfo.InvariantCulture,
"(default)");
@@
-111,7
+110,6
@@
namespace MonoTests.System.ComponentModel
Assert.IsTrue (ex.Message.IndexOf ("(default)") != -1, "#A6");
Assert.IsNull (ex.ParamName, "#A7");
}
Assert.IsTrue (ex.Message.IndexOf ("(default)") != -1, "#A6");
Assert.IsNull (ex.ParamName, "#A7");
}
-#endif
try {
converter.ConvertFrom (null, CultureInfo.InvariantCulture,
try {
converter.ConvertFrom (null, CultureInfo.InvariantCulture,