2008-01-18 Jb Evain <jbevain@novell.com>
authorJb Evain <jbevain@gmail.com>
Fri, 18 Jan 2008 15:00:20 +0000 (15:00 -0000)
committerJb Evain <jbevain@gmail.com>
Fri, 18 Jan 2008 15:00:20 +0000 (15:00 -0000)
* ExpressionTest_GreaterThan|GreaterThanOrEqual.cs
* ExpressionTest_LessThan|LessThanOrEqual.cs: new tests.

svn path=/trunk/mcs/; revision=93263

mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog
mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_GreaterThan.cs [new file with mode: 0644]
mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_GreaterThanOrEqual.cs [new file with mode: 0644]
mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_LessThan.cs [new file with mode: 0644]
mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_LessThanOrEqual.cs [new file with mode: 0644]

index f0dbbe778904ba1fb17a6f0065f67529d0fb5433..cf960d8d54721711a6a9a1cc7e2abeff18fb6abc 100644 (file)
@@ -1,9 +1,14 @@
-2008-01-18  Jb Evain  <jbevain@novell.com>\r
-\r
-       * ExpressionTest_Negate.cs\r
-       ExpressionTest_Not.cs\r
-       ExpressionTest_UnaryPlus.cs: test for some unary operators.\r
-\r
+2008-01-18  Jb Evain  <jbevain@novell.com>
+
+       * ExpressionTest_GreaterThan|GreaterThanOrEqual.cs
+       * ExpressionTest_LessThan|LessThanOrEqual.cs: new tests.
+
+2008-01-18  Jb Evain  <jbevain@novell.com>
+
+       * ExpressionTest_Negate.cs
+       ExpressionTest_Not.cs
+       ExpressionTest_UnaryPlus.cs: test for some unary operators.
+
 2008-01-16  Jb Evain  <jbevain@novell.com>
 
        * ExpressionTest_CallWithExpression.cs: test for static method.
diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_GreaterThan.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_GreaterThan.cs
new file mode 100644 (file)
index 0000000..0e95597
--- /dev/null
@@ -0,0 +1,110 @@
+//
+// ExpressionTest_GreaterThan.cs
+//
+// Author:
+//   Jb Evain (jbevain@novell.com)
+//
+// (C) 2008 Novell, Inc. (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+using System.Linq;
+using System.Linq.Expressions;
+using NUnit.Framework;
+
+namespace MonoTests.System.Linq.Expressions
+{
+       [TestFixture]
+       public class ExpressionTest_GreaterThan
+       {
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg1Null ()
+               {
+                       Expression.GreaterThan (null, Expression.Constant (1));
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg2Null ()
+               {
+                       Expression.GreaterThan (Expression.Constant (1), null);
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void NoOperatorClass ()
+               {
+                       Expression.GreaterThan (Expression.Constant (new NoOpClass ()), Expression.Constant (new NoOpClass ()));
+               }
+
+               [Test]
+               public void Double ()
+               {
+                       var expr = Expression.GreaterThan (Expression.Constant (2.0), Expression.Constant (1.0));
+                       Assert.AreEqual (ExpressionType.GreaterThan, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 > 1)", expr.ToString ());
+               }
+
+               [Test]
+               public void Integer ()
+               {
+                       var expr = Expression.GreaterThan (Expression.Constant (2), Expression.Constant (1));
+                       Assert.AreEqual (ExpressionType.GreaterThan, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 > 1)", expr.ToString ());
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void MismatchedTypes ()
+               {
+                       Expression.GreaterThan (Expression.Constant (new OpClass ()), Expression.Constant (true));
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void Boolean ()
+               {
+                       Expression.GreaterThan (Expression.Constant (true), Expression.Constant (false));
+               }
+
+               [Test]
+               public void UserDefinedClass ()
+               {
+                       MethodInfo mi = typeof (OpClass).GetMethod ("op_GreaterThan");
+
+                       Assert.IsNotNull (mi);
+
+                       BinaryExpression expr = Expression.GreaterThan (Expression.Constant (new OpClass ()), Expression.Constant (new OpClass ()));
+                       Assert.AreEqual (ExpressionType.GreaterThan, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.AreEqual (mi, expr.Method);
+                       Assert.AreEqual ("op_GreaterThan", expr.Method.Name);
+                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) > value(MonoTests.System.Linq.Expressions.OpClass))", expr.ToString ());
+               }
+       }
+}
diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_GreaterThanOrEqual.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_GreaterThanOrEqual.cs
new file mode 100644 (file)
index 0000000..e97bbc4
--- /dev/null
@@ -0,0 +1,110 @@
+//
+// ExpressionTest_GreaterThanOrEqual.cs
+//
+// Author:
+//   Jb Evain (jbevain@novell.com)
+//
+// (C) 2008 Novell, Inc. (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+using System.Linq;
+using System.Linq.Expressions;
+using NUnit.Framework;
+
+namespace MonoTests.System.Linq.Expressions
+{
+       [TestFixture]
+       public class ExpressionTest_GreaterThanOrEqual
+       {
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg1Null ()
+               {
+                       Expression.GreaterThanOrEqual (null, Expression.Constant (1));
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg2Null ()
+               {
+                       Expression.GreaterThanOrEqual (Expression.Constant (1), null);
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void NoOperatorClass ()
+               {
+                       Expression.GreaterThanOrEqual (Expression.Constant (new NoOpClass ()), Expression.Constant (new NoOpClass ()));
+               }
+
+               [Test]
+               public void Double ()
+               {
+                       var expr = Expression.GreaterThanOrEqual (Expression.Constant (2.0), Expression.Constant (1.0));
+                       Assert.AreEqual (ExpressionType.GreaterThanOrEqual, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 >= 1)", expr.ToString ());
+               }
+
+               [Test]
+               public void Integer ()
+               {
+                       var expr = Expression.GreaterThanOrEqual (Expression.Constant (2), Expression.Constant (1));
+                       Assert.AreEqual (ExpressionType.GreaterThanOrEqual, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 >= 1)", expr.ToString ());
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void MismatchedTypes ()
+               {
+                       Expression.GreaterThanOrEqual (Expression.Constant (new OpClass ()), Expression.Constant (true));
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void Boolean ()
+               {
+                       Expression.GreaterThanOrEqual (Expression.Constant (true), Expression.Constant (false));
+               }
+
+               [Test]
+               public void UserDefinedClass ()
+               {
+                       MethodInfo mi = typeof (OpClass).GetMethod ("op_GreaterThanOrEqual");
+
+                       Assert.IsNotNull (mi);
+
+                       BinaryExpression expr = Expression.GreaterThanOrEqual (Expression.Constant (new OpClass ()), Expression.Constant (new OpClass ()));
+                       Assert.AreEqual (ExpressionType.GreaterThanOrEqual, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.AreEqual (mi, expr.Method);
+                       Assert.AreEqual ("op_GreaterThanOrEqual", expr.Method.Name);
+                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) >= value(MonoTests.System.Linq.Expressions.OpClass))", expr.ToString ());
+               }
+       }
+}
diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_LessThan.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_LessThan.cs
new file mode 100644 (file)
index 0000000..df15627
--- /dev/null
@@ -0,0 +1,110 @@
+//
+// ExpressionTest_LessThan.cs
+//
+// Author:
+//   Jb Evain (jbevain@novell.com)
+//
+// (C) 2008 Novell, Inc. (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+using System.Linq;
+using System.Linq.Expressions;
+using NUnit.Framework;
+
+namespace MonoTests.System.Linq.Expressions
+{
+       [TestFixture]
+       public class ExpressionTest_LessThan
+       {
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg1Null ()
+               {
+                       Expression.LessThan (null, Expression.Constant (1));
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg2Null ()
+               {
+                       Expression.LessThan (Expression.Constant (1), null);
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void NoOperatorClass ()
+               {
+                       Expression.LessThan (Expression.Constant (new NoOpClass ()), Expression.Constant (new NoOpClass ()));
+               }
+
+               [Test]
+               public void Double ()
+               {
+                       var expr = Expression.LessThan (Expression.Constant (2.0), Expression.Constant (1.0));
+                       Assert.AreEqual (ExpressionType.LessThan, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 < 1)", expr.ToString ());
+               }
+
+               [Test]
+               public void Integer ()
+               {
+                       var expr = Expression.LessThan (Expression.Constant (2), Expression.Constant (1));
+                       Assert.AreEqual (ExpressionType.LessThan, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 < 1)", expr.ToString ());
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void MismatchedTypes ()
+               {
+                       Expression.LessThan (Expression.Constant (new OpClass ()), Expression.Constant (true));
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void Boolean ()
+               {
+                       Expression.LessThan (Expression.Constant (true), Expression.Constant (false));
+               }
+
+               [Test]
+               public void UserDefinedClass ()
+               {
+                       MethodInfo mi = typeof (OpClass).GetMethod ("op_LessThan");
+
+                       Assert.IsNotNull (mi);
+
+                       BinaryExpression expr = Expression.LessThan (Expression.Constant (new OpClass ()), Expression.Constant (new OpClass ()));
+                       Assert.AreEqual (ExpressionType.LessThan, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.AreEqual (mi, expr.Method);
+                       Assert.AreEqual ("op_LessThan", expr.Method.Name);
+                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) < value(MonoTests.System.Linq.Expressions.OpClass))", expr.ToString ());
+               }
+       }
+}
diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_LessThanOrEqual.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_LessThanOrEqual.cs
new file mode 100644 (file)
index 0000000..1f64771
--- /dev/null
@@ -0,0 +1,110 @@
+//
+// ExpressionTest_LessThanOrEqual.cs
+//
+// Author:
+//   Jb Evain (jbevain@novell.com)
+//
+// (C) 2008 Novell, Inc. (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+using System.Linq;
+using System.Linq.Expressions;
+using NUnit.Framework;
+
+namespace MonoTests.System.Linq.Expressions
+{
+       [TestFixture]
+       public class ExpressionTest_LessThanOrEqual
+       {
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg1Null ()
+               {
+                       Expression.LessThanOrEqual (null, Expression.Constant (1));
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Arg2Null ()
+               {
+                       Expression.LessThanOrEqual (Expression.Constant (1), null);
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void NoOperatorClass ()
+               {
+                       Expression.LessThanOrEqual (Expression.Constant (new NoOpClass ()), Expression.Constant (new NoOpClass ()));
+               }
+
+               [Test]
+               public void Double ()
+               {
+                       var expr = Expression.LessThanOrEqual (Expression.Constant (2.0), Expression.Constant (1.0));
+                       Assert.AreEqual (ExpressionType.LessThanOrEqual, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 <= 1)", expr.ToString ());
+               }
+
+               [Test]
+               public void Integer ()
+               {
+                       var expr = Expression.LessThanOrEqual (Expression.Constant (2), Expression.Constant (1));
+                       Assert.AreEqual (ExpressionType.LessThanOrEqual, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.IsNull (expr.Method);
+                       Assert.AreEqual ("(2 <= 1)", expr.ToString ());
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void MismatchedTypes ()
+               {
+                       Expression.LessThanOrEqual (Expression.Constant (new OpClass ()), Expression.Constant (true));
+               }
+
+               [Test]
+               [ExpectedException (typeof (InvalidOperationException))]
+               public void Boolean ()
+               {
+                       Expression.LessThanOrEqual (Expression.Constant (true), Expression.Constant (false));
+               }
+
+               [Test]
+               public void UserDefinedClass ()
+               {
+                       MethodInfo mi = typeof (OpClass).GetMethod ("op_LessThanOrEqual");
+
+                       Assert.IsNotNull (mi);
+
+                       BinaryExpression expr = Expression.LessThanOrEqual (Expression.Constant (new OpClass ()), Expression.Constant (new OpClass ()));
+                       Assert.AreEqual (ExpressionType.LessThanOrEqual, expr.NodeType);
+                       Assert.AreEqual (typeof (bool), expr.Type);
+                       Assert.AreEqual (mi, expr.Method);
+                       Assert.AreEqual ("op_LessThanOrEqual", expr.Method.Name);
+                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) <= value(MonoTests.System.Linq.Expressions.OpClass))", expr.ToString ());
+               }
+       }
+}