Refactored test

Luticate2.Auth.Tests/Business/ExpressionConverter/ExpressionConverterTests.cs

@@ -49,181 +49,125 @@ namespace Luticate2.Auth.Tests.Business.ExpressionConverter
             return new LuExpressionConverterVisitor(GetConverterOptions(), GetServiceProvider());
         }
 
-        [Fact]
-        public void TestSimpleProperty1()
+        public static IEnumerable<object[]> GetTests()
         {
-            Expression<Func<TestDbo2, Guid>> expDbo = (x => x.TestDbo1.Id);
-            Expression<Func<TestModel2, Guid>> expModel = (Param_0 => Param_0.test_model1.id);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestSimpleProperty2()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => x.TestDbo1.Id == Guid.Empty);
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => Param_0.test_model1.id == Guid.Empty);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestSimpleProperty3()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => x.TestDbo1.Name.Length == 2);
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => Param_0.test_model1.name.Length == 2);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestStaticProperty1()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => (x.TestDbo1.Name == "42") == StaticDbo.StaticField);
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => (Param_0.test_model1.name == "42") == StaticDbo.StaticField);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestStaticProperty2()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => (x.TestDbo1.Name == "42") == StaticDbo.StaticProperty);
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => (Param_0.test_model1.name == "42") == StaticDbo.StaticProperty);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestVirtualProperty1()
-        {
-            Expression<Func<TestDbo2, string>> expDbo = (x => x.NameVirtual);
-            Expression<Func<TestModel2, string>> expModel = (Param_0 => Param_0.name == null ? "[no data]" : Param_0.name + " " + Param_0.name);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestVirtualProperty2()
-        {
-            Expression<Func<TestDbo2, string>> expDbo = (x => x.Parent.NameVirtual);
-            Expression<Func<TestModel2, string>> expModel = (Param_0 => Param_0.parent.name == null ? "[no data]" : Param_0.parent.name + " " + Param_0.parent.name);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestStaticValue1()
-        {
-            Expression<Func<TestDbo2, int>> expDbo = (x => 0);
-            Expression<Func<TestModel2, int>> expModel = (Param_0 => 0);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestStaticValue2()
-        {
-            Expression<Func<TestDbo2, TestDbo2>> expDbo = (x => x);
-            Expression<Func<TestModel2, TestModel2>> expModel = (Param_0 => Param_0);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestStaticValue3()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => StaticDbo.StaticField);
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => StaticDbo.StaticField);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestComplexExpression1()
-        {
-            Expression<Func<TestDbo2, int>> expDbo = (x => (x.Name + " " + x.Name).Length);
-            Expression<Func<TestModel2, int>> expModel = (Param_0 => (Param_0.name + " " + Param_0.name).Length);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestComplexExpression2()
-        {
-            Expression<Func<TestDbo2, int>> expDbo = (x => (x.NameVirtual + " " + x.Name).Length);
-            Expression<Func<TestModel2, int>> expModel = (Param_0 => ((Param_0.name == null ? "[no data]" : (Param_0.name + " " + Param_0.name)) + " " + Param_0.name).Length);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestSimpleMethodSimpleArg1()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => x.Name.Contains("s"));
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => Param_0.name.Contains("s"));
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestSimpleMethodSimpleArg2()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => x.TestDbo1.Name.Contains("s"));
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => Param_0.test_model1.name.Contains("s"));
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestSimpleMethodSimpleArg3()
-        {
-            Expression<Func<TestDbo2, string>> expDbo = (x => x.TestDbo1.ToString());
-            Expression<Func<TestModel2, string>> expModel = (Param_0 => Param_0.test_model1.id + ": " + Param_0.test_model1.name);
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestSimpleMethodAdvArg1()
-        {
-            Expression<Func<TestDbo2, bool>> expDbo = (x => x.TestDbo1.Name.Contains(x.Name));
-            Expression<Func<TestModel2, bool>> expModel = (Param_0 => Param_0.test_model1.name.Contains(Param_0.name));
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
-        }
-
-        [Fact]
-        public void TestAdvMethodSimpleArg1()
-        {
-            Expression<Func<TestDbo1, bool>> expDbo = (x => x.TestDbo2s.Any());
-            Expression<Func<TestModel1, bool>> expModel = (Param_0 => Param_0.test_model2.Any());
-            var converter = GetConverter();
-            var result = converter.Visit(expDbo);
-            Assert.Equal(expModel.ToString(), result?.ToString());
+            return new List<object[]>
+            {
+                new object[]
+                {
+                    "TestSimpleProperty1",
+                    (Expression<Func<TestDbo2, Guid>>) (x => x.TestDbo1.Id),
+                    (Expression<Func<TestModel2, Guid>>) (Param_0 => Param_0.test_model1.id)
+                },
+                new object[]
+                {
+                    "TestSimpleProperty2",
+                    (Expression<Func<TestDbo2, bool>>) (x => x.TestDbo1.Id == Guid.Empty),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => Param_0.test_model1.id == Guid.Empty)
+                },
+                new object[]
+                {
+                    "TestSimpleProperty3",
+                    (Expression<Func<TestDbo2, bool>>) (x => x.TestDbo1.Name.Length == 2),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => Param_0.test_model1.name.Length == 2)
+                },
+                new object[]
+                {
+                    "TestStaticProperty1",
+                    (Expression<Func<TestDbo2, bool>>) (x => (x.TestDbo1.Name == "42") == StaticDbo.StaticField),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => (Param_0.test_model1.name == "42") == StaticDbo.StaticField)
+                },
+                new object[]
+                {
+                    "TestStaticProperty2",
+                    (Expression<Func<TestDbo2, bool>>) (x => (x.TestDbo1.Name == "42") == StaticDbo.StaticProperty),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => (Param_0.test_model1.name == "42") == StaticDbo.StaticProperty)
+                },
+                new object[]
+                {
+                    "TestVirtualProperty1",
+                    (Expression<Func<TestDbo2, string>>) (x => x.NameVirtual),
+                    (Expression<Func<TestModel2, string>>) (Param_0 => Param_0.name == null ? "[no data]" : Param_0.name + " " + Param_0.name)
+                },
+                new object[]
+                {
+                    "TestVirtualProperty2",
+                    (Expression<Func<TestDbo2, string>>) (x => x.Parent.NameVirtual),
+                    (Expression<Func<TestModel2, string>>) (Param_0 => Param_0.parent.name == null ? "[no data]" : Param_0.parent.name + " " + Param_0.parent.name)
+                },
+                new object[]
+                {
+                    "TestStaticValue1",
+                    (Expression<Func<TestDbo2, int>>) (x => 0),
+                    (Expression<Func<TestModel2, int>>) (Param_0 => 0)
+                },
+                new object[]
+                {
+                    "TestStaticValue2",
+                    (Expression<Func<TestDbo2, TestDbo2>>) (x => x),
+                    (Expression<Func<TestModel2, TestModel2>>) (Param_0 => Param_0)
+                },
+                new object[]
+                {
+                    "TestStaticValue3",
+                    (Expression<Func<TestDbo2, bool>>) (x => StaticDbo.StaticField),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => StaticDbo.StaticField)
+                },
+                new object[]
+                {
+                    "TestComplexExpression1",
+                    (Expression<Func<TestDbo2, int>>) (x => (x.Name + " " + x.Name).Length),
+                    (Expression<Func<TestModel2, int>>) (Param_0 => (Param_0.name + " " + Param_0.name).Length)
+                },
+                new object[]
+                {
+                    "TestComplexExpression2",
+                    (Expression<Func<TestDbo2, int>>) (x => (x.NameVirtual + " " + x.Name).Length),
+                    (Expression<Func<TestModel2, int>>) (Param_0 => ((Param_0.name == null ? "[no data]" : (Param_0.name + " " + Param_0.name)) + " " + Param_0.name).Length)
+                },
+                new object[]
+                {
+                    "TestSimpleMethodSimpleArg1",
+                    (Expression<Func<TestDbo2, bool>>) (x => x.Name.Contains("s")),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => Param_0.name.Contains("s"))
+                },
+                new object[]
+                {
+                    "TestSimpleMethodSimpleArg2",
+                    (Expression<Func<TestDbo2, bool>>) (x => x.TestDbo1.Name.Contains("s")),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => Param_0.test_model1.name.Contains("s"))
+                },
+                new object[]
+                {
+                    "TestSimpleMethodSimpleArg3",
+                    (Expression<Func<TestDbo2, string>>) (x => x.TestDbo1.ToString()),
+                    (Expression<Func<TestModel2, string>>) (Param_0 => Param_0.test_model1.id + ": " + Param_0.test_model1.name)
+                },
+                new object[]
+                {
+                    "TestSimpleMethodAdvArg1",
+                    (Expression<Func<TestDbo2, bool>>) (x => x.TestDbo1.Name.Contains(x.Name)),
+                    (Expression<Func<TestModel2, bool>>) (Param_0 => Param_0.test_model1.name.Contains(Param_0.name))
+                },
+                new object[]
+                {
+                    "TestAdvMethodSimpleArg1",
+                    (Expression<Func<TestDbo1, bool>>) (x => x.TestDbo2s.Any()),
+                    (Expression<Func<TestModel1, bool>>) (Param_0 => Param_0.test_model2.Any())
+                },
+                new object[]
+                {
+                    "TestAdvMethodAdvArg1",
+                    (Expression<Func<TestDbo1, bool>>) (x => x.TestDbo2s.Any(y => y.Name.Contains(x.Name + "s"))),
+                    (Expression<Func<TestModel1, bool>>) (Param_0 => Param_0.test_model2.Any(Param_1 => Param_1.name.Contains(Param_0.name + "s")))
+                }
+            };
         }
 
-        [Fact]
-        public void TestAdvMethodAdvArg1()
+        [Theory]
+        [MemberData(nameof(GetTests))]
+        public void Test(string testName, LambdaExpression expDbo, LambdaExpression expModel)
         {
-            Expression<Func<TestDbo1, bool>> expDbo = (x => x.TestDbo2s.Any(y => y.Name.Contains(x.Name + "s")));
-            Expression<Func<TestModel1, bool>> expModel = (Param_0 => Param_0.test_model2.Any(Param_1 => Param_1.name.Contains(Param_0.name + "s")));
             var converter = GetConverter();
             var result = converter.Visit(expDbo);
             Assert.Equal(expModel.ToString(), result?.ToString());