Merge pull request #2274 from esdrubal/udpclientreceive

[mono.git] / mcs / class / System.Core / Test / System.Linq.Expressions / ExpressionTest_Equal.cs

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs
index 497955c4a4e2873a32175a4371fd195698cc11fa..5364c0fe3abe1948a00bdbbc064a5d043d2b24d8 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs
@@ -76,9 +76,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (ExpressionType.Equal, expr.NodeType);
                        Assert.AreEqual (typeof (bool), expr.Type);
                        Assert.IsNull (expr.Method);
-#if !NET_4_0
-                       Assert.AreEqual ("(1 = 2)", expr.ToString ());
-#endif
                }
 
                [Test]
@@ -93,6 +90,18 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.IsFalse (eq ());
                }
 
+               [Test]
+               public void StringWithNull ()
+               {
+                       BinaryExpression expr = Expression.Equal (Expression.Constant ("a"), Expression.Constant (null));
+                       Assert.AreEqual (ExpressionType.Equal, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+
+                       var eq = Expression.Lambda<Func<bool>> (expr).Compile ();
+                       Assert.IsFalse (eq ());
+               }
+
                [Test]
                public void Nullable_LiftToNull_SetToFalse ()
                {
@@ -107,9 +116,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (true, expr.IsLifted);
                        Assert.AreEqual (false, expr.IsLiftedToNull);
                        Assert.IsNull (expr.Method);
-#if !NET_4_0
-                       Assert.AreEqual ("(1 = 2)", expr.ToString ());
-#endif
                }
 
                [Test]
@@ -126,9 +132,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (true, expr.IsLifted);
                        Assert.AreEqual (true, expr.IsLiftedToNull);
                        Assert.IsNull (expr.Method);
-#if !NET_4_0
-                       Assert.AreEqual ("(1 = 2)", expr.ToString ());
-#endif
                }
 
                [Test]
@@ -154,9 +157,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (typeof (bool), expr.Type);
                        Assert.AreEqual (mi, expr.Method);
                        Assert.AreEqual ("op_Equality", expr.Method.Name);
-#if !NET_4_0
-                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) = value(MonoTests.System.Linq.Expressions.OpClass))", expr.ToString ());
-#endif
                }
 
                [Test]