Moved EfCore.Ydb.FunctionalTests -> test directory

Author: KirillKurdyukov

src/EfCore.Ydb/src/EfCore.Ydb.csproj

@@ -8,17 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0"/>
+        <PackageReference Include="Ydb.Sdk" Version="0.15.3"/>
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Ydb.Sdk\src\Ydb.Sdk.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Microsoft.EntityFrameworkCore.Relational">
-        <HintPath>..\..\..\..\..\.nuget\packages\microsoft.entityframeworkcore.relational\9.0.0\lib\net8.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
-      </Reference>
+        <Reference Include="Microsoft.EntityFrameworkCore.Relational">
+            <HintPath>..\..\..\..\..\.nuget\packages\microsoft.entityframeworkcore.relational\9.0.0\lib\net8.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+        </Reference>
     </ItemGroup>
 </Project>

src/EfCore.Ydb/src/Extensions/YdbContextOptionsBuilderExtensions.cs

@@ -37,13 +37,11 @@ public static DbContextOptionsBuilder UseEfYdb(
 
         efYdbOptionsAction?.Invoke(new YdbDbContextOptionsBuilder(optionsBuilder));
         return optionsBuilder;
-
     }
 
     // TODO: Right now there are no arguments for constructor, so probably it's ok
     private static YdbOptionsExtension GetOrCreateExtension(DbContextOptionsBuilder options)
-        => options.Options.FindExtension<YdbOptionsExtension>()
-           ?? new YdbOptionsExtension();
+        => options.Options.FindExtension<YdbOptionsExtension>() ?? new YdbOptionsExtension();
 
     private static void ConfigureWarnings(DbContextOptionsBuilder optionsBuilder)
     {

src/EfCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs

@@ -51,10 +51,9 @@ public static IServiceCollection AddEntityFrameworkYdb(this IServiceCollection s
             .TryAdd<IRelationalParameterBasedSqlProcessorFactory, YdbParameterBasedSqlProcessorFactory>()
             .TryAdd<ISqlExpressionFactory, YdbSqlExpressionFactory>()
             .TryAdd<IQueryCompilationContextFactory, YdbQueryCompilationContextFactory>()
-            .TryAddProviderSpecificServices(
-                b => b
-                    .TryAddScoped<IYdbRelationalConnection, YdbRelationalConnection>()
-                    .TryAddScoped<IDbCommandInterceptor, YdbCommandInterceptor>())
+            .TryAddProviderSpecificServices(b => b
+                .TryAddScoped<IYdbRelationalConnection, YdbRelationalConnection>()
+                .TryAddScoped<IDbCommandInterceptor, YdbCommandInterceptor>())
             .TryAddCoreServices();
 
         return serviceCollection;

src/EfCore.Ydb/src/Infrastructure/Internal/YdbModelValidator.cs

@@ -3,12 +3,7 @@
 namespace EfCore.Ydb.Infrastructure.Internal;
 
 // TODO: Not required for mvp
-public class YdbModelValidator : RelationalModelValidator
-{
-    public YdbModelValidator(
-        ModelValidatorDependencies dependencies,
-        RelationalModelValidatorDependencies relationalDependencies
-    ) : base(dependencies, relationalDependencies)
-    {
-    }
-}
+public class YdbModelValidator(
+    ModelValidatorDependencies dependencies,
+    RelationalModelValidatorDependencies relationalDependencies
+) : RelationalModelValidator(dependencies, relationalDependencies);

src/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs renamed to src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs

@@ -9,16 +9,18 @@ namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 public class ComplexTypeBulkUpdatesYdbTest(
     ComplexTypeBulkUpdatesYdbTest.ComplexTypeBulkUpdatesYdbFixture fixture,
     ITestOutputHelper testOutputHelper
-) : ComplexTypeBulkUpdatesRelationalTestBase<ComplexTypeBulkUpdatesYdbTest.ComplexTypeBulkUpdatesYdbFixture>(fixture,
-    testOutputHelper)
+) : ComplexTypeBulkUpdatesRelationalTestBase<ComplexTypeBulkUpdatesYdbTest.ComplexTypeBulkUpdatesYdbFixture>(
+    fixture,
+    testOutputHelper
+)
 {
     public override async Task Delete_entity_type_with_complex_type(bool async)
         => await SharedTestMethods.TestIgnoringBase(
             base.Delete_entity_type_with_complex_type,
             Fixture.TestSqlLoggerFactory,
             async,
             """
-            DELETE FROM `Customer` 
+            DELETE FROM `Customer`
             WHERE `Name` = 'Monty Elias'
             """
         );
@@ -242,7 +244,8 @@ OFFSET @p
             """);
 
     public override async Task Update_collection_inside_complex_type(bool async)
-        => await SharedTestMethods.TestIgnoringBase(
+    {
+        await SharedTestMethods.TestIgnoringBase(
             base.Update_collection_inside_complex_type,
             Fixture.TestSqlLoggerFactory,
             async,
@@ -253,12 +256,25 @@ public override async Task Update_collection_inside_complex_type(bool async)
             """
             UPDATE `Customer`
             SET `ShippingAddress_Tags` = '["new_tag1","new_tag2"]'
-            """
-        );
+            """);
+
+        AssertSql("""
+                  SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+                  FROM `Customer` AS `c`
+                  """);
+        AssertExecuteUpdateSql("""
+                               UPDATE `Customer`
+                               SET `ShippingAddress_Tags` = '["new_tag1","new_tag2"]'
+                               """);
+    }
 
     public class ComplexTypeBulkUpdatesYdbFixture : ComplexTypeBulkUpdatesRelationalFixtureBase
     {
-        protected override ITestStoreFactory TestStoreFactory
-            => YdbTestStoreFactory.Instance;
+        protected override ITestStoreFactory TestStoreFactory => YdbTestStoreFactory.Instance;
     }
+
+    private void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
+
+    private void AssertExecuteUpdateSql(params string[] expected)
+        => Fixture.TestSqlLoggerFactory.AssertBaseline(expected, forUpdate: true);
 }