added support for true "And" and "Or" expressions

- renamed 2 existing unit-tests
- added 2 corresponding unit-tests per each case
- renamed corresponding private methods to be more semantically correct

Author: Igor Toporet

Driver/Linq/Translators/PredicateTranslator.cs

@@ -60,8 +60,9 @@ public IMongoQuery BuildQuery(Expression expression)
 
             switch (expression.NodeType)
             {
+                case ExpressionType.And:
                 case ExpressionType.AndAlso:
-                    query = BuildAndAlsoQuery((BinaryExpression)expression);
+                    query = BuildAndQuery((BinaryExpression)expression);
                     break;
                 case ExpressionType.ArrayIndex:
                     query = BuildBooleanQuery(expression);
@@ -86,8 +87,9 @@ public IMongoQuery BuildQuery(Expression expression)
                 case ExpressionType.Not:
                     query = BuildNotQuery((UnaryExpression)expression);
                     break;
+                case ExpressionType.Or:
                 case ExpressionType.OrElse:
-                    query = BuildOrElseQuery((BinaryExpression)expression);
+                    query = BuildOrQuery((BinaryExpression)expression);
                     break;
                 case ExpressionType.TypeIs:
                     query = BuildTypeIsQuery((TypeBinaryExpression)expression);
@@ -104,7 +106,7 @@ public IMongoQuery BuildQuery(Expression expression)
         }
 
         // private methods
-        private IMongoQuery BuildAndAlsoQuery(BinaryExpression binaryExpression)
+        private IMongoQuery BuildAndQuery(BinaryExpression binaryExpression)
         {
             return Query.And(BuildQuery(binaryExpression.Left), BuildQuery(binaryExpression.Right));
         }
@@ -773,7 +775,7 @@ private IMongoQuery BuildNotQuery(UnaryExpression unaryExpression)
             return Query.Not(queryDocument);
         }
 
-        private IMongoQuery BuildOrElseQuery(BinaryExpression binaryExpression)
+        private IMongoQuery BuildOrQuery(BinaryExpression binaryExpression)
         {
             return Query.Or(BuildQuery(binaryExpression.Left), BuildQuery(binaryExpression.Right));
         }

DriverUnitTests/Linq/SelectQueryTests.cs

@@ -16,7 +16,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 
@@ -6012,6 +6011,29 @@ public void TestWhereXEquals1()
 
         [Test]
         public void TestWhereXEquals1AndYEquals11()
+        {
+            var query = from c in _collection.AsQueryable<C>()
+                        where c.X == 1 & c.Y == 11
+                        select c;
+
+            var translatedQuery = MongoQueryTranslator.Translate(query);
+            Assert.IsInstanceOf<SelectQuery>(translatedQuery);
+            Assert.AreSame(_collection, translatedQuery.Collection);
+            Assert.AreSame(typeof(C), translatedQuery.DocumentType);
+
+            var selectQuery = (SelectQuery)translatedQuery;
+            Assert.AreEqual("(C c) => ((c.X == 1) & (c.Y == 11))", ExpressionFormatter.ToString(selectQuery.Where));
+            Assert.IsNull(selectQuery.OrderBy);
+            Assert.IsNull(selectQuery.Projection);
+            Assert.IsNull(selectQuery.Skip);
+            Assert.IsNull(selectQuery.Take);
+
+            Assert.AreEqual("{ \"x\" : 1, \"y\" : 11 }", selectQuery.BuildQuery().ToJson());
+            Assert.AreEqual(1, Consume(query));
+        }
+
+        [Test]
+        public void TestWhereXEquals1AndAlsoYEquals11()
         {
             var query = from c in _collection.AsQueryable<C>()
                         where c.X == 1 && c.Y == 11
@@ -6126,6 +6148,29 @@ public void TestWhereXEquals1Not()
 
         [Test]
         public void TestWhereXEquals1OrYEquals33()
+        {
+            var query = from c in _collection.AsQueryable<C>()
+                        where c.X == 1 | c.Y == 33
+                        select c;
+
+            var translatedQuery = MongoQueryTranslator.Translate(query);
+            Assert.IsInstanceOf<SelectQuery>(translatedQuery);
+            Assert.AreSame(_collection, translatedQuery.Collection);
+            Assert.AreSame(typeof(C), translatedQuery.DocumentType);
+
+            var selectQuery = (SelectQuery)translatedQuery;
+            Assert.AreEqual("(C c) => ((c.X == 1) | (c.Y == 33))", ExpressionFormatter.ToString(selectQuery.Where));
+            Assert.IsNull(selectQuery.OrderBy);
+            Assert.IsNull(selectQuery.Projection);
+            Assert.IsNull(selectQuery.Skip);
+            Assert.IsNull(selectQuery.Take);
+
+            Assert.AreEqual("{ \"$or\" : [{ \"x\" : 1 }, { \"y\" : 33 }] }", selectQuery.BuildQuery().ToJson());
+            Assert.AreEqual(2, Consume(query));
+        }
+
+        [Test]
+        public void TestWhereXEquals1OrElseYEquals33()
         {
             var query = from c in _collection.AsQueryable<C>()
                         where c.X == 1 || c.Y == 33