2008-01-09 Jb Evain <jbevain@novell.com>

	* ExpressionTest_ArrayLength.cs: Fix Rank2String to pass on .net.

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

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog b/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog
index 8d96f5459db51b685c6e083e431a897ae26d76da..2224a119366ac22359409c46ef3f16628add852c 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-09  Jb Evain  <jbevain@novell.com>
+
+       * ExpressionTest_ArrayLength.cs: Fix Rank2String to pass on .net.
+
 2008-01-09  Jb Evain  <jbevain@novell.com>
 
        * ExpressionTest_Call.cs: fix wrong test.

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_ArrayLength.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_ArrayLength.cs
index 5745e5b8f0d7d5616aff468b7d49bb41096d8150..50bcdbc4d984c2946de7c72c49caf480bb663284 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_ArrayLength.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_ArrayLength.cs
@@ -58,15 +58,12 @@ namespace MonoTests.System.Linq.Expressions
         }
 
         [Test]
+               [ExpectedException (typeof (ArgumentException))]
         public void Rank2String ()
         {
-            string[,] array = {{ "a", "b", "c" }, { "a", "b", "c" }};
+            string[,] array = {{ }, { }};
             
-            UnaryExpression expr = Expression.ArrayLength (Expression.Constant (array));
-            Assert.AreEqual (ExpressionType.ArrayLength, expr.NodeType, "ArrayLength#05");
-            Assert.AreEqual (typeof (int), expr.Type, "ArrayLength#06");
-            Assert.IsNull (expr.Method, "ArrayLength#07");
-            Assert.AreEqual ("ArrayLength(value(System.String[,]))", expr.ToString(), "ArrayLength#08");
+            Expression.ArrayLength (Expression.Constant (array));
         }
     }
 }