Fix failing tests (#32164)

* Fix failing tests * fixup! Fix failing tests Hmm, is there some non-determinism here?
dotnet · Oct 26, 2023 · d4fd971 · d4fd971
1 parent f8d153e
commit d4fd971
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs
@@ -2299,7 +2299,7 @@ void RunInitialization()
             }
 
             model.Customize();
-            _instance = model;
+            _instance = (SpatialTypesContextModel)model.FinalizeModel();
         }
 
         private static SpatialTypesContextModel _instance;
@@ -2329,6 +2329,11 @@ namespace TestNamespace
 {
     public partial class SpatialTypesContextModel
     {
+        private SpatialTypesContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
         partial void Initialize()
         {
             var spatialTypes = SpatialTypesEntityType.Create(this);
@@ -2417,7 +2422,9 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
             var runtimeEntityType = model.AddEntityType(
                 "Microsoft.EntityFrameworkCore.Scaffolding.Internal.CSharpRuntimeModelCodeGeneratorTest+SpatialTypes",
                 typeof(CSharpRuntimeModelCodeGeneratorTest.SpatialTypes),
-                baseEntityType);
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1);
 
             var id = runtimeEntityType.AddProperty(
                 "Id",
@@ -16011,7 +16018,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 baseEntityType,
                 discriminatorValue: "PrincipalBase",
                 derivedTypesCount: 1,
-                propertyCount: 15,
+                propertyCount: 14,
                 navigationCount: 1,
                 skipNavigationCount: 1,
                 unnamedIndexCount: 1,
@@ -31821,7 +31828,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 discriminatorProperty: "Discriminator",
                 discriminatorValue: "PrincipalBase",
                 derivedTypesCount: 1,
-                propertyCount: 16,
+                propertyCount: 15,
                 navigationCount: 1,
                 skipNavigationCount: 1,
                 unnamedIndexCount: 1,