From bd28fa94c492893445c0ca30721939eff973080e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Bizon=CC=81?= Date: Fri, 10 Jan 2025 12:52:45 +0100 Subject: [PATCH] Refactor test project --- .../ControllersTests/AttachmentControllerTests.cs | 2 +- .../ControllersTests/Base/ControllerTestsBase.cs} | 4 ++-- .../ControllersTests/UserControllerTests.cs | 2 +- .../GlobalUsings.cs | 0 .../Shared/DataGenerator.cs | 0 .../Shared/TestHelper.cs | 0 .../Shared/TestSettings.cs | 0 .../pimi-connect-api.Tests.csproj} | 4 ++++ pimi-connect-api/pimi-connect-api.sln | 2 +- 9 files changed, 9 insertions(+), 5 deletions(-) rename pimi-connect-api/{pimi-connect-api.UnitTests => pimi-connect-api.Tests}/ControllersTests/AttachmentControllerTests.cs (98%) rename pimi-connect-api/{pimi-connect-api.UnitTests/Base/ControllerUnitTestsBase.cs => pimi-connect-api.Tests/ControllersTests/Base/ControllerTestsBase.cs} (97%) rename pimi-connect-api/{pimi-connect-api.UnitTests => pimi-connect-api.Tests}/ControllersTests/UserControllerTests.cs (99%) rename pimi-connect-api/{pimi-connect-api.UnitTests => pimi-connect-api.Tests}/GlobalUsings.cs (100%) rename pimi-connect-api/{pimi-connect-api.UnitTests => pimi-connect-api.Tests}/Shared/DataGenerator.cs (100%) rename pimi-connect-api/{pimi-connect-api.UnitTests => pimi-connect-api.Tests}/Shared/TestHelper.cs (100%) rename pimi-connect-api/{pimi-connect-api.UnitTests => pimi-connect-api.Tests}/Shared/TestSettings.cs (100%) rename pimi-connect-api/{pimi-connect-api.UnitTests/pimi-connect-api.UnitTests.csproj => pimi-connect-api.Tests/pimi-connect-api.Tests.csproj} (96%) diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/ControllersTests/AttachmentControllerTests.cs b/pimi-connect-api/pimi-connect-api.Tests/ControllersTests/AttachmentControllerTests.cs similarity index 98% rename from pimi-connect-api/pimi-connect-api.UnitTests/ControllersTests/AttachmentControllerTests.cs rename to pimi-connect-api/pimi-connect-api.Tests/ControllersTests/AttachmentControllerTests.cs index c0cfb7a..cd1dc06 100644 --- a/pimi-connect-api/pimi-connect-api.UnitTests/ControllersTests/AttachmentControllerTests.cs +++ b/pimi-connect-api/pimi-connect-api.Tests/ControllersTests/AttachmentControllerTests.cs @@ -5,7 +5,7 @@ namespace pimi_connect_api.UnitTests.ControllersTests; [Collection("TestsWhichUseDatabase_pimi-connect-test")] -public class AttachmentControllerTests : ControllerUnitTestsBase +public class AttachmentControllerTests : ControllerTestsBase { private AttachmentController _attachmentController; diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/Base/ControllerUnitTestsBase.cs b/pimi-connect-api/pimi-connect-api.Tests/ControllersTests/Base/ControllerTestsBase.cs similarity index 97% rename from pimi-connect-api/pimi-connect-api.UnitTests/Base/ControllerUnitTestsBase.cs rename to pimi-connect-api/pimi-connect-api.Tests/ControllersTests/Base/ControllerTestsBase.cs index 2b9fafa..ff97330 100644 --- a/pimi-connect-api/pimi-connect-api.UnitTests/Base/ControllerUnitTestsBase.cs +++ b/pimi-connect-api/pimi-connect-api.Tests/ControllersTests/Base/ControllerTestsBase.cs @@ -6,7 +6,7 @@ namespace pimi_connect_api.UnitTests.Base; -public abstract class ControllerUnitTestsBase where TDtoType : class +public abstract class ControllerTestsBase where TDtoType : class { #region Properties protected AppDbContext TestDbContext { get; private set; } @@ -19,7 +19,7 @@ public abstract class ControllerUnitTestsBase where TDtoType : class protected Guid NotExistingId { get; private set; } #endregion - protected ControllerUnitTestsBase() + protected ControllerTestsBase() { SetupConfiguration(); SetupSettings(); diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/ControllersTests/UserControllerTests.cs b/pimi-connect-api/pimi-connect-api.Tests/ControllersTests/UserControllerTests.cs similarity index 99% rename from pimi-connect-api/pimi-connect-api.UnitTests/ControllersTests/UserControllerTests.cs rename to pimi-connect-api/pimi-connect-api.Tests/ControllersTests/UserControllerTests.cs index d9414c7..aca5807 100644 --- a/pimi-connect-api/pimi-connect-api.UnitTests/ControllersTests/UserControllerTests.cs +++ b/pimi-connect-api/pimi-connect-api.Tests/ControllersTests/UserControllerTests.cs @@ -5,7 +5,7 @@ namespace pimi_connect_api.UnitTests.ControllersTests; [Collection("TestsWhichUseDatabase_pimi-connect-test")] -public class UserControllerTests : ControllerUnitTestsBase +public class UserControllerTests : ControllerTestsBase { private UserController _userController; diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/GlobalUsings.cs b/pimi-connect-api/pimi-connect-api.Tests/GlobalUsings.cs similarity index 100% rename from pimi-connect-api/pimi-connect-api.UnitTests/GlobalUsings.cs rename to pimi-connect-api/pimi-connect-api.Tests/GlobalUsings.cs diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/Shared/DataGenerator.cs b/pimi-connect-api/pimi-connect-api.Tests/Shared/DataGenerator.cs similarity index 100% rename from pimi-connect-api/pimi-connect-api.UnitTests/Shared/DataGenerator.cs rename to pimi-connect-api/pimi-connect-api.Tests/Shared/DataGenerator.cs diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/Shared/TestHelper.cs b/pimi-connect-api/pimi-connect-api.Tests/Shared/TestHelper.cs similarity index 100% rename from pimi-connect-api/pimi-connect-api.UnitTests/Shared/TestHelper.cs rename to pimi-connect-api/pimi-connect-api.Tests/Shared/TestHelper.cs diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/Shared/TestSettings.cs b/pimi-connect-api/pimi-connect-api.Tests/Shared/TestSettings.cs similarity index 100% rename from pimi-connect-api/pimi-connect-api.UnitTests/Shared/TestSettings.cs rename to pimi-connect-api/pimi-connect-api.Tests/Shared/TestSettings.cs diff --git a/pimi-connect-api/pimi-connect-api.UnitTests/pimi-connect-api.UnitTests.csproj b/pimi-connect-api/pimi-connect-api.Tests/pimi-connect-api.Tests.csproj similarity index 96% rename from pimi-connect-api/pimi-connect-api.UnitTests/pimi-connect-api.UnitTests.csproj rename to pimi-connect-api/pimi-connect-api.Tests/pimi-connect-api.Tests.csproj index bd542be..5aec27a 100644 --- a/pimi-connect-api/pimi-connect-api.UnitTests/pimi-connect-api.UnitTests.csproj +++ b/pimi-connect-api/pimi-connect-api.Tests/pimi-connect-api.Tests.csproj @@ -42,4 +42,8 @@ + + + + diff --git a/pimi-connect-api/pimi-connect-api.sln b/pimi-connect-api/pimi-connect-api.sln index a93fdfd..2246284 100644 --- a/pimi-connect-api/pimi-connect-api.sln +++ b/pimi-connect-api/pimi-connect-api.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pimi-connect-api.API", "pim EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pimi-connect-api.Data", "pimi-connect-api.Data\pimi-connect-api.Data.csproj", "{A8E47DDB-D67E-4B96-86B7-499D7BC1C2A3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pimi-connect-api.UnitTests", "pimi-connect-api.UnitTests\pimi-connect-api.UnitTests.csproj", "{AE58D6D6-F050-48A8-B303-EB30933D2208}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pimi-connect-api.Tests", "pimi-connect-api.Tests\pimi-connect-api.Tests.csproj", "{AE58D6D6-F050-48A8-B303-EB30933D2208}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution