Tests Refactoring (#37)

* renamed test project
* renamed endpoint test files to prefix with group and suffix with endpoint
* fixed generating guids and typed ids for testing (removed generating using Bogus.Faker)
* changed dotnet test CI pipeline verbosity to minimal
* fixed performance test namespaces
* fixed generating distinct users for testing
* added EF Core Relational package reference for possible query adjustment (AsSplitQuery ...)

.github/workflows/CI.yml

@@ -33,4 +33,4 @@ jobs:
         run: dotnet build ${{ env.SOLUTION }} -c Release --no-restore
 
       - name: Test
-        run: dotnet test ${{env.SOLUTION }} -c Release --no-build --verbosity normal
+        run: dotnet test ${{env.SOLUTION }} -c Release --no-build --verbosity minimal

Directory.Packages.props

@@ -18,6 +18,7 @@
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />

TeamUp.sln

@@ -26,13 +26,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B78B958B-7250-4FEC-96F4-4FE0DE49D916}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.ArchitectureTests", "tests\TeamUp.ArchitectureTests\TeamUp.ArchitectureTests.csproj", "{BFC0159D-37D8-494F-90A6-DA3EA05CFDEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.Tests.Architecture", "tests\TeamUp.Tests.Architecture\TeamUp.Tests.Architecture.csproj", "{BFC0159D-37D8-494F-90A6-DA3EA05CFDEF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.EndToEndTests", "tests\TeamUp.EndToEndTests\TeamUp.EndToEndTests.csproj", "{63C1F34E-C706-43AC-A98B-E9530F875FFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.Tests.EndToEnd", "tests\TeamUp.Tests.EndToEnd\TeamUp.Tests.EndToEnd.csproj", "{63C1F34E-C706-43AC-A98B-E9530F875FFA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.PerformanceTests", "tests\TeamUp.PerformanceTests\TeamUp.PerformanceTests.csproj", "{B80B3E02-0B98-4ABA-92A9-74AEEEF76423}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.Tests.Performance", "tests\TeamUp.Tests.Performance\TeamUp.Tests.Performance.csproj", "{B80B3E02-0B98-4ABA-92A9-74AEEEF76423}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.TestsCommon", "tests\TeamUp.TestsCommon\TeamUp.TestsCommon.csproj", "{A3D136DD-571F-4B1C-83E2-9B538F85C575}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamUp.Tests.Common", "tests\TeamUp.Tests.Common\TeamUp.Tests.Common.csproj", "{A3D136DD-571F-4B1C-83E2-9B538F85C575}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{F77B386C-FDBC-4BB4-AF07-0CF054DBDB7E}"
 	ProjectSection(SolutionItems) = preProject
@@ -77,14 +77,14 @@ Global
 		{63C1F34E-C706-43AC-A98B-E9530F875FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{63C1F34E-C706-43AC-A98B-E9530F875FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{63C1F34E-C706-43AC-A98B-E9530F875FFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B80B3E02-0B98-4ABA-92A9-74AEEEF76423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B80B3E02-0B98-4ABA-92A9-74AEEEF76423}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B80B3E02-0B98-4ABA-92A9-74AEEEF76423}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B80B3E02-0B98-4ABA-92A9-74AEEEF76423}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3D136DD-571F-4B1C-83E2-9B538F85C575}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -98,8 +98,8 @@ Global
 		{34E8F682-1BBF-44E8-979C-23A523FEA846} = {2565E01A-0189-44D1-B8EF-24490DB68608}
 		{BFC0159D-37D8-494F-90A6-DA3EA05CFDEF} = {B78B958B-7250-4FEC-96F4-4FE0DE49D916}
 		{63C1F34E-C706-43AC-A98B-E9530F875FFA} = {B78B958B-7250-4FEC-96F4-4FE0DE49D916}
-		{A3D136DD-571F-4B1C-83E2-9B538F85C575} = {B78B958B-7250-4FEC-96F4-4FE0DE49D916}
 		{B80B3E02-0B98-4ABA-92A9-74AEEEF76423} = {B78B958B-7250-4FEC-96F4-4FE0DE49D916}
+		{A3D136DD-571F-4B1C-83E2-9B538F85C575} = {B78B958B-7250-4FEC-96F4-4FE0DE49D916}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2E9D991D-377D-45D8-9599-801391683CEA}

src/TeamUp.Application/TeamUp.Application.csproj

@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
     <PackageReference Include="Riok.Mapperly" />
   </ItemGroup>
 

tests/TeamUp.ArchitectureTests/Application/AppQueryContextTests.cs → tests/TeamUp.Tests.Architecture/Application/AppQueryContextTests.cs

@@ -2,7 +2,7 @@
 
 using TeamUp.Application.Abstractions;
 
-namespace TeamUp.ArchitectureTests.Application;
+namespace TeamUp.Tests.Architecture.Application;
 
 public sealed class AppQueryContextTests : BaseTests
 {

tests/TeamUp.ArchitectureTests/BaseTests.cs → tests/TeamUp.Tests.Architecture/BaseTests.cs

@@ -1,11 +1,11 @@
 using System.Reflection;
 
-namespace TeamUp.ArchitectureTests;
+namespace TeamUp.Tests.Architecture;
 
 public abstract class BaseTests
 {
 	public static readonly Assembly DomainAssembly = typeof(TeamUp.Domain.ServiceCollectionExtensions).Assembly;
 	public static readonly Assembly ApplicationAssembly = typeof(TeamUp.Application.ServiceCollectionExtensions).Assembly;
-	public static readonly Assembly InfrastructureAssembly = typeof(Infrastructure.ServiceCollectionExtensions).Assembly;
+	public static readonly Assembly InfrastructureAssembly = typeof(TeamUp.Infrastructure.ServiceCollectionExtensions).Assembly;
 	public static readonly Assembly ContractsAssembly = typeof(TeamUp.Contracts.Abstractions.IRequestBody).Assembly;
 }

tests/TeamUp.ArchitectureTests/Contracts/ClassesTests.cs → tests/TeamUp.Tests.Architecture/Contracts/ClassesTests.cs

@@ -1,6 +1,6 @@
 using TeamUp.Contracts.Abstractions;
 
-namespace TeamUp.ArchitectureTests.Contracts;
+namespace TeamUp.Tests.Architecture.Contracts;
 
 public sealed class ClassesTests : BaseTests
 {

tests/TeamUp.ArchitectureTests/Contracts/RequestTests.cs → tests/TeamUp.Tests.Architecture/Contracts/RequestTests.cs

@@ -2,7 +2,7 @@
 
 using TeamUp.Contracts.Abstractions;
 
-namespace TeamUp.ArchitectureTests.Contracts;
+namespace TeamUp.Tests.Architecture.Contracts;
 
 public sealed class RequestTests : BaseTests
 {

tests/TeamUp.ArchitectureTests/DependencyTests.cs → tests/TeamUp.Tests.Architecture/DependencyTests.cs

@@ -1,4 +1,4 @@
-namespace TeamUp.ArchitectureTests;
+namespace TeamUp.Tests.Architecture;
 
 public sealed class DependencyTests : BaseTests
 {

tests/TeamUp.ArchitectureTests/Domain/DomainEventTests.cs → tests/TeamUp.Tests.Architecture/Domain/DomainEventTests.cs

@@ -1,6 +1,6 @@
 using TeamUp.Domain.Abstractions;
 
-namespace TeamUp.ArchitectureTests.Domain;
+namespace TeamUp.Tests.Architecture.Domain;
 
 public sealed class DomainEventTests : BaseTests
 {

tests/TeamUp.ArchitectureTests/Domain/EntityTests.cs → tests/TeamUp.Tests.Architecture/Domain/EntityTests.cs

@@ -2,7 +2,7 @@
 
 using TeamUp.Domain.Abstractions;
 
-namespace TeamUp.ArchitectureTests.Domain;
+namespace TeamUp.Tests.Architecture.Domain;
 
 public sealed class EntityTests : BaseTests
 {

tests/TeamUp.ArchitectureTests/Domain/ValueObjectTests.cs → tests/TeamUp.Tests.Architecture/Domain/ValueObjectTests.cs

@@ -2,7 +2,7 @@
 
 using TeamUp.Domain.Abstractions;
 
-namespace TeamUp.ArchitectureTests.Domain;
+namespace TeamUp.Tests.Architecture.Domain;
 
 public sealed class ValueObjectTests : BaseTests
 {

tests/TeamUp.TestsCommon/DataGenerators/BaseGenerator.cs → tests/TeamUp.Tests.Common/DataGenerators/BaseGenerator.cs

@@ -1,4 +1,4 @@
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public abstract class BaseGenerator
 {

tests/TeamUp.TestsCommon/DataGenerators/EventGeneratorExtensions.cs → tests/TeamUp.Tests.Common/DataGenerators/EventGeneratorExtensions.cs

@@ -1,6 +1,6 @@
 using FluentAssertions.Extensions;
 
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public static class EventGeneratorExtensions
 {

tests/TeamUp.TestsCommon/DataGenerators/EventGenerators.cs → tests/TeamUp.Tests.Common/DataGenerators/EventGenerators.cs

@@ -3,7 +3,7 @@
 
 using FluentAssertions.Extensions;
 
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public sealed class EventGenerators : BaseGenerator
 {

tests/TeamUp.TestsCommon/DataGenerators/InvalidRequest.cs → tests/TeamUp.Tests.Common/DataGenerators/InvalidRequest.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public sealed class InvalidRequest<TRequest>
 {

tests/TeamUp.TestsCommon/DataGenerators/InvitationGenerators.cs → tests/TeamUp.Tests.Common/DataGenerators/InvitationGenerators.cs

@@ -1,6 +1,6 @@
 global using InvitationGenerator = Bogus.Faker<TeamUp.Domain.Aggregates.Invitations.Invitation>;
 
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public sealed class InvitationGenerators : BaseGenerator
 {
@@ -50,31 +50,31 @@ public InvalidInviteUserRequest()
 		{
 			this.Add(x => x.Email, new InviteUserRequest
 			{
-				TeamId = TeamId.FromGuid(F.Random.Guid()),
+				TeamId = TeamId.New(),
 				Email = ""
 			});
 
 			this.Add(x => x.Email, new InviteUserRequest
 			{
-				TeamId = TeamId.FromGuid(F.Random.Guid()),
+				TeamId = TeamId.New(),
 				Email = "@@"
 			});
 
 			this.Add(x => x.Email, new InviteUserRequest
 			{
-				TeamId = TeamId.FromGuid(F.Random.Guid()),
+				TeamId = TeamId.New(),
 				Email = "invalid email"
 			});
 
 			this.Add(x => x.Email, new InviteUserRequest
 			{
-				TeamId = TeamId.FromGuid(F.Random.Guid()),
+				TeamId = TeamId.New(),
 				Email = "missing.domain@"
 			});
 
 			this.Add(x => x.Email, new InviteUserRequest
 			{
-				TeamId = TeamId.FromGuid(F.Random.Guid()),
+				TeamId = TeamId.New(),
 				Email = "@missing.username"
 			});
 		}

tests/TeamUp.TestsCommon/DataGenerators/TeamGeneratorExtensions.cs → tests/TeamUp.Tests.Common/DataGenerators/TeamGeneratorExtensions.cs

@@ -1,6 +1,6 @@
 using TeamUp.Common;
 
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public static class TeamGeneratorExtensions
 {

tests/TeamUp.TestsCommon/DataGenerators/TeamGenerators.cs → tests/TeamUp.Tests.Common/DataGenerators/TeamGenerators.cs

@@ -1,6 +1,6 @@
 global using TeamGenerator = Bogus.Faker<TeamUp.Domain.Aggregates.Teams.Team>;
 
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public sealed class TeamGenerators : BaseGenerator
 {

tests/TeamUp.TestsCommon/DataGenerators/UserGenerators.cs → tests/TeamUp.Tests.Common/DataGenerators/UserGenerators.cs

@@ -1,4 +1,4 @@
-namespace TeamUp.TestsCommon.DataGenerators;
+namespace TeamUp.Tests.Common.DataGenerators;
 
 public sealed class UserGenerators : BaseGenerator
 {
@@ -21,6 +21,14 @@ public sealed class UserGenerators : BaseGenerator
 		.RuleFor(u => u.Password, new Password())
 		.RuleFor(u => u.Status, UserStatus.NotActivated);
 
+	public static readonly Faker<User> DistinctUser = new Faker<User>()
+		.UsePrivateConstructor()
+		.RuleFor(u => u.Id, f => UserId.FromGuid(f.Random.Guid()))
+		.RuleFor(u => u.Email, f => f.Internet.Email(uniqueSuffix: f.Random.Guid().ToString()))
+		.RuleFor(u => u.Name, f => f.Internet.UserName())
+		.RuleFor(u => u.Password, new Password())
+		.RuleFor(u => u.Status, UserStatus.Activated);
+
 	public static User GenerateUser(Password password, UserStatus status)
 	{
 		return User

tests/TeamUp.TestsCommon/Extensions/AssertionExtensions.cs → tests/TeamUp.Tests.Common/Extensions/AssertionExtensions.cs

@@ -4,7 +4,7 @@
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-namespace TeamUp.TestsCommon.Extensions;
+namespace TeamUp.Tests.Common.Extensions;
 
 public static class AssertionExtensions
 {

tests/TeamUp.TestsCommon/Extensions/FakerExtensions.cs → tests/TeamUp.Tests.Common/Extensions/FakerExtensions.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace TeamUp.TestsCommon.Extensions;
+namespace TeamUp.Tests.Common.Extensions;
 
 public static class FakerExtensions
 {

tests/TeamUp.TestsCommon/Extensions/RandomizerExtensions.cs → tests/TeamUp.Tests.Common/Extensions/RandomizerExtensions.cs

@@ -1,4 +1,4 @@
-namespace TeamUp.TestsCommon.Extensions;
+namespace TeamUp.Tests.Common.Extensions;
 
 public static class RandomizerExtensions
 {

tests/TeamUp.TestsCommon/Extensions/TheoryDataExtensions.cs → tests/TeamUp.Tests.Common/Extensions/TheoryDataExtensions.cs

@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace TeamUp.TestsCommon.Extensions;
+namespace TeamUp.Tests.Common.Extensions;
 
 public static class TheoryDataExtensions
 {

tests/TeamUp.TestsCommon/Extensions/TimeExtensions.cs → tests/TeamUp.Tests.Common/Extensions/TimeExtensions.cs

@@ -1,4 +1,4 @@
-namespace TeamUp.TestsCommon.Extensions;
+namespace TeamUp.Tests.Common.Extensions;
 
 public static class TimeExtensions
 {

tests/TeamUp.TestsCommon/GlobalUsings.cs → tests/TeamUp.Tests.Common/GlobalUsings.cs

@@ -10,7 +10,7 @@
 global using TeamUp.Domain.Aggregates.Invitations;
 global using TeamUp.Domain.Aggregates.Teams;
 global using TeamUp.Domain.Aggregates.Users;
-global using TeamUp.TestsCommon.DataGenerators;
-global using TeamUp.TestsCommon.Extensions;
+global using TeamUp.Tests.Common.DataGenerators;
+global using TeamUp.Tests.Common.Extensions;
 
 global using Xunit;

tests/TeamUp.TestsCommon/PrivateBinder.cs → tests/TeamUp.Tests.Common/PrivateBinder.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace TeamUp.TestsCommon;
+namespace TeamUp.Tests.Common;
 
 public sealed class PrivateBinder : Bogus.Binder
 {

tests/TeamUp.EndToEndTests/EndpointTests/BaseEndpointTests.cs → tests/TeamUp.Tests.EndToEnd/EndpointTests/BaseEndpointTests.cs

@@ -4,9 +4,9 @@
 
 using TeamUp.Application.Users;
 using TeamUp.Common.Abstractions;
-using TeamUp.EndToEndTests.Mocks;
+using TeamUp.Tests.EndToEnd.Mocks;
 
-namespace TeamUp.EndToEndTests.EndpointTests;
+namespace TeamUp.Tests.EndToEnd.EndpointTests;
 
 [Collection(nameof(AppCollectionFixture))]
 public abstract class BaseEndpointTests : IAsyncLifetime

tests/TeamUp.EndToEndTests/EndpointTests/Events/CreateEventTests.cs → tests/TeamUp.Tests.EndToEnd/EndpointTests/Events/EventTests.CreateEvent.cs

@@ -1,6 +1,6 @@
-namespace TeamUp.EndToEndTests.EndpointTests.Events;
+namespace TeamUp.Tests.EndToEnd.EndpointTests.Events;
 
-public sealed class CreateEventTests : BaseEventTests
+public sealed class CreateEventTests : EventTests
 {
 	public CreateEventTests(TeamApiWebApplicationFactory appFactory) : base(appFactory) { }
 
@@ -130,8 +130,8 @@ public async Task CreateEvent_ForUnExistingTeam_Should_ResultInNotFound()
 	{
 		//arrange
 		var initiatorUser = UserGenerators.ActivatedUser.Generate();
-		var teamId = F.Random.Guid();
-		var eventTypeId = EventTypeId.FromGuid(F.Random.Guid());
+		var teamId = Guid.NewGuid();
+		var eventTypeId = EventTypeId.New();
 
 		await UseDbContextAsync(dbContext =>
 		{
@@ -179,7 +179,7 @@ await UseDbContextAsync(dbContext =>
 		Authenticate(initiatorUser);
 
 		var request = EventGenerators.ValidCreateEventRequest
-			.WithEventType(EventTypeId.FromGuid(F.Random.Guid()))
+			.WithEventType(EventTypeId.New())
 			.WithTime(DateTime.UtcNow.AddDays(4), DateTime.UtcNow.AddDays(4).AddHours(1))
 			.Generate();