Add a test for #23059

test/EFCore.Cosmos.FunctionalTests/CustomConvertersCosmosTest.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.TestUtilities;
@@ -151,6 +152,13 @@ public override void Optional_owned_with_converter_reading_non_nullable_column()
             base.Optional_owned_with_converter_reading_non_nullable_column();
         }
 
+        public override void Value_conversion_on_enum_collection_contains()
+        {
+            Assert.Contains(
+                CoreStrings.TranslationFailed("").Substring(47),
+                Assert.Throws<InvalidOperationException>(() => base.Value_conversion_on_enum_collection_contains()).Message);
+        }
+
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 

test/EFCore.Specification.Tests/CustomConvertersTestBase.cs

@@ -121,7 +121,8 @@ public virtual void Can_query_and_update_with_nullable_converter_on_primary_key(
                 var principal = context.Add(
                         new NullablePrincipal
                         {
-                            Id = 1, Dependents = new List<NonNullableDependent> { new() { Id = 1 } }
+                            Id = 1,
+                            Dependents = new List<NonNullableDependent> { new() { Id = 1 } }
                         })
                     .Entity;
 
@@ -572,6 +573,31 @@ public virtual void Value_conversion_with_property_named_value()
                 () => context.Set<EntityWithValueWrapper>().SingleOrDefault(e => e.Wrapper.Value == "foo"));
         }
 
+        [ConditionalFact]
+        public virtual void Value_conversion_on_enum_collection_contains()
+        {
+            using var context = CreateContext();
+            var group = MessageGroup.SomeGroup;
+            var query = context.Set<User23059>()
+                .Where(x => !x.IsSoftDeleted && (x.MessageGroups.Contains(group) || x.MessageGroups.Contains(MessageGroup.All)))
+                .ToList();
+
+            Assert.Single(query);
+        }
+
+        protected class User23059
+        {
+            public int Id { get; set; }
+            public bool IsSoftDeleted { get; set; }
+            public List<MessageGroup> MessageGroups { get; set; }
+        }
+
+        protected enum MessageGroup
+        {
+            All,
+            SomeGroup
+        }
+
         protected class Blog
         {
             private bool _indexerVisible;
@@ -1230,6 +1256,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
                         b.HasData(new Book(new BookId(1)) { Value = "Book1" });
                     });
+
+                modelBuilder.Entity<User23059>(
+                    b =>
+                    {
+                        b.Property(e => e.MessageGroups).HasConversion(
+                            v => string.Join(',', v),
+                            v => v.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x => Enum.Parse<MessageGroup>(x)).ToList(),
+                            new ValueComparer<List<MessageGroup>>(favorStructuralComparisons: true));
+
+                        b.HasData(
+                            new User23059 { Id = 1, IsSoftDeleted = true, MessageGroups = new List<MessageGroup> { MessageGroup.SomeGroup } },
+                            new User23059 { Id = 2, IsSoftDeleted = false, MessageGroups = new List<MessageGroup> { MessageGroup.SomeGroup } });
+                    });
             }
 
             private static class StringToDictionarySerializer

test/EFCore.SqlServer.FunctionalTests/CustomConvertersSqlServerTest.cs

@@ -199,6 +199,9 @@ public virtual void Columns_have_expected_data_types()
 UnicodeDataTypes.StringUnicode ---> [nullable nvarchar] [MaxLength = -1]
 User.Email ---> [nullable nvarchar] [MaxLength = -1]
 User.Id ---> [uniqueidentifier]
+User23059.Id ---> [int] [Precision = 10 Scale = 0]
+User23059.IsSoftDeleted ---> [bit]
+User23059.MessageGroups ---> [nullable nvarchar] [MaxLength = -1]
 ";
 
             Assert.Equal(expected, actual, ignoreLineEndingDifferences: true);
@@ -289,6 +292,13 @@ FROM [Book] AS [b]
 WHERE [b].[Id] = 1");
         }
 
+        public override void Value_conversion_on_enum_collection_contains()
+        {
+            Assert.Contains(
+                CoreStrings.TranslationFailed("").Substring(47),
+                Assert.Throws<InvalidOperationException>(() => base.Value_conversion_on_enum_collection_contains()).Message);
+        }
+
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 

test/EFCore.Sqlite.FunctionalTests/CustomConvertersSqliteTest.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 
@@ -115,6 +116,13 @@ public override void Where_bool_gets_converted_to_equality_when_value_conversion
 WHERE ""b"".""IndexerVisible"" = 'Nay'");
         }
 
+        public override void Value_conversion_on_enum_collection_contains()
+        {
+            Assert.Contains(
+                CoreStrings.TranslationFailed("").Substring(47),
+                Assert.Throws<InvalidOperationException>(() => base.Value_conversion_on_enum_collection_contains()).Message);
+        }
+
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);