Merge branch 'BigIntegerParse'

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

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs
index 5cdf17de1f7dd16d70eb3d145f764a0729088b0f..ddef13f4702f3d0db7191bb95668e8e68a95347c 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs
@@ -80,7 +80,9 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (ExpressionType.OrElse, expr.NodeType, "OrElse#01");
                        Assert.AreEqual (typeof (bool), expr.Type, "OrElse#02");
                        Assert.IsNull (expr.Method, "OrElse#03");
+#if !NET_4_0
                        Assert.AreEqual ("(True || False)", expr.ToString(), "OrElse#04");
+#endif
                }
 
                [Test]
@@ -95,8 +97,10 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (typeof (OpClass), expr.Type, "OrElse#06");
                        Assert.AreEqual (mi, expr.Method, "OrElse#07");
                        Assert.AreEqual ("op_BitwiseOr", expr.Method.Name, "OrElse#08");
+#if !NET_4_0
                        Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) || value(MonoTests.System.Linq.Expressions.OpClass))",
                                expr.ToString(), "OrElse#09");
+#endif
                }
 
                public class BrokenMethod {
@@ -176,6 +180,7 @@ namespace MonoTests.System.Linq.Expressions
                }
 
                [Test]
+               [Category ("NotWorkingInterpreter")]
                public void OrElseTestNullable ()
                {
                        var a = Expression.Parameter (typeof (bool?), "a");
@@ -219,6 +224,7 @@ namespace MonoTests.System.Linq.Expressions
                }
 
                [Test]
+               [Category ("NotWorkingInterpreter")]
                public void OrElseNullableBoolItem ()
                {
                        var i = Expression.Parameter (typeof (Item<bool?>), "i");
@@ -259,6 +265,7 @@ namespace MonoTests.System.Linq.Expressions
                }
 
                [Test]
+               [Category ("NotWorkingInterpreter")]
                public void UserDefinedOrElse ()
                {
                        var l = Expression.Parameter (typeof (Slot), "l");
@@ -276,7 +283,7 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (new Slot (64), orelse (new Slot (64), new Slot (64)));
                        Assert.AreEqual (new Slot (32), orelse (new Slot (32), new Slot (64)));
                }
-
+#if !NET_4_0 // dlr bug 5867
                [Test]
                public void UserDefinedOrElseLiftedToNull ()
                {
@@ -298,8 +305,9 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (new Slot (32), orelse (new Slot (32), null));
                        Assert.AreEqual (null, orelse (null, null));
                }
-
+#endif
                [Test]
+               [Category ("NotWorkingInterpreter")]
                public void UserDefinedOrElseShortCircuit ()
                {
                        var i = Expression.Parameter (typeof (Item<Slot>), "i");
@@ -316,6 +324,7 @@ namespace MonoTests.System.Linq.Expressions
 
                [Test]
                [Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=350228
+               [Category ("NotWorkingInterpreter")]
                public void UserDefinedLiftedOrElseShortCircuit ()
                {
                        var i = Expression.Parameter (typeof (Item<Slot?>), "i");