Lith 4 months ago
parent
commit
d1205b10e1

+ 2 - 2
test/Vitorm.PostgreSQL.MsTest/CommonTest/Orm_Extensions_ExecuteDeleteAsync_Test.cs

@@ -29,7 +29,7 @@ namespace Vitorm.MsTest.CommonTest
 
                 Assert.AreEqual(3, rowCount);
 
-                var newUsers = userQuery.ToList();
+                var newUsers = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual(3, newUsers.Count());
                 Assert.AreEqual(4, newUsers.First().id);
                 Assert.AreEqual(6, newUsers.Last().id);
@@ -43,7 +43,7 @@ namespace Vitorm.MsTest.CommonTest
 
                 Assert.AreEqual(2, rowCount);
 
-                var newUsers = userQuery.ToList();
+                var newUsers = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual(4, newUsers.Count());
                 Assert.AreEqual(1, newUsers.First().id);
                 Assert.AreEqual(3, newUsers[1].id);

+ 2 - 2
test/Vitorm.PostgreSQL.MsTest/CommonTest/Orm_Extensions_ExecuteDelete_Test.cs

@@ -29,7 +29,7 @@ namespace Vitorm.MsTest.CommonTest
 
                 Assert.AreEqual(3, rowCount);
 
-                var newUsers = userQuery.ToList();
+                var newUsers = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual(3, newUsers.Count());
                 Assert.AreEqual(4, newUsers.First().id);
                 Assert.AreEqual(6, newUsers.Last().id);
@@ -43,7 +43,7 @@ namespace Vitorm.MsTest.CommonTest
 
                 Assert.AreEqual(2, rowCount);
 
-                var newUsers = userQuery.ToList();
+                var newUsers = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual(4, newUsers.Count());
                 Assert.AreEqual(1, newUsers.First().id);
                 Assert.AreEqual(3, newUsers[1].id);

+ 2 - 2
test/Vitorm.PostgreSQL.MsTest/CommonTest/Orm_Extensions_ExecuteUpdateAsync_Test.cs

@@ -22,7 +22,7 @@ namespace Vitorm.MsTest.CommonTest
 
                 Assert.AreEqual(6, count);
 
-                var userList = userQuery.ToList();
+                var userList = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual("u_1_4_6", userList.First().name);
                 Assert.AreEqual(DateTime.Parse("2021-01-11 00:00:00"), userList.First().birth);
                 Assert.AreEqual("u_6__", userList.Last().name);
@@ -45,7 +45,7 @@ namespace Vitorm.MsTest.CommonTest
                 Assert.AreEqual(6, count);
 
 
-                var userList = userQuery.ToList();
+                var userList = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual("u2_1_4_6", userList.First().name);
                 Assert.AreEqual("u2_6__", userList.Last().name);
             }

+ 2 - 2
test/Vitorm.PostgreSQL.MsTest/CommonTest/Orm_Extensions_ExecuteUpdate_Test.cs

@@ -24,7 +24,7 @@ namespace Vitorm.MsTest.CommonTest
 
                 Assert.AreEqual(6, count);
 
-                var userList = userQuery.ToList();
+                var userList = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual("u_1_4_6", userList.First().name);
                 Assert.AreEqual(DateTime.Parse("2021-01-11 00:00:00"), userList.First().birth);
                 Assert.AreEqual("u_6__", userList.Last().name);
@@ -47,7 +47,7 @@ namespace Vitorm.MsTest.CommonTest
                 Assert.AreEqual(6, count);
 
 
-                var userList = userQuery.ToList();
+                var userList = userQuery.OrderBy(m => m.id).ToList();
                 Assert.AreEqual("u2_1_4_6", userList.First().name);
                 Assert.AreEqual("u2_6__", userList.Last().name);
             }

+ 2 - 0
test/Vitorm.PostgreSQL.MsTest/ExpressionNodesTest/ExpressionTester.Model.cs

@@ -3,6 +3,8 @@
 
     public abstract partial class ExpressionTester
     {
+        static bool canCalculate = true;
+
         [System.ComponentModel.DataAnnotations.Schema.Table("User2")]
         public class User : Vitorm.MsTest.User
         {

+ 11 - 4
test/Vitorm.PostgreSQL.MsTest/ExpressionNodesTest/ExpressionTester.cs

@@ -7,10 +7,8 @@ using Vit.Linq;
 
 namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
 {
-
     public abstract partial class ExpressionTester
     {
-
         public static List<User> Test(IQueryable<User> query, Expression<Func<User, bool>> predicate)
         {
             var expected = GetSourceData().AsQueryable().Where(predicate).ToList();
@@ -33,12 +31,12 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
         }
 
 
-
         public static void TestQueryable(IQueryable<User> query)
         {
             Expression<Func<User, bool>> predicate;
 
             #region #0 Add, An addition operation, such as a + b, without overflow checking, for numeric operands.
+            if (canCalculate)
             {
                 predicate = u => u.id + 1 == 6;
                 var rows = Test(query, predicate);
@@ -54,13 +52,15 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
             #endregion
 
             #region #7 Coalesce, A node that represents a null coalescing operation, such as (a ?? b)
+            if (canCalculate)
             {
                 predicate = u => (u.fatherId ?? u.id) == 5;
                 var rows = Test(query, predicate);
             }
             #endregion
 
-            #region #8 Conditional, A conditional operation, such as a > b ? a : b 
+            #region #8 Conditional, A conditional operation, such as a > b ? a : b
+            if (canCalculate)
             {
                 predicate = u => (u.id == 2 ? 1 : 0) == 1;
                 var rows = Test(query, predicate);
@@ -75,6 +75,7 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
             #endregion
 
             #region #10 Convert, A cast or conversion operation, such as (SampleType)obj
+            if (canCalculate)
             {
                 predicate = u => ((double)u.id) <= 2.0;
                 var rows = Test(query, predicate);
@@ -82,6 +83,7 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
             #endregion
 
             #region #12 Divide, A division operation, such as (a / b), for numeric operands.
+            if (canCalculate)
             {
                 predicate = u => u.id / 10.0 == 10.0;
                 var rows = Test(query, predicate);
@@ -135,6 +137,7 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
             #endregion
 
             #region #25 Modulo, An arithmetic remainder operation, such as (a % b)
+            if (canCalculate)
             {
                 predicate = u => (u.id % 10) == 0;
                 var rows = Test(query, predicate);
@@ -142,6 +145,7 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
             #endregion
 
             #region #26 Multiply, A multiplication operation, such as (a * b), without overflow checking, for numeric operands
+            if (canCalculate)
             {
                 predicate = u => u.id * 10 == 20;
                 var rows = Test(query, predicate);
@@ -149,6 +153,7 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
             #endregion
 
             #region #28 Negate, An arithmetic negation operation, such as (-a). The object a should not be modified in place.
+            if (canCalculate)
             {
                 predicate = u => -u.id == -2;
                 var rows = Test(query, predicate);
@@ -181,6 +186,7 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
             #endregion
 
             #region #42 Subtract,  A subtraction operation, such as (a - b), without overflow checking
+            if (canCalculate)
             {
                 predicate = u => u.id - 2 == 9;
                 var rows = Test(query, predicate);
@@ -189,6 +195,7 @@ namespace Vit.Linq.ExpressionNodes.ExpressionNodesTest
 
 
             #region Test the priority of mathematical calculations
+            if (canCalculate)
             {
                 predicate = u => 10 + u.id * 10 == 110;
                 var rows = Test(query, predicate);