Add tests for all simple types

Author: fabien.menager

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestDbContext.cs

@@ -6,6 +6,7 @@ namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
 public class TestDbContext : TestDbContextBase
 {
     public DbSet<TestEntity> TestEntities { get; set; } = null!;
+    public DbSet<TestEntityWithSimpleTypes> TestEntitiesWithSimpleTypes { get; set; } = null!;
     public DbSet<TestEntityWithJson> TestEntitiesWithJson { get; set; } = null!;
     public DbSet<TestEntityWithGuidId> TestEntitiesWithGuidId { get; set; } = null!;
     public DbSet<TestEntityWithConverters> TestEntitiesWithConverter { get; set; } = null!;

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntity.cs

@@ -19,22 +19,12 @@ public class TestEntity : TestEntityBase
     [Column("some_price")]
     public decimal Price { get; set; }
 
-    [Column("some_float")]
-    public float Float { get; set; } = 10.1f;
-
-    [Column("some_double")]
-    public double Double { get; set; } = 10.1d;
-
     [Column("the_identifier")]
     public Guid Identifier { get; set; }
 
     [Column("nullable_identifier")]
     public Guid? NullableIdentifier { get; set; }
 
-    public DateTime Created { get; set; }
-
-    public DateTime? Modified { get; set; }
-
     [Column("string_enum_value")]
     public StringEnum StringEnumValue { get; set; }
 

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithSimpleTypes.cs

@@ -0,0 +1,42 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+using Microsoft.EntityFrameworkCore;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+[PrimaryKey(nameof(Id))]
+[Table("test_entity_with_simple_types")]
+public class TestEntityWithSimpleTypes : TestEntityBase
+{
+    public int Id { get; set; }
+
+    public required string StringValue { get; set; } = string.Empty;
+
+    public required bool BoolValue { get; set; }
+
+    public required byte ByteValue { get; set; }
+    public required byte[]? ByteArrayValue { get; set; }
+    public required sbyte SByteValue { get; set; }
+    public required char CharValue { get; set; }
+
+    public required short ShortValue { get; set; }
+    public required ushort UShortValue { get; set; }
+
+    public required int IntValue { get; set; }
+    public required uint UIntValue { get; set; }
+
+    public required long LongValue { get; set; }
+    public required ulong ULongValue { get; set; }
+
+    public required float FloatValue { get; set; }
+    public required double DoubleValue { get; set; }
+    public required decimal DecimalValue { get; set; }
+
+    public required DateTime DateTimeValue { get; set; }
+    public required DateOnly DateOnlyValue { get; set; }
+    public required TimeOnly TimeOnlyValue { get; set; }
+    public required TimeSpan TimeSpanValue { get; set; }
+    public required DateTimeOffset DateTimeOffsetValue { get; set; }
+
+    public required Guid GuidValue { get; set; }
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsBase.cs

@@ -1,4 +1,5 @@
 using FluentAssertions;
+using FluentAssertions.Extensions;
 
 using PhenX.EntityFrameworkCore.BulkInsert.Enums;
 using PhenX.EntityFrameworkCore.BulkInsert.Extensions;
@@ -35,8 +36,8 @@ public async Task InsertsEntities(InsertStrategy strategy)
         // Arrange
         var entities = new List<TestEntity>
         {
-            new TestEntity { Name = $"{_run}_Entity1" },
-            new TestEntity { Name = $"{_run}_Entity2" }
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" }
         };
 
         // Act
@@ -56,11 +57,13 @@ public async Task InsertEntities_WithJson(InsertStrategy strategy)
         {
             new TestEntityWithJson
             {
+                TestRun = _run,
                 JsonArray = [1],
                 JsonObject = new JsonDbObject { Code = 1, Name = "Test1" },
             },
             new TestEntityWithJson
             {
+                TestRun = _run,
                 JsonArray = [2],
                 JsonObject = new JsonDbObject { Code = 2, Name = "Test2" },
             },
@@ -109,8 +112,8 @@ public async Task InsertEntities_MoveRows(InsertStrategy strategy)
         // Arrange
         var entities = new List<TestEntity>
         {
-            new TestEntity { Name = $"{_run}_Entity1" },
-            new TestEntity { Name = $"{_run}_Entity2" }
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" }
         };
 
         // Act
@@ -149,6 +152,7 @@ public async Task InsertEntities_Many(InsertStrategy strategy)
         var entities = Enumerable.Range(1, count).Select(i => new TestEntity
         {
             Identifier = Guid.NewGuid(),
+            TestRun = _run,
             Name = $"{_run}_Entity{i}",
             NumericEnumValue = (NumericEnum)(i % 2),
             Price = (decimal)(i * 0.1),
@@ -176,8 +180,8 @@ public async Task InsertEntities_AndReturn_WithEntityWithValueConverters(InsertS
 
         var entities = new List<TestEntityWithConverters>
         {
-            new TestEntityWithConverters() { Name = $"{_run}_Entity1", CreatedAt = now, Uri = null },
-            new TestEntityWithConverters() { Name = $"{_run}_Entity2", CreatedAt = now.AddDays(-1), Uri = new Uri("http://example.com/test") }
+            new TestEntityWithConverters() { TestRun = _run, Name = $"{_run}_Entity1", CreatedAt = now, Uri = null },
+            new TestEntityWithConverters() { TestRun = _run, Name = $"{_run}_Entity2", CreatedAt = now.AddDays(-1), Uri = new Uri("http://example.com/test") }
         };
 
         // Act
@@ -240,8 +244,8 @@ public async Task ThrowsWhenUsingWrongConfigurationType()
         // Arrange
         var entities = new List<TestEntity>
         {
-            new TestEntity { Name = $"{_run}_Entity1" },
-            new TestEntity { Name = $"{_run}_Entity2" }
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" }
         };
 
         // Act & Assert
@@ -277,8 +281,8 @@ public async Task InsertEntities_WithGeneratedGuidId(InsertStrategy strategy)
         // Arrange
         var entities = new List<TestEntityWithGuidId>
         {
-            new TestEntityWithGuidId { Id = Guid.NewGuid(), Name = $"{_run}_Entity1" },
-            new TestEntityWithGuidId { Id = Guid.NewGuid(), Name = $"{_run}_Entity2" }
+            new TestEntityWithGuidId { TestRun = _run, Id = Guid.NewGuid(), Name = $"{_run}_Entity1" },
+            new TestEntityWithGuidId { TestRun = _run, Id = Guid.NewGuid(), Name = $"{_run}_Entity2" }
         };
 
         // Act
@@ -299,16 +303,16 @@ public async Task HandleProgress(InsertStrategy strategy)
         // Arrange
         var entities = new List<TestEntity>
         {
-            new TestEntity { Name = $"{_run}_Entity1" },
-            new TestEntity { Name = $"{_run}_Entity2" },
-            new TestEntity { Name = $"{_run}_Entity3" },
-            new TestEntity { Name = $"{_run}_Entity4" },
-            new TestEntity { Name = $"{_run}_Entity5" },
-            new TestEntity { Name = $"{_run}_Entity6" },
-            new TestEntity { Name = $"{_run}_Entity7" },
-            new TestEntity { Name = $"{_run}_Entity8" },
-            new TestEntity { Name = $"{_run}_Entity9" },
-            new TestEntity { Name = $"{_run}_Entity10" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity3" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity4" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity5" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity6" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity7" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity8" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity9" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity10" },
         };
 
         long progressCount = 0;
@@ -337,10 +341,10 @@ public async Task HandleNoProgress(InsertStrategy strategy)
         // Arrange
         var entities = new List<TestEntity>
         {
-            new TestEntity { Name = $"{_run}_Entity1" },
-            new TestEntity { Name = $"{_run}_Entity2" },
-            new TestEntity { Name = $"{_run}_Entity3" },
-            new TestEntity { Name = $"{_run}_Entity4" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity3" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity4" },
         };
 
         var callCount = 0;
@@ -355,4 +359,88 @@ await _context.InsertWithStrategyAsync(strategy, entities, o =>
         // Assert
         Assert.Equal(0, callCount);
     }
+
+    [SkippableTheory]
+    [CombinatorialData]
+    public async Task InsertEntities_WithAllSimpleTypes(InsertStrategy strategy)
+    {
+        // Arrange
+        var entities = new List<TestEntityWithSimpleTypes>
+        {
+            new TestEntityWithSimpleTypes
+            {
+                TestRun = _run,
+                Id = 1,
+                BoolValue = true,
+                ByteValue = 1,
+                ByteArrayValue =
+                [
+                    1,
+                    2,
+                    3
+                ],
+                SByteValue = -1,
+                ShortValue = 2,
+                IntValue = 3,
+                LongValue = 4,
+                FloatValue = 5.5f,
+                DoubleValue = 6.6,
+                DecimalValue = 7.7m,
+                DateTimeValue = DateTime.UtcNow,
+                DateTimeOffsetValue = DateTimeOffset.UtcNow,
+                TimeSpanValue = TimeSpan.FromHours(1),
+                StringValue = "Test String 2",
+                CharValue = 'a',
+                UShortValue = 10,
+                UIntValue = 50,
+                ULongValue = 200,
+                DateOnlyValue = DateOnly.Parse("1985-10-31"),
+                TimeOnlyValue = TimeOnly.Parse("12:00:00"),
+                GuidValue = Guid.NewGuid(),
+            },
+            new TestEntityWithSimpleTypes
+            {
+                TestRun = _run,
+                Id = 2,
+                BoolValue = false,
+                ByteValue = 10,
+                ByteArrayValue =
+                [
+                    4,
+                    5,
+                    6
+                ],
+                SByteValue = -10,
+                ShortValue = 20,
+                IntValue = 30,
+                LongValue = 40,
+                FloatValue = 50.5f,
+                DoubleValue = 60.6,
+                DecimalValue = 70.7m,
+                DateTimeValue = DateTime.UtcNow.AddDays(1),
+                DateTimeOffsetValue = DateTimeOffset.UtcNow.AddDays(1),
+                TimeSpanValue = TimeSpan.FromHours(2),
+                StringValue = "Test String 2",
+                CharValue = 'b',
+                UShortValue = 50,
+                UIntValue = 20,
+                ULongValue = 100,
+                DateOnlyValue = DateOnly.Parse("2023-10-01"),
+                TimeOnlyValue = TimeOnly.Parse("12:00:00"),
+                GuidValue = Guid.NewGuid(),
+            }
+        };
+
+        // Act
+        var insertedEntities = await _context.InsertWithStrategyAsync(strategy, entities);
+
+        // Assert
+        insertedEntities.Should()
+            .BeEquivalentTo(entities, o => o
+                .Using<DateTime>(ctx => ctx.Subject.Should().BeCloseTo(ctx.Expectation, 1.Seconds())).WhenTypeIs<DateTime>()
+                .Using<DateTimeOffset>(ctx => ctx.Subject.Should().BeCloseTo(ctx.Expectation, 1.Seconds())).WhenTypeIs<DateTimeOffset>()
+                .RespectingRuntimeTypes()
+                .Excluding(e => e.Id)
+            );
+    }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsBase.cs

@@ -14,6 +14,7 @@ namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
 public abstract class GeoTestsBase<TDbContext>(TestDbContainer dbContainer) : IAsyncLifetime
     where TDbContext : TestDbContextGeo, new()
 {
+    private readonly Guid _run = Guid.NewGuid();
     private TDbContext _context = null!;
 
     public async Task InitializeAsync()
@@ -37,8 +38,8 @@ public async Task InsertEntities_WithGeo(InsertStrategy strategy)
 
         var entities = new List<TestEntityWithGeo>
         {
-            new TestEntityWithGeo { GeoObject = geo1 },
-            new TestEntityWithGeo { GeoObject = geo2 }
+            new TestEntityWithGeo { TestRun = _run, GeoObject = geo1 },
+            new TestEntityWithGeo { TestRun = _run, GeoObject = geo2 }
         };
 
         // Act
@@ -59,8 +60,8 @@ public async Task InsertEntities_WithGeo_And_Default_SRID(InsertStrategy strateg
 
         var entities = new List<TestEntityWithGeo>
         {
-            new TestEntityWithGeo { GeoObject = geo1 },
-            new TestEntityWithGeo { GeoObject = geo2 }
+            new TestEntityWithGeo { TestRun = _run, GeoObject = geo1 },
+            new TestEntityWithGeo { TestRun = _run, GeoObject = geo2 }
         };
 
         // Act

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Merge/MergeTestsBase.cs

@@ -67,8 +67,8 @@ public async Task InsertEntities_MultipleTimes_WithGuidId(InsertStrategy strateg
         // Arrange
         var entities = new List<TestEntityWithGuidId>
         {
-            new TestEntityWithGuidId { Id = Guid.NewGuid(), Name = $"{_run}_Entity1" },
-            new TestEntityWithGuidId { Id = Guid.NewGuid(), Name = $"{_run}_Entity2" }
+            new TestEntityWithGuidId { TestRun = _run,Id = Guid.NewGuid(), Name = $"{_run}_Entity1" },
+            new TestEntityWithGuidId { TestRun = _run,Id = Guid.NewGuid(), Name = $"{_run}_Entity2" }
         };
 
         // Act
@@ -97,8 +97,8 @@ public async Task InsertEntities_MultipleTimes_With_Conflict_On_Id(InsertStrateg
         // Arrange
         var entities = new List<TestEntity>
         {
-            new TestEntity { Name = $"{_run}_Entity1" },
-            new TestEntity { Name = $"{_run}_Entity2" }
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" }
         };
 
         // Act
@@ -128,13 +128,13 @@ public async Task InsertEntities_WithConflict_SingleColumn(InsertStrategy strate
         Skip.If(_context.IsProvider(ProviderType.MySql));
 
         // Arrange
-        _context.TestEntities.Add(new TestEntity { Name = $"{_run}_Entity1" });
+        _context.TestEntities.Add(new TestEntity { TestRun = _run,Name = $"{_run}_Entity1" });
         _context.SaveChanges();
         _context.ChangeTracker.Clear();
 
         var entities = new List<TestEntity>
         {
-            new TestEntity { Name = $"{_run}_Entity1" },
+            new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
             new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" },
         };