From bb8f50a973b6f4b98606026c74eb6fd76c47de6b Mon Sep 17 00:00:00 2001 From: Laurents Meyer Date: Sun, 25 Oct 2020 18:22:44 +0100 Subject: [PATCH] Update tests to also support lower case identifier server settings. (#1215) --- .../MySqlDatabaseModelFactoryTest.cs | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs index e593caa88..0c5b5ca12 100644 --- a/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs @@ -459,10 +459,10 @@ PRIMARY KEY (`Name`, `Brand`(20)) { var pk = dbModel.Tables.Single().PrimaryKey; - Assert.Equal("IceCreams", pk.Table.Name); + Assert.Equal("IceCreams", pk.Table.Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(2, pk.Columns.Count); - Assert.Equal("Name", pk.Columns[0].Name); - Assert.Equal("Brand", pk.Columns[1].Name); + Assert.Equal("Name", pk.Columns[0].Name, StringComparer.OrdinalIgnoreCase); + Assert.Equal("Brand", pk.Columns[1].Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(new [] { 0, 20 }, pk.FindAnnotation(MySqlAnnotationNames.IndexPrefixLength)?.Value); }, @"DROP TABLE IF EXISTS `IceCreams`;"); @@ -627,11 +627,11 @@ PRIMARY KEY (`IceCreamId`) { var index = Assert.Single(dbModel.Tables.Single().Indexes); - Assert.Equal("IceCreams", index.Table.Name); - Assert.Equal("IX_IceCreams_Brand_Name", index.Name); + Assert.Equal("IceCreams", index.Table.Name, StringComparer.OrdinalIgnoreCase); + Assert.Equal("IX_IceCreams_Brand_Name", index.Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(2, index.Columns.Count); - Assert.Equal("Name", index.Columns[0].Name); - Assert.Equal("Brand", index.Columns[1].Name); + Assert.Equal("Name", index.Columns[0].Name, StringComparer.OrdinalIgnoreCase); + Assert.Equal("Brand", index.Columns[1].Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(new [] { 0, 20 }, index.FindAnnotation(MySqlAnnotationNames.IndexPrefixLength)?.Value); }, @"DROP TABLE IF EXISTS `IceCreams`;"); @@ -658,12 +658,12 @@ PRIMARY KEY (`IceCreamId`) { var index = Assert.Single(dbModel.Tables.Single().Indexes); - Assert.Equal("IceCreams", index.Table.Name); - Assert.Equal("IX_IceCreams_Brand_Name_1", index.Name); + Assert.Equal("IceCreams", index.Table.Name, StringComparer.OrdinalIgnoreCase); + Assert.Equal("IX_IceCreams_Brand_Name_1", index.Name, StringComparer.OrdinalIgnoreCase); Assert.True(index.IsUnique); Assert.Equal(2, index.Columns.Count); - Assert.Equal("Name", index.Columns[0].Name); - Assert.Equal("Brand", index.Columns[1].Name); + Assert.Equal("Name", index.Columns[0].Name, StringComparer.OrdinalIgnoreCase); + Assert.Equal("Brand", index.Columns[1].Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(new [] { 0, 40 }, index[MySqlAnnotationNames.IndexPrefixLength]); }, @"DROP TABLE IF EXISTS `IceCreams`;"); @@ -690,12 +690,12 @@ PRIMARY KEY (`IceCreamId`) { var index = Assert.Single(dbModel.Tables.Single().Indexes); - Assert.Equal("IceCreams", index.Table.Name); - Assert.Equal("IX_IceCreams_Brand_Name_1", index.Name); + Assert.Equal("IceCreams", index.Table.Name, StringComparer.OrdinalIgnoreCase); + Assert.Equal("IX_IceCreams_Brand_Name_1", index.Name, StringComparer.OrdinalIgnoreCase); Assert.True(index.IsUnique); Assert.Equal(2, index.Columns.Count); - Assert.Equal("Name", index.Columns[0].Name); - Assert.Equal("Brand", index.Columns[1].Name); + Assert.Equal("Name", index.Columns[0].Name, StringComparer.OrdinalIgnoreCase); + Assert.Equal("Brand", index.Columns[1].Name, StringComparer.OrdinalIgnoreCase); Assert.Null(index[MySqlAnnotationNames.IndexPrefixLength]); }, @"DROP TABLE IF EXISTS `IceCreams`;"); @@ -719,9 +719,9 @@ PRIMARY KEY (`IceCreamId`) { var index = Assert.Single(dbModel.Tables.Single().Indexes); - Assert.Equal("IceCreams", index.Table.Name); + Assert.Equal("IceCreams", index.Table.Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(1, index.Columns.Count); - Assert.Equal("Name", index.Columns[0].Name); + Assert.Equal("Name", index.Columns[0].Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(true, index.FindAnnotation(MySqlAnnotationNames.FullTextIndex)?.Value); }, @"DROP TABLE IF EXISTS `IceCreams`;"); @@ -745,9 +745,9 @@ PRIMARY KEY (`IceCreamShopId`) { var index = Assert.Single(dbModel.Tables.Single().Indexes); - Assert.Equal("IceCreamShop", index.Table.Name); + Assert.Equal("IceCreamShop", index.Table.Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(1, index.Columns.Count); - Assert.Equal("Location", index.Columns[0].Name); + Assert.Equal("Location", index.Columns[0].Name, StringComparer.OrdinalIgnoreCase); Assert.Equal(true, index.FindAnnotation(MySqlAnnotationNames.SpatialIndex)?.Value); }, @"DROP TABLE IF EXISTS `IceCreamShop`;");