Improve tests

fabien.menager · fabien.menager · commit 08d5acfaff07 · 2026-01-13T22:55:23.000+01:00
diff --git a/src/EntityFrameworkCore.Projectables.Generator/ExpressionSyntaxRewriter.cs b/src/EntityFrameworkCore.Projectables.Generator/ExpressionSyntaxRewriter.cs
@@ -389,7 +389,7 @@ public ExpressionSyntaxRewriter(INamedTypeSymbol targetTypeSymbol, NullCondition
         public override SyntaxNode? VisitInitializerExpression(InitializerExpressionSyntax node)
         {
             // Only handle object initializers that might contain indexer assignments
-            if (node.Kind() != SyntaxKind.ObjectInitializerExpression)
+            if (!node.IsKind(SyntaxKind.ObjectInitializerExpression))
             {
                 return base.VisitInitializerExpression(node);
             }
diff --git a/tests/EntityFrameworkCore.Projectables.Generator.Tests/ProjectionExpressionGeneratorTests.DictionaryIndexInitializer_IsBeingRewritten.verified.txt b/tests/EntityFrameworkCore.Projectables.Generator.Tests/ProjectionExpressionGeneratorTests.DictionaryIndexInitializer_IsBeingRewritten.verified.txt
@@ -11,13 +11,17 @@ namespace EntityFrameworkCore.Projectables.Generated
     [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
     static class Foo_EntityExtensions_ToDictionary
     {
-        static global::System.Linq.Expressions.Expression<global::System.Func<global::Foo.EntityExtensions.Entity, global::System.Collections.Generic.Dictionary<string, string>>> Expression()
+        static global::System.Linq.Expressions.Expression<global::System.Func<global::Foo.EntityExtensions.Entity, global::System.Collections.Generic.Dictionary<string, object>>> Expression()
         {
-            return (global::Foo.EntityExtensions.Entity entity) => new Dictionary<string, string>
+            return (global::Foo.EntityExtensions.Entity entity) => new Dictionary<string, object>
             {
                 {
                     "FullName",
                     entity.FullName ?? "N/A"
+                },
+                {
+                    "Id",
+                    entity.Id.ToString()
                 }
             };
         }
diff --git a/tests/EntityFrameworkCore.Projectables.Generator.Tests/ProjectionExpressionGeneratorTests.DictionaryObjectInitializer_PreservesCollectionInitializerSyntax.verified.txt b/tests/EntityFrameworkCore.Projectables.Generator.Tests/ProjectionExpressionGeneratorTests.DictionaryObjectInitializer_PreservesCollectionInitializerSyntax.verified.txt
diff --git a/tests/EntityFrameworkCore.Projectables.Generator.Tests/ProjectionExpressionGeneratorTests.cs b/tests/EntityFrameworkCore.Projectables.Generator.Tests/ProjectionExpressionGeneratorTests.cs
@@ -1922,10 +1922,11 @@ public record Entity
         }
 
         [Projectable(NullConditionalRewriteSupport = NullConditionalRewriteSupport.Rewrite)]
-        public static Dictionary<string, string> ToDictionary(this Entity entity)
-            => new Dictionary<string, string> 
+        public static Dictionary<string, object> ToDictionary(this Entity entity)
+            => new Dictionary<string, object> 
             {
-                [""FullName""] = entity.FullName ?? ""N/A"" 
+                [""FullName""] = entity.FullName ?? ""N/A"",
+                [""Id""] = entity.Id.ToString(),
             };
     }
 }
@@ -1940,7 +1941,7 @@ public static Dictionary<string, string> ToDictionary(this Entity entity)
         }
         
         [Fact]
-        public Task DictionaryObjectInitializer_IsNotBeingRewritten()
+        public Task DictionaryObjectInitializer_PreservesCollectionInitializerSyntax()
         {
             // lang=csharp
             var compilation = CreateCompilation(@"

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ public ExpressionSyntaxRewriter(INamedTypeSymbol targetTypeSymbol, NullCondition`
`389`	`389`	`public override SyntaxNode? VisitInitializerExpression(InitializerExpressionSyntax node)`
`390`	`390`	`{`
`391`	`391`	`// Only handle object initializers that might contain indexer assignments`
`392`		`- if (node.Kind() != SyntaxKind.ObjectInitializerExpression)`
	`392`	`+ if (!node.IsKind(SyntaxKind.ObjectInitializerExpression))`
`393`	`393`	`{`
`394`	`394`	`return base.VisitInitializerExpression(node);`
`395`	`395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,17 @@ namespace EntityFrameworkCore.Projectables.Generated`
`11`	`11`	`[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]`
`12`	`12`	`static class Foo_EntityExtensions_ToDictionary`
`13`	`13`	`{`
`14`		`- static global::System.Linq.Expressions.Expression<global::System.Func<global::Foo.EntityExtensions.Entity, global::System.Collections.Generic.Dictionary<string, string>>> Expression()`
	`14`	`+ static global::System.Linq.Expressions.Expression<global::System.Func<global::Foo.EntityExtensions.Entity, global::System.Collections.Generic.Dictionary<string, object>>> Expression()`
`15`	`15`	`{`
`16`		`- return (global::Foo.EntityExtensions.Entity entity) => new Dictionary<string, string>`
	`16`	`+ return (global::Foo.EntityExtensions.Entity entity) => new Dictionary<string, object>`
`17`	`17`	`{`
`18`	`18`	`{`
`19`	`19`	`"FullName",`
`20`	`20`	`entity.FullName ?? "N/A"`
	`21`	`+ },`
	`22`	`+ {`
	`23`	`+ "Id",`
	`24`	`+ entity.Id.ToString()`
`21`	`25`	`}`
`22`	`26`	`};`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1922,10 +1922,11 @@ public record Entity`
`1922`	`1922`	`}`
`1923`	`1923`
`1924`	`1924`	`[Projectable(NullConditionalRewriteSupport = NullConditionalRewriteSupport.Rewrite)]`
`1925`		`- public static Dictionary<string, string> ToDictionary(this Entity entity)`
`1926`		`- => new Dictionary<string, string>`
	`1925`	`+ public static Dictionary<string, object> ToDictionary(this Entity entity)`
	`1926`	`+ => new Dictionary<string, object>`
`1927`	`1927`	`{`
`1928`		`- [""FullName""] = entity.FullName ?? ""N/A""`
	`1928`	`+ [""FullName""] = entity.FullName ?? ""N/A"",`
	`1929`	`+ [""Id""] = entity.Id.ToString(),`
`1929`	`1930`	`};`
`1930`	`1931`	`}`
`1931`	`1932`	`}`
`@@ -1940,7 +1941,7 @@ public static Dictionary<string, string> ToDictionary(this Entity entity)`
`1940`	`1941`	`}`
`1941`	`1942`
`1942`	`1943`	`[Fact]`
`1943`		`- public Task DictionaryObjectInitializer_IsNotBeingRewritten()`
	`1944`	`+ public Task DictionaryObjectInitializer_PreservesCollectionInitializerSyntax()`
`1944`	`1945`	`{`
`1945`	`1946`	`// lang=csharp`
`1946`	`1947`	`var compilation = CreateCompilation(@"`