From 53a717b462337477a59ed268623daa0ba364846e Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Fri, 12 Aug 2022 21:52:02 +0200 Subject: [PATCH] Fix RelationalModelTest --- .../Metadata/RelationalModelTest.cs | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs index 7a1ca71841f..4e4f15bf4e7 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs @@ -1084,7 +1084,7 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m Assert.Equal( new[] { nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate) }, ordersInsertSproc.Parameters.Select(m => m.Name)); - + Assert.Equal( new[] { 0, 1, 2 }, ordersInsertSproc.Parameters.Select(m => m.Position)); @@ -1139,7 +1139,7 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m RelationalStrings.TableNotMappedEntityType(nameof(SpecialCustomer), ordersInsertSproc.Name), Assert.Throws( () => ordersInsertSproc.IsOptional(specialCustomerType)).Message); - + var tableMapping = orderInsertMapping.TableMapping; if (mappedToTables) { @@ -1289,7 +1289,7 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m specialCustomerType.GetInsertStoredProcedureMappings().Single(m => m.IncludesDerivedTypes).StoreStoredProcedure.Name); Assert.Null(baseInsertSproc.Schema); Assert.Equal( - new[] { nameof(AbstractBase), nameof(Customer), nameof(ExtraSpecialCustomer), nameof(SpecialCustomer) }, + new[] { nameof(AbstractBase), nameof(AbstractCustomer), nameof(Customer), nameof(ExtraSpecialCustomer), nameof(SpecialCustomer) }, baseInsertSproc.EntityTypeMappings.Select(m => m.EntityType.DisplayName())); Assert.Equal( @@ -1321,7 +1321,7 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m Assert.Null(baseUpdateSproc.Schema); Assert.Equal( - new[] { nameof(AbstractBase), nameof(Customer), nameof(ExtraSpecialCustomer), nameof(SpecialCustomer) }, + new[] { nameof(AbstractBase), nameof(AbstractCustomer), nameof(Customer), nameof(ExtraSpecialCustomer), nameof(SpecialCustomer) }, baseUpdateSproc.EntityTypeMappings.Select(m => m.EntityType.DisplayName())); Assert.Equal( @@ -1353,7 +1353,7 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m Assert.Null(baseDeleteSproc.Schema); Assert.Equal( - new[] { nameof(AbstractBase), nameof(Customer), nameof(ExtraSpecialCustomer), nameof(SpecialCustomer) }, + new[] { nameof(AbstractBase), nameof(AbstractCustomer), nameof(Customer), nameof(ExtraSpecialCustomer), nameof(SpecialCustomer) }, baseDeleteSproc.EntityTypeMappings.Select(m => m.EntityType.DisplayName())); Assert.Equal( @@ -1421,8 +1421,8 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m Assert.Same(idPropertyInsertParameter.StoredProcedure, idPropertyInsertParameter.Table); Assert.Same(idPropertyInsertParameterMapping, idPropertyInsertParameter.FindParameterMapping(abstractBaseType)); - Assert.Equal(3, idProperty.GetInsertStoredProcedureResultColumnMappings().Count()); - Assert.Equal(7, idProperty.GetInsertStoredProcedureParameterMappings().Count()); + Assert.Equal(2, idProperty.GetInsertStoredProcedureResultColumnMappings().Count()); + Assert.Equal(10, idProperty.GetInsertStoredProcedureParameterMappings().Count()); Assert.Equal( new[] { @@ -1451,7 +1451,7 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m Assert.Same(idPropertyUpdateParameterMapping, idPropertyUpdateParameter.FindParameterMapping(abstractBaseType)); Assert.Empty(idProperty.GetUpdateStoredProcedureResultColumnMappings()); - Assert.Equal(10, idProperty.GetUpdateStoredProcedureParameterMappings().Count()); + Assert.Equal(12, idProperty.GetUpdateStoredProcedureParameterMappings().Count()); Assert.Equal( new[] { @@ -1479,7 +1479,7 @@ private static void AssertSprocs(IRelationalModel model, Mapping mapping, bool m Assert.Same(idPropertyDeleteParameter.StoredProcedure, idPropertyDeleteParameter.Table); Assert.Same(idPropertyDeleteParameterMapping, idPropertyDeleteParameter.FindParameterMapping(abstractBaseType)); - Assert.Equal(10, idProperty.GetDeleteStoredProcedureParameterMappings().Count()); + Assert.Equal(12, idProperty.GetDeleteStoredProcedureParameterMappings().Count()); Assert.Equal( new[] { @@ -2012,11 +2012,6 @@ private IRelationalModel CreateTestModel( { cb.InsertUsingStoredProcedure(s => s.HasParameter("SpecialtyAk")); } - else - { - cb.InsertUsingStoredProcedure( - s => s.HasParameter(c => c.Id, p => p.IsOutput())); - } } } }); @@ -2196,7 +2191,7 @@ private IRelationalModel CreateTestModel( else if (mapping == Mapping.TPT) { cb - .InsertUsingStoredProcedure(s => s.HasResultColumn(b => b.Id)) + .InsertUsingStoredProcedure(s => s.HasParameter(b => b.Id)) .UpdateUsingStoredProcedure(s => s.HasParameter(b => b.Id)) .DeleteUsingStoredProcedure(s => s.HasParameter(b => b.Id)); }