Merge pull request #12 from mehyaa/unit-tests

Add unit tests for Convey framework components

Author: mehyaa

.github/copilot-instructions.md

@@ -30,15 +30,15 @@ Convey provides features for quickly setting up microservices including:
 #### 1. Restore Dependencies
 **ALWAYS run restore before building after a fresh clone or when dependencies change.**
 ```bash
-dotnet restore Convey.sln
+dotnet restore Convey.slnx
 ```
 - **Expected Time**: 10-15 seconds
 - **Expected Result**: All 35 projects restored successfully with no errors
 - **Note**: This is implicit in `dotnet build` unless you use `--no-restore`
 
 #### 2. Build the Solution
 ```bash
-dotnet build Convey.sln -c Release
+dotnet build Convey.slnx -c Release
 ```
 - **Expected Time**: 12-20 seconds (clean build)
 - **Expected Result**: Build succeeded with 0 errors
@@ -47,30 +47,30 @@ dotnet build Convey.sln -c Release
 
 #### 3. Clean Build Artifacts
 ```bash
-dotnet clean Convey.sln -c Release
+dotnet clean Convey.slnx -c Release
 ```
 - **Expected Time**: 2-3 seconds
 - **Use Case**: Run this before a clean build or when experiencing build issues
 
 #### 4. Format Code
 **ALWAYS run format before committing code changes.**
 ```bash
-dotnet format Convey.sln --no-restore
+dotnet format Convey.slnx --no-restore
 ```
 - **Expected Time**: 5-10 seconds
 - **Expected Result**: May show whitespace formatting errors in existing code - this is NORMAL
 - **Important**: The repository has existing formatting issues. Focus only on formatting files you modify.
 
 #### 5. Verify No Formatting Changes Needed
 ```bash
-dotnet format Convey.sln --verify-no-changes --no-restore
+dotnet format Convey.slnx --verify-no-changes --no-restore
 ```
 - **Use Case**: Check if code needs formatting without making changes
 - **Exit Code**: Returns non-zero if formatting is needed
 
 #### 6. Run Tests
 ```bash
-dotnet test Convey.sln --no-build --no-restore -c Release
+dotnet test Convey.slnx --no-build --no-restore -c Release
 ```
 - **Expected Result**: No test projects exist - command completes immediately with success
 - **Note**: This repository does not have unit tests
@@ -81,30 +81,30 @@ dotnet test Convey.sln --no-build --no-restore -c Release
 
 1. **Start Fresh** (if needed):
    ```bash
-   dotnet clean Convey.sln -c Release
+   dotnet clean Convey.slnx -c Release
    ```
 
 2. **Restore Dependencies** (after fresh clone or dependency changes):
    ```bash
-   dotnet restore Convey.sln
+   dotnet restore Convey.slnx
    ```
 
 3. **Build**:
    ```bash
-   dotnet build Convey.sln -c Release --no-restore
+   dotnet build Convey.slnx -c Release --no-restore
    ```
    - Expected time: 12-20 seconds
    - Generates NuGet packages in each project's bin/Release directory
 
 4. **Format Your Changes**:
    ```bash
-   dotnet format Convey.sln --no-restore
+   dotnet format Convey.slnx --no-restore
    ```
    - Run on files you modified only
 
 5. **Rebuild After Formatting**:
    ```bash
-   dotnet build Convey.sln -c Release --no-restore
+   dotnet build Convey.slnx -c Release --no-restore
    ```
 
 ## Project Structure
@@ -115,7 +115,7 @@ dotnet test Convey.sln --no-build --no-restore -c Release
 ├── .github/workflows/main.yml    # GitHub Actions CI/CD pipeline
 ├── .gitignore                     # Standard .NET gitignore
 ├── .travis.yml                    # Legacy Travis CI config (reference only)
-├── Convey.sln                     # Main solution file (746 lines, 35 projects)
+├── Convey.slnx                     # Main solution file (746 lines, 35 projects)
 ├── Directory.Build.props          # Shared MSBuild properties (target framework, versioning)
 ├── LICENSE                        # MIT License
 ├── README.md                      # Project documentation
@@ -170,7 +170,7 @@ Located in `samples/`:
 
 ### Build Configuration in CI
 ```bash
-dotnet build Convey.sln \
+dotnet build Convey.slnx \
   --configuration Release \
   --verbosity minimal \
   --property:Version="$VERSION" \
@@ -268,18 +268,18 @@ services.AddConvey()
 
 ```bash
 # Fresh start
-dotnet clean Convey.sln -c Release
-dotnet restore Convey.sln
-dotnet build Convey.sln -c Release --no-restore
+dotnet clean Convey.slnx -c Release
+dotnet restore Convey.slnx
+dotnet build Convey.slnx -c Release --no-restore
 
 # Format code (files you changed)
-dotnet format Convey.sln --no-restore
+dotnet format Convey.slnx --no-restore
 
 # Check formatting
-dotnet format Convey.sln --verify-no-changes --no-restore
+dotnet format Convey.slnx --verify-no-changes --no-restore
 
 # Rebuild
-dotnet build Convey.sln -c Release --no-restore
+dotnet build Convey.slnx -c Release --no-restore
 ```
 
 **Trust these instructions** - they are validated against the actual repository. Only search for additional information if you encounter unexpected behavior or errors not documented here.

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
       packages: write
 
     env:
-      SOLUTION: "Convey.sln"
+      SOLUTION: "Convey.slnx"
       BUILD_CONFIG: "Release"
       PACKAGE_SOURCE: "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
 

Convey.slnx

@@ -138,4 +138,38 @@
   <Folder Name="/src/Convey.WebApi.Swagger/src/">
     <Project Path="src/Convey.WebApi.Swagger/src/Convey.WebApi.Swagger/Convey.WebApi.Swagger.csproj" />
   </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/Convey.Auth.Distributed.Tests/Convey.Auth.Distributed.Tests.csproj" />
+    <Project Path="test/Convey.Auth.Tests/Convey.Auth.Tests.csproj" />
+    <Project Path="test/Convey.CQRS.Commands.Tests/Convey.CQRS.Commands.Tests.csproj" />
+    <Project Path="test/Convey.CQRS.Events.Tests/Convey.CQRS.Events.Tests.csproj" />
+    <Project Path="test/Convey.CQRS.Queries.Tests/Convey.CQRS.Queries.Tests.csproj" />
+    <Project Path="test/Convey.Discovery.Consul.Tests/Convey.Discovery.Consul.Tests.csproj" />
+    <Project Path="test/Convey.Docs.Swagger.Tests/Convey.Docs.Swagger.Tests.csproj" />
+    <Project Path="test/Convey.HTTP.RestEase.Tests/Convey.HTTP.RestEase.Tests.csproj" />
+    <Project Path="test/Convey.HTTP.Tests/Convey.HTTP.Tests.csproj" />
+    <Project Path="test/Convey.LoadBalancing.Fabio.Tests/Convey.LoadBalancing.Fabio.Tests.csproj" />
+    <Project Path="test/Convey.Logging.CQRS.Tests/Convey.Logging.CQRS.Tests.csproj" />
+    <Project Path="test/Convey.Logging.Tests/Convey.Logging.Tests.csproj" />
+    <Project Path="test/Convey.MessageBrokers.CQRS.Tests/Convey.MessageBrokers.CQRS.Tests.csproj" />
+    <Project Path="test/Convey.MessageBrokers.Outbox.EntityFramework.Tests/Convey.MessageBrokers.Outbox.EntityFramework.Tests.csproj" />
+    <Project Path="test/Convey.MessageBrokers.Outbox.Mongo.Tests/Convey.MessageBrokers.Outbox.Mongo.Tests.csproj" />
+    <Project Path="test/Convey.MessageBrokers.Outbox.Tests/Convey.MessageBrokers.Outbox.Tests.csproj" />
+    <Project Path="test/Convey.MessageBrokers.RabbitMQ.Tests/Convey.MessageBrokers.RabbitMQ.Tests.csproj" />
+    <Project Path="test/Convey.MessageBrokers.Tests/Convey.MessageBrokers.Tests.csproj" />
+    <Project Path="test/Convey.Metrics.AppMetrics.Tests/Convey.Metrics.AppMetrics.Tests.csproj" />
+    <Project Path="test/Convey.Metrics.Prometheus.Tests/Convey.Metrics.Prometheus.Tests.csproj" />
+    <Project Path="test/Convey.Persistence.MongoDB.Tests/Convey.Persistence.MongoDB.Tests.csproj" />
+    <Project Path="test/Convey.Persistence.OpenStack.OCS.Tests/Convey.Persistence.OpenStack.OCS.Tests.csproj" />
+    <Project Path="test/Convey.Persistence.Redis.Tests/Convey.Persistence.Redis.Tests.csproj" />
+    <Project Path="test/Convey.Secrets.Vault.Tests/Convey.Secrets.Vault.Tests.csproj" />
+    <Project Path="test/Convey.Security.Tests/Convey.Security.Tests.csproj" />
+    <Project Path="test/Convey.Tests/Convey.Tests.csproj" />
+    <Project Path="test/Convey.Tracing.Jaeger.RabbitMQ.Tests/Convey.Tracing.Jaeger.RabbitMQ.Tests.csproj" />
+    <Project Path="test/Convey.Tracing.Jaeger.Tests/Convey.Tracing.Jaeger.Tests.csproj" />
+    <Project Path="test/Convey.WebApi.CQRS.Tests/Convey.WebApi.CQRS.Tests.csproj" />
+    <Project Path="test/Convey.WebApi.Security.Tests/Convey.WebApi.Security.Tests.csproj" />
+    <Project Path="test/Convey.WebApi.Swagger.Tests/Convey.WebApi.Swagger.Tests.csproj" />
+    <Project Path="test/Convey.WebApi.Tests/Convey.WebApi.Tests.csproj" />
+  </Folder>
 </Solution>

src/Directory.Build.props

@@ -48,5 +48,6 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="$(MSBuildProjectName).Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
   </ItemGroup>
 </Project>

test/Convey.Auth.Distributed.Tests/Convey.Auth.Distributed.Tests.csproj

@@ -0,0 +1 @@
+<Project Sdk="Microsoft.NET.Sdk" />

test/Convey.Auth.Distributed.Tests/ExtensionsTests.cs

@@ -0,0 +1,64 @@
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Xunit;
+
+namespace Convey.Auth.Distributed.Tests
+{
+    public class ExtensionsTests
+    {
+        [Fact]
+        public void AddDistributedAccessTokenValidator_Should_Register_Service()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = ConveyBuilder.Create(services);
+
+            // Act
+            builder.AddDistributedAccessTokenValidator();
+
+            // Assert
+            services.ShouldContain(s => s.ServiceType == typeof(IAccessTokenService));
+        }
+
+        [Fact]
+        public void AddDistributedAccessTokenValidator_Should_Register_As_Singleton()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = ConveyBuilder.Create(services);
+
+            // Act
+            builder.AddDistributedAccessTokenValidator();
+
+            // Assert
+            var descriptor = services.First(s => s.ServiceType == typeof(IAccessTokenService));
+            descriptor.Lifetime.ShouldBe(ServiceLifetime.Singleton);
+        }
+
+        [Fact]
+        public void AddDistributedAccessTokenValidator_Should_Replace_Existing_Service()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            services.AddSingleton<IAccessTokenService, DummyAccessTokenService>();
+            var builder = ConveyBuilder.Create(services);
+
+            // Act
+            builder.AddDistributedAccessTokenValidator();
+
+            // Assert
+            var descriptors = services.Where(s => s.ServiceType == typeof(IAccessTokenService)).ToList();
+            descriptors.Count.ShouldBeGreaterThanOrEqualTo(1);
+        }
+
+        // Helper class
+        private class DummyAccessTokenService : IAccessTokenService
+        {
+            public System.Threading.Tasks.Task<bool> IsTokenActiveAsync(string token) => System.Threading.Tasks.Task.FromResult(true);
+            public System.Threading.Tasks.Task<bool> IsTokenActiveAsync() => System.Threading.Tasks.Task.FromResult(true);
+            public System.Threading.Tasks.Task DeactivateTokenAsync(string token) => System.Threading.Tasks.Task.CompletedTask;
+            public System.Threading.Tasks.Task DeactivateTokenAsync() => System.Threading.Tasks.Task.CompletedTask;
+        }
+    }
+}

test/Convey.Auth.Tests/AccessTokenValidatorMiddlewareTests.cs

@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Moq;
+using Shouldly;
+using Xunit;
+
+namespace Convey.Auth.Tests;
+
+public class AccessTokenValidatorMiddlewareTests
+{
+    private readonly Mock<IAccessTokenService> _accessTokenServiceMock;
+    private readonly JwtOptions _jwtOptions;
+    private readonly AccessTokenValidatorMiddleware _middleware;
+
+    public AccessTokenValidatorMiddlewareTests()
+    {
+        _accessTokenServiceMock = new Mock<IAccessTokenService>();
+        _jwtOptions = new JwtOptions();
+        _middleware = new AccessTokenValidatorMiddleware(_accessTokenServiceMock.Object, _jwtOptions);
+    }
+
+    [Fact]
+    public async Task InvokeAsync_Should_Call_Next_When_Endpoint_Is_Allowed()
+    {
+        // Arrange
+        _jwtOptions.AllowAnonymousEndpoints = new List<string> { "/allowed" };
+        // Re-instantiate because options are passed in constructor
+        var middleware = new AccessTokenValidatorMiddleware(_accessTokenServiceMock.Object, _jwtOptions);
+
+        var context = new DefaultHttpContext();
+        context.Request.Path = "/allowed";
+        var nextCalled = false;
+        RequestDelegate next = (ctx) => { nextCalled = true; return Task.CompletedTask; };
+
+        // Act
+        await middleware.InvokeAsync(context, next);
+
+        // Assert
+        nextCalled.ShouldBeTrue();
+        context.Response.StatusCode.ShouldBe(200); // Default
+        _accessTokenServiceMock.Verify(x => x.IsTokenActiveAsync(), Times.Never);
+    }
+
+    [Fact]
+    public async Task InvokeAsync_Should_Call_Next_When_Token_Is_Active()
+    {
+        // Arrange
+        _accessTokenServiceMock.Setup(x => x.IsTokenActiveAsync()).ReturnsAsync(true);
+        var context = new DefaultHttpContext();
+        context.Request.Path = "/protected";
+        var nextCalled = false;
+        RequestDelegate next = (ctx) => { nextCalled = true; return Task.CompletedTask; };
+
+        // Act
+        await _middleware.InvokeAsync(context, next);
+
+        // Assert
+        nextCalled.ShouldBeTrue();
+        context.Response.StatusCode.ShouldBe(200);
+    }
+
+    [Fact]
+    public async Task InvokeAsync_Should_Return_Unauthorized_When_Token_Is_Not_Active()
+    {
+        // Arrange
+        _accessTokenServiceMock.Setup(x => x.IsTokenActiveAsync()).ReturnsAsync(false);
+        var context = new DefaultHttpContext();
+        context.Request.Path = "/protected";
+        var nextCalled = false;
+        RequestDelegate next = (ctx) => { nextCalled = true; return Task.CompletedTask; };
+
+        // Act
+        await _middleware.InvokeAsync(context, next);
+
+        // Assert
+        nextCalled.ShouldBeFalse();
+        context.Response.StatusCode.ShouldBe(401);
+    }
+}

test/Convey.Auth.Tests/AuthAttributeTests.cs

@@ -0,0 +1,48 @@
+using Shouldly;
+using Xunit;
+
+namespace Convey.Auth.Tests;
+
+public class AuthAttributeTests
+{
+    [Fact]
+    public void Constructor_Should_Set_AuthenticationSchemes()
+    {
+        // Arrange & Act
+        var attribute = new AuthAttribute("TestScheme");
+
+        // Assert
+        attribute.AuthenticationSchemes.ShouldBe("TestScheme");
+    }
+
+    [Fact]
+    public void Constructor_Should_Set_Policy_When_Provided()
+    {
+        // Arrange & Act
+        var attribute = new AuthAttribute("TestScheme", "TestPolicy");
+
+        // Assert
+        attribute.Policy.ShouldBe("TestPolicy");
+        attribute.AuthenticationSchemes.ShouldBe("TestScheme");
+    }
+
+    [Fact]
+    public void Constructor_Should_Set_Empty_Policy_When_Not_Provided()
+    {
+        // Arrange & Act
+        var attribute = new AuthAttribute("TestScheme");
+
+        // Assert
+        attribute.Policy.ShouldBe("");
+    }
+
+    [Fact]
+    public void Should_Be_AuthorizeAttribute()
+    {
+        // Arrange
+        var attribute = new AuthAttribute("TestScheme");
+
+        // Act & Assert
+        attribute.ShouldBeAssignableTo<Microsoft.AspNetCore.Authorization.AuthorizeAttribute>();
+    }
+}

test/Convey.Auth.Tests/Convey.Auth.Tests.csproj

@@ -0,0 +1 @@
+<Project Sdk="Microsoft.NET.Sdk" />