Fix: Correctly working Tests

AnnaSasDev · AnnaSasDev · commit 95f932e5cf21 · 2025-02-03T22:07:39.000+01:00
diff --git a/CodeOfChaos.Types.sln b/CodeOfChaos.Types.sln
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeOfChaos.Types.UnitOfWor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.CodeOfChaos.Types.UnitOfWork", "tests\Tests.CodeOfChaos.Types.UnitOfWork\Tests.CodeOfChaos.Types.UnitOfWork.csproj", "{58C5DC7B-083F-42B0-AE5E-A7F662C0EF39}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeOfChoas.Types.UnitOfWork.Contracts", "src\CodeOfChoas.Types.UnitOfWork.Contracts\CodeOfChoas.Types.UnitOfWork.Contracts.csproj", "{9B998187-74B9-4B75-83DD-76CF822BAFB3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +74,10 @@ Global
 		{58C5DC7B-083F-42B0-AE5E-A7F662C0EF39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{58C5DC7B-083F-42B0-AE5E-A7F662C0EF39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{58C5DC7B-083F-42B0-AE5E-A7F662C0EF39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B998187-74B9-4B75-83DD-76CF822BAFB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B998187-74B9-4B75-83DD-76CF822BAFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B998187-74B9-4B75-83DD-76CF822BAFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B998187-74B9-4B75-83DD-76CF822BAFB3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{26284571-0E09-4BAF-8C2B-DF87DCC1BA0B} = {8DD280D4-1E14-4D5E-AFE6-58DD8F079DCC}
@@ -84,5 +90,6 @@ Global
 		{46E31210-89A5-4E2B-8C89-4757ED54E869} = {8DD280D4-1E14-4D5E-AFE6-58DD8F079DCC}
 		{938BE8FB-AAB5-4D15-82FC-DFABC83DB2F1} = {197E72AD-DEAB-4350-AFC3-A3BB38720BF5}
 		{58C5DC7B-083F-42B0-AE5E-A7F662C0EF39} = {8DD280D4-1E14-4D5E-AFE6-58DD8F079DCC}
+		{9B998187-74B9-4B75-83DD-76CF822BAFB3} = {197E72AD-DEAB-4350-AFC3-A3BB38720BF5}
 	EndGlobalSection
 EndGlobal
diff --git a/src/CodeOfChaos.Types.UnitOfWork/CodeOfChaos.Types.UnitOfWork.csproj b/src/CodeOfChaos.Types.UnitOfWork/CodeOfChaos.Types.UnitOfWork.csproj
@@ -13,6 +13,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\CodeOfChaos.Types\CodeOfChaos.Types.csproj" />
+      <ProjectReference Include="..\CodeOfChoas.Types.UnitOfWork.Contracts\CodeOfChoas.Types.UnitOfWork.Contracts.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/CodeOfChaos.Types.UnitOfWork/UnitOfWork.cs b/src/CodeOfChaos.Types.UnitOfWork/UnitOfWork.cs
@@ -38,7 +38,11 @@ public virtual async ValueTask<bool> TryCreateTransactionAsync(CancellationToken
         if (_transaction != null) return false;
         
         TDbContext dbContext = await _db.GetValueAsync(ct);
-        if (dbContext.Database.CurrentTransaction != null) return false;
+        if (dbContext.Database.CurrentTransaction != null) {
+            // Something went wrong during saving before and the transaction wasn't set by the unit of work
+            _transaction = dbContext.Database.CurrentTransaction;
+            return true;
+        }
         
         _transaction = await dbContext.Database.BeginTransactionAsync(ct);
         
@@ -49,7 +53,7 @@ public virtual async ValueTask<bool> TryRollbackTransactionAsync(CancellationTok
         if (_transaction == null) return false;
 
         await _transaction.RollbackAsync(ct);
-        _transaction.Dispose();
+        await _transaction.DisposeAsync();
         _transaction = null;
 
         return true;
@@ -92,11 +96,7 @@ public virtual TRepo GetRepository<TRepo>() where TRepo : class, IRepository {
     }
 
     public virtual async ValueTask DisposeAsync() {
-        if (_transaction != null) {
-            await TryRollbackTransactionAsync();
-            await _transaction.DisposeAsync();
-            _transaction = null;
-        }
+        if (_transaction != null) await TryRollbackTransactionAsync();
 
         if (!AttachedRepositories.IsEmpty) {
             // First detach all references to this unit of work
diff --git a/src/CodeOfChoas.Types.UnitOfWork.Contracts/CodeOfChoas.Types.UnitOfWork.Contracts.csproj b/src/CodeOfChoas.Types.UnitOfWork.Contracts/CodeOfChoas.Types.UnitOfWork.Contracts.csproj
@@ -0,0 +1,16 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        
+        <RootNamespace>CodeOfChaos.Types.UnitOfWork</RootNamespace>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <PackageReference Include="CodeOfChaos.Extensions.DependencyInjection" Version="0.32.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/CodeOfChoas.Types.UnitOfWork.Contracts/IRepository.cs b/src/CodeOfChoas.Types.UnitOfWork.Contracts/IRepository.cs
diff --git a/src/CodeOfChoas.Types.UnitOfWork.Contracts/IUnitOfWork.cs b/src/CodeOfChoas.Types.UnitOfWork.Contracts/IUnitOfWork.cs
diff --git a/src/CodeOfChoas.Types.UnitOfWork.Contracts/IUnitOfWorkFactory.cs b/src/CodeOfChoas.Types.UnitOfWork.Contracts/IUnitOfWorkFactory.cs
diff --git a/tests/Tests.CodeOfChaos.Types.TypedValueStore/TypedValueStoreTest.cs b/tests/Tests.CodeOfChaos.Types.TypedValueStore/TypedValueStoreTest.cs
@@ -387,7 +387,7 @@ public async Task GetOrAdd_ShouldReturnExistingValue() {
 
         // Act
         // Try to get the value using GetOrAdd, if the key exists it should return the existing value
-        var result = store.GetOrAdd(key, () => newValue);
+        string? result = store.GetOrAdd(key, () => newValue);
 
         // Assert
         await Assert.That(result).IsEqualTo(existingValue).Because("Expected the existing value to be returned.");
diff --git a/tests/Tests.CodeOfChaos.Types.UnitOfWork/Assets/DefaultDbContext.cs b/tests/Tests.CodeOfChaos.Types.UnitOfWork/Assets/DefaultDbContext.cs
@@ -0,0 +1,14 @@
+﻿// ---------------------------------------------------------------------------------------------------------------------
+// Imports
+// ---------------------------------------------------------------------------------------------------------------------
+using Microsoft.EntityFrameworkCore;
+
+namespace Tests.CodeOfChaos.Types.UnitOfWork.Assets;
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Code
+// ---------------------------------------------------------------------------------------------------------------------
+public class DefaultDbContext : DbContext {
+    public DefaultDbContext() : base() {}
+    public DefaultDbContext(DbContextOptions<DefaultDbContext> options) : base(options) {}
+}
diff --git a/tests/Tests.CodeOfChaos.Types.UnitOfWork/Assets/MockDbContext.cs b/tests/Tests.CodeOfChaos.Types.UnitOfWork/Assets/MockDbContext.cs
@@ -0,0 +1,15 @@
+﻿// ---------------------------------------------------------------------------------------------------------------------
+// Imports
+// ---------------------------------------------------------------------------------------------------------------------
+using Microsoft.EntityFrameworkCore;
+
+namespace Tests.CodeOfChaos.Types.UnitOfWork.Assets;
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Code
+// ---------------------------------------------------------------------------------------------------------------------
+public class MockDbContext : DbContext {
+    public MockDbContext() : base() {}
+    public MockDbContext(DbContextOptions<MockDbContext> options) : base(options) { }
+        
+}
diff --git a/tests/Tests.CodeOfChaos.Types.UnitOfWork/Assets/OtherDbContext.cs b/tests/Tests.CodeOfChaos.Types.UnitOfWork/Assets/OtherDbContext.cs
@@ -0,0 +1,14 @@
+﻿// ---------------------------------------------------------------------------------------------------------------------
+// Imports
+// ---------------------------------------------------------------------------------------------------------------------
+using Microsoft.EntityFrameworkCore;
+
+namespace Tests.CodeOfChaos.Types.UnitOfWork.Assets;
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Code
+// ---------------------------------------------------------------------------------------------------------------------
+public class OtherDbContext : DbContext {
+    public OtherDbContext() : base() {}
+    public OtherDbContext(DbContextOptions<OtherDbContext> options) : base(options) {}
+}
diff --git a/tests/Tests.CodeOfChaos.Types.UnitOfWork/ServiceCollectionTests.cs b/tests/Tests.CodeOfChaos.Types.UnitOfWork/ServiceCollectionTests.cs
@@ -4,6 +4,7 @@
 using CodeOfChaos.Types.UnitOfWork;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using Tests.CodeOfChaos.Types.UnitOfWork.Assets;
 
 namespace Tests.CodeOfChaos.Types.UnitOfWork;
 
@@ -72,14 +73,4 @@ await Assert.That(otherUnitOfWork).IsNotNull()
             .And.IsTypeOf<UnitOfWork<OtherDbContext>>();
         
     }
-
-    public class DefaultDbContext : DbContext {
-        public DefaultDbContext() : base() {}
-        public DefaultDbContext(DbContextOptions<DefaultDbContext> options) : base(options) {}
-    }
-
-    public class OtherDbContext : DbContext {
-        public OtherDbContext() : base() {}
-        public OtherDbContext(DbContextOptions<OtherDbContext> options) : base(options) {}
-    }
 }
diff --git a/tests/Tests.CodeOfChaos.Types.UnitOfWork/Tests.CodeOfChaos.Types.UnitOfWork.csproj b/tests/Tests.CodeOfChaos.Types.UnitOfWork/Tests.CodeOfChaos.Types.UnitOfWork.csproj
@@ -8,6 +8,8 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.1" />
+      <PackageReference Include="Moq" Version="4.20.72" />
       <PackageReference Include="TUnit" Version="0.10.6" />
     </ItemGroup>
 
diff --git a/tests/Tests.CodeOfChaos.Types.UnitOfWork/UnitOfWorkFactoryTests.cs b/tests/Tests.CodeOfChaos.Types.UnitOfWork/UnitOfWorkFactoryTests.cs
@@ -0,0 +1,105 @@
+﻿// ---------------------------------------------------------------------------------------------------------------------
+// Imports
+// ---------------------------------------------------------------------------------------------------------------------
+using CodeOfChaos.Types.UnitOfWork;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Tests.CodeOfChaos.Types.UnitOfWork.Assets;
+
+namespace Tests.CodeOfChaos.Types.UnitOfWork;
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Code
+// ---------------------------------------------------------------------------------------------------------------------
+public class UnitOfWorkFactoryTests {
+    private Mock<IDbContextFactory<MockDbContext>> _dbContextFactory = default!;
+    private Mock<IServiceProvider> _serviceProvider = default!;
+    private Mock<IServiceScope> _serviceScope = default!;
+    private Mock<ILogger<UnitOfWorkFactory<MockDbContext>>> _logger = default!;
+    private UnitOfWorkFactory<MockDbContext> _factory = default!;
+    private Mock<IServiceScopeFactory> _scopeFactory = default!;
+    private Mock<IServiceScope> _scope = default!;
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Setup
+    // -----------------------------------------------------------------------------------------------------------------
+    [Before(Test)]
+    public void Setup() {
+        _dbContextFactory = new Mock<IDbContextFactory<MockDbContext>>();
+        _serviceProvider = new Mock<IServiceProvider>();
+        _serviceScope = new Mock<IServiceScope>();
+        _logger = new Mock<ILogger<UnitOfWorkFactory<MockDbContext>>>();
+        _scopeFactory = new Mock<IServiceScopeFactory>();
+        _scope = new Mock<IServiceScope>();
+
+        // Mock DbContext behavior
+        var mockDbContext = new Mock<MockDbContext>();
+
+        // Mock the DatabaseFacade explicitly
+        var mockDatabaseFacade = new Mock<DatabaseFacade>(mockDbContext.Object);
+        mockDatabaseFacade
+            .Setup(db => db.CurrentTransaction)
+            .Returns(() => null);
+
+        mockDbContext
+            .Setup(db => db.Database)
+            .Returns(mockDatabaseFacade.Object);
+
+        _dbContextFactory
+            .Setup(factory => factory.CreateDbContextAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync(mockDbContext.Object);
+
+        // Mock IServiceScopeFactory and IServiceScope
+        _serviceProvider
+            .Setup(sp => sp.GetService(typeof(IServiceScopeFactory)))
+            .Returns(_scopeFactory.Object);
+        _scopeFactory
+            .Setup(sf => sf.CreateScope())
+            .Returns(_scope.Object);
+        _serviceScope
+            .Setup(s => s.ServiceProvider)
+            .Returns(_serviceProvider.Object);
+
+        // Create test factory
+        _factory = new UnitOfWorkFactory<MockDbContext>(_dbContextFactory.Object, _serviceProvider.Object, _logger.Object);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Tests
+    // -----------------------------------------------------------------------------------------------------------------
+    [Test]
+    public async Task Create_ShouldReturnUnitOfWork() {
+        // Act
+        IUnitOfWork unitOfWork = _factory.Create();
+
+        // Assert
+        await Assert.That(unitOfWork).IsNotNull();
+        await Assert.That(unitOfWork).IsTypeOf<UnitOfWork<MockDbContext>>();
+        _scopeFactory.Verify(sf => sf.CreateScope(), Times.Once);
+    }
+
+    [Test]
+    public async Task CreateWithTransactionAsync_ShouldCreateUnitOfWorkWithTransaction() {
+        // Arrange: Mock DbContext
+        _serviceProvider
+            .Setup(sp => sp.GetService(typeof(IServiceScopeFactory)))
+            .Returns(_scopeFactory.Object);
+        _scopeFactory
+            .Setup(sf => sf.CreateScope())
+            .Returns(_scope.Object);
+        _scope
+            .Setup(s => s.ServiceProvider)
+            .Returns(_serviceProvider.Object);
+
+        // Act
+        IUnitOfWork unitOfWork = await _factory.CreateWithTransactionAsync();
+
+        // Assert: Validate that UnitOfWork is created and a transaction is attempted
+        await Assert.That(unitOfWork).IsNotNull();
+        await Assert.That(unitOfWork).IsTypeOf<UnitOfWork<MockDbContext>>();
+        _scopeFactory.Verify(sf => sf.CreateScope(), Times.Once);
+    }
+}
diff --git a/tests/Tests.CodeOfChaos.Types.UnitOfWork/UnitOfWorkTests.cs b/tests/Tests.CodeOfChaos.Types.UnitOfWork/UnitOfWorkTests.cs
