Cleanup tests

Author: AndriySvyryd

test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationsGeneratorTest.ModelSnapshot.cs

@@ -14,6 +14,7 @@
 using NetTopologySuite;
 using NetTopologySuite.Geometries;
 using Xunit.Sdk;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 // ReSharper disable InconsistentNaming
 // ReSharper disable UnusedAutoPropertyAccessor.Local
@@ -547,16 +548,6 @@ private class EntityWithNullableEnumType
         public Days? Day { get; set; }
     }
 
-    private class BaseEntityWithIntDiscriminator
-    {
-        public int Id { get; set; }
-    }
-
-    private class DerivedEntityWithIntDiscriminator : BaseEntityWithIntDiscriminator
-    {
-        public string Name { get; set; }
-    }
-
     private class ManyToManyLeft
     {
         public int Id { get; set; }
@@ -2537,13 +2528,18 @@ public virtual void Converted_discriminator_annotations_are_stored_in_snapshot()
 """),
             o =>
             {
+                var baseEntityType = o.FindEntityType(typeof(BaseEntityWithStructDiscriminator));
                 Assert.Equal(
                     "Discriminator",
-                    o.FindEntityType(typeof(BaseEntityWithStructDiscriminator))[CoreAnnotationNames.DiscriminatorProperty]);
+                    baseEntityType[CoreAnnotationNames.DiscriminatorProperty]);
 
                 Assert.Equal(
                     "Base",
-                    o.FindEntityType(typeof(BaseEntityWithStructDiscriminator))[CoreAnnotationNames.DiscriminatorValue]);
+                    baseEntityType[CoreAnnotationNames.DiscriminatorValue]);
+
+                var discriminatorProperty = baseEntityType.FindDiscriminatorProperty();
+                Assert.Equal(typeof(int), discriminatorProperty.ClrType);
+                Assert.Equal("Discriminator", discriminatorProperty.Name);
 
                 Assert.Equal(
                     "Another",
@@ -3385,57 +3381,6 @@ public virtual void Discriminator_of_enum_to_string()
                 Assert.False(discriminatorProperty.IsNullable);
             });
 
-    [ConditionalFact]
-    public virtual void Discriminator_with_non_string_default_name_is_stored_in_snapshot()
-        => Test(
-            builder =>
-            {
-                builder.Entity<DerivedEntityWithIntDiscriminator>().HasBaseType<BaseEntityWithIntDiscriminator>();
-                builder.Entity<BaseEntityWithIntDiscriminator>()
-                    .HasDiscriminator<int>("Discriminator")
-                    .HasValue<BaseEntityWithIntDiscriminator>(0)
-                    .HasValue<DerivedEntityWithIntDiscriminator>(1);
-            },
-            AddBoilerPlate(
-                GetHeading()
-                + """
-            modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+BaseEntityWithIntDiscriminator", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Discriminator")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BaseEntityWithIntDiscriminator", "DefaultSchema");
-
-                    b.HasDiscriminator<int>("Discriminator").HasValue(0);
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+DerivedEntityWithIntDiscriminator", b =>
-                {
-                    b.HasBaseType("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+BaseEntityWithIntDiscriminator");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasDiscriminator().HasValue(1);
-                });
-"""),
-            model =>
-            {
-                var discriminatorProperty = model.GetEntityTypes().First().FindDiscriminatorProperty();
-                Assert.Equal(typeof(int), discriminatorProperty.ClrType);
-                Assert.Equal("Discriminator", discriminatorProperty.Name);
-            });
-
     [ConditionalFact]
     public virtual void Temporal_table_information_is_stored_in_snapshot()
         => Test(