2.5.0

test/Vitorm.MongoDB.MsTest/CommonTest/EntityLoader_CustomLoader_Test.cs

@@ -162,7 +162,6 @@ namespace Vitorm.MsTest.CommonTest
                             );
                     }).Where(column => column != null);
 
-
                 var propertyType = new PropertyObjectType(entityType);
                 propertyType.properties = propertyDescriptors.Select(m => (IPropertyDescriptor)m).ToArray();
 

test/Vitorm.MongoDB.MsTest/CommonTest/Query_Distinct_Test.cs

@@ -45,20 +45,20 @@ namespace Vitorm.MsTest.CommonTest
                 Assert.AreEqual(0, fatherIds.Except(new int?[] { 4, 5, null }).Count());
                 Assert.AreEqual(0, motherIds.Except(new int?[] { 6, null }).Count());
             }
-            //{
-            //    var query = userQuery.Select(u => new { user = u, u.fatherId, u.motherId }).Distinct();
+            {
+                var query = userQuery.Select(u => new { user = u, u.fatherId, u.motherId }).Distinct();
 
-            //    var userList = query.ToList();
+                var userList = query.ToList();
 
-            //    Assert.AreEqual(6, userList.Count);
-            //}
-            //{
-            //    var query = userQuery.Distinct();
+                Assert.AreEqual(6, userList.Count);
+            }
+            {
+                var query = userQuery.Distinct();
 
-            //    var userList = query.ToList();
+                var userList = query.ToList();
 
-            //    Assert.AreEqual(6, userList.Count);
-            //}
+                Assert.AreEqual(6, userList.Count);
+            }
 
         }
 

test/Vitorm.MongoDB.MsTest/CommonTest/Query_Method_Test.cs

@@ -200,7 +200,19 @@ namespace Vitorm.MsTest.CommonTest
         }
 
 
+        //[TestMethod]
+        public void Test_ToListAndTotal()
+        {
+            using var dbContext = DataSource.CreateDbContext();
 
+            // ToListAndTotalCount
+            {
+                var query = dbContext.Query<User>().Where(user => user.id > 2).Skip(1).Take(2);
+                var (list, totalCount) = query.ToListAndTotalCount();
+                Assert.AreEqual(2, list.Count);
+                Assert.AreEqual(4, totalCount);
+            }
+        }
 
 
 
@@ -320,10 +332,10 @@ namespace Vitorm.MsTest.CommonTest
             using var dbContext = DataSource.CreateDbContext();
             var userQuery = dbContext.Query<User>();
 
-            //{
-            //    var user = userQuery.OrderBy(m => m.id).Last();
-            //    Assert.AreEqual(6, user?.id);
-            //}
+            {
+                var user = userQuery.OrderBy(m => m.id).Last();
+                Assert.AreEqual(6, user?.id);
+            }
 
             {
                 var user = userQuery.Last(user => user.id == 3);