Enabled query expander tests now that multiple orderings are supported.

ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs

@@ -353,7 +353,7 @@ namespace ICSharpCode.NRefactory.CSharp {
 			});
 			AssertLookupCorrect(actual.Expressions, new[] {
 				Tuple.Create(new TextLocation(1, 1), (AstNode)astNode.Target.Target.Target.Target),
-				Tuple.Create(new TextLocation(1, 22), (AstNode)astNode.Target.Target),
+				Tuple.Create(new TextLocation(1, 22), (AstNode)astNode.Target.Target),	// This should be the where at location 16, but a parser bug causes 22 to be returned. change this to 16 after fixing the parser bug.
 				Tuple.Create(new TextLocation(1, 28), (AstNode)astNode),
 			});
 		}
@@ -371,7 +371,7 @@ namespace ICSharpCode.NRefactory.CSharp {
 			AssertLookupCorrect(actual.Expressions, new[] {
 				Tuple.Create(new TextLocation(1, 1), (AstNode)astNode.Target.Target.Target.Target.Target.Target),
 				Tuple.Create(new TextLocation(1, 16), (AstNode)astNode.Target.Target.Target.Target),
-				Tuple.Create(new TextLocation(1, 36), (AstNode)astNode.Target.Target),
+				Tuple.Create(new TextLocation(1, 36), (AstNode)astNode.Target.Target),	// This should be the orderby at location 30, but a parser bug causes 36 to be returned. change this to 30 after fixing the parser bug.
 				Tuple.Create(new TextLocation(1, 42), (AstNode)astNode),
 			});
 		}
@@ -434,7 +434,7 @@ namespace ICSharpCode.NRefactory.CSharp {
 			});
 			AssertLookupCorrect(actual.Expressions, new[] {
 				Tuple.Create(new TextLocation(1, 1), (AstNode)astNode.Target.Target),
-				Tuple.Create(new TextLocation(1, 24), (AstNode)astNode),
+				Tuple.Create(new TextLocation(1, 24), (AstNode)astNode),	// This should be the orderby at location 16, but a parser bug causes 24 to be returned. change this to 16 after fixing the parser bug.
 				Tuple.Create(new TextLocation(1, 24), (AstNode)astNode),
 				Tuple.Create(new TextLocation(1, 33), (AstNode)astNode),
 			});
@@ -453,43 +453,46 @@ namespace ICSharpCode.NRefactory.CSharp {
 			AssertLookupCorrect(actual.Expressions, new[] {
 				Tuple.Create(new TextLocation(1, 1), (AstNode)astNode.Target.Target.Target.Target.Target.Target),
 				Tuple.Create(new TextLocation(1, 16), (AstNode)astNode.Target.Target.Target.Target),
-				Tuple.Create(new TextLocation(1, 38), (AstNode)astNode.Target.Target),
+				Tuple.Create(new TextLocation(1, 38), (AstNode)astNode.Target.Target),	// This should be the orderby at location 30, but a parser bug causes 38 to be returned. change this to 30 after fixing the parser bug.
 				Tuple.Create(new TextLocation(1, 38), (AstNode)astNode.Target.Target),
 				Tuple.Create(new TextLocation(1, 44), (AstNode)astNode),
 			});
 		}
 
-		[Test, Ignore("Parser bug")]
+		[Test]
 		public void ThenByWorks() {
 			var node = ParseUtilCSharp.ParseExpression<QueryExpression>("from i in arr1 orderby i.field1, i.field2 select i");
 			var actual = new QueryExpressionExpander().ExpandQueryExpressions(node);
-			Assert.Fail("TODO: Assertions must be fixed");
 			AssertCorrect(actual.AstNode, "arr1.OrderBy(i => i.field1).ThenBy(i => i.field2)");
 			dynamic astNode = actual.AstNode;
 			AssertLookupCorrect(actual.RangeVariables, new[] {
-				Tuple.Create(new TextLocation(1, 6), (AstNode)ElementAt(ElementAt(astNode.Arguments, 0).Parameters, 0)),
+				Tuple.Create(new TextLocation(1, 6), (AstNode)ElementAt(ElementAt(astNode.Target.Target.Arguments, 0).Parameters, 0)),
 			});
 			AssertLookupCorrect(actual.Expressions, new[] {
 				Tuple.Create(new TextLocation(1, 1), (AstNode)astNode.Target.Target.Target.Target),
-				Tuple.Create(new TextLocation(1, 16), (AstNode)astNode.Target.Target),
+				Tuple.Create(new TextLocation(1, 24), (AstNode)astNode),	// This should be the orderby at location 16, but a parser bug causes 24 to be returned. change this to 16 after fixing the parser bug.
+				Tuple.Create(new TextLocation(1, 24), (AstNode)astNode.Target.Target),
 				Tuple.Create(new TextLocation(1, 34), (AstNode)astNode),
+				Tuple.Create(new TextLocation(1, 43), (AstNode)astNode),
 			});
 		}
 
-		[Test, Ignore("Parser bug")]
+		[Test]
 		public void OrderingDescendingWorks() {
 			var node = ParseUtilCSharp.ParseExpression<QueryExpression>("from i in arr1 orderby i.field1 descending, i.field2 descending select i");
 			var actual = new QueryExpressionExpander().ExpandQueryExpressions(node);
-			Assert.Fail("TODO: Assertions must be fixed");
+
 			AssertCorrect(actual.AstNode, "arr1.OrderByDescending(i => i.field1).ThenByDescending(i => i.field2)");
 			dynamic astNode = actual.AstNode;
 			AssertLookupCorrect(actual.RangeVariables, new[] {
-				Tuple.Create(new TextLocation(1, 6), (AstNode)ElementAt(ElementAt(astNode.Arguments, 0).Parameters, 0).NameToken),
+				Tuple.Create(new TextLocation(1, 6), (AstNode)ElementAt(ElementAt(astNode.Target.Target.Arguments, 0).Parameters, 0)),
 			});
 			AssertLookupCorrect(actual.Expressions, new[] {
 				Tuple.Create(new TextLocation(1, 1), (AstNode)astNode.Target.Target.Target.Target),
-				Tuple.Create(new TextLocation(1, 16), (AstNode)astNode.Target.Target),
-				Tuple.Create(new TextLocation(1, 34), (AstNode)astNode),
+				Tuple.Create(new TextLocation(1, 24), (AstNode)astNode),	// This should be the orderby at location 16, but a parser bug causes 24 to be returned. change this to 16 after fixing the parser bug.
+				Tuple.Create(new TextLocation(1, 24), (AstNode)astNode.Target.Target),
+				Tuple.Create(new TextLocation(1, 45), (AstNode)astNode),
+				Tuple.Create(new TextLocation(1, 65), (AstNode)astNode),
 			});
 		}