From 6d94582686253571ca455d4bccb336f6b143a181 Mon Sep 17 00:00:00 2001 From: StevanFreeborn Date: Tue, 5 Jul 2022 14:38:00 -0500 Subject: [PATCH] added test project and put integration and unit tests under single test project --- criminalmindsapi.sln | 10 +- .../CharactersEndpointsTests.cs | 38 ------ server.integrationTests/Usings.cs | 1 - .../server.integrationTests.csproj | 23 ---- .../controllers/CharactersControllerTests.cs | 124 ------------------ .../CharactersControllerIntegrationTests.cs | 24 ++++ server.tests/server.tests.csproj | 6 +- .../unitTests/CharacterControllerUnitTests.cs | 18 +++ server/server.csproj | 2 +- 9 files changed, 52 insertions(+), 194 deletions(-) delete mode 100644 server.integrationTests/CharactersEndpointsTests.cs delete mode 100644 server.integrationTests/Usings.cs delete mode 100644 server.integrationTests/server.integrationTests.csproj delete mode 100644 server.tests/controllers/CharactersControllerTests.cs create mode 100644 server.tests/integrationTests/CharactersControllerIntegrationTests.cs create mode 100644 server.tests/unitTests/CharacterControllerUnitTests.cs diff --git a/criminalmindsapi.sln b/criminalmindsapi.sln index 382dc72..c1fb9bb 100644 --- a/criminalmindsapi.sln +++ b/criminalmindsapi.sln @@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server.integrationTests", "server.integrationTests\server.integrationTests.csproj", "{88C22EC9-3069-41AA-99EC-5503385A3633}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server.tests", "server.tests\server.tests.csproj", "{8B86105B-F6F4-49A9-B384-C2823F693F38}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,10 +33,10 @@ Global {1EF6EB3C-FCA0-4FF6-8A99-373AFAC6E4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {1EF6EB3C-FCA0-4FF6-8A99-373AFAC6E4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU {1EF6EB3C-FCA0-4FF6-8A99-373AFAC6E4EC}.Release|Any CPU.Build.0 = Release|Any CPU - {88C22EC9-3069-41AA-99EC-5503385A3633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88C22EC9-3069-41AA-99EC-5503385A3633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88C22EC9-3069-41AA-99EC-5503385A3633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88C22EC9-3069-41AA-99EC-5503385A3633}.Release|Any CPU.Build.0 = Release|Any CPU + {8B86105B-F6F4-49A9-B384-C2823F693F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B86105B-F6F4-49A9-B384-C2823F693F38}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B86105B-F6F4-49A9-B384-C2823F693F38}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B86105B-F6F4-49A9-B384-C2823F693F38}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/server.integrationTests/CharactersEndpointsTests.cs b/server.integrationTests/CharactersEndpointsTests.cs deleted file mode 100644 index 4624a4d..0000000 --- a/server.integrationTests/CharactersEndpointsTests.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Microsoft.AspNetCore.Mvc.Testing; -using server.Models; -using System.Net; -using System.Text.Json; - -namespace server.integrationTests -{ - [TestClass] - public class CharacterEndpointsTests - { - private readonly HttpClient _httpClient; - private readonly JsonSerializerOptions _serializerOptions; - public TestContext? TestContext { get; set; } - - public CharacterEndpointsTests() - { - var webAppFactory = new WebApplicationFactory(); - - _httpClient = webAppFactory.CreateDefaultClient(); - - _serializerOptions = new JsonSerializerOptions - { - PropertyNameCaseInsensitive = true - }; - } - - [TestMethod] - public async Task GetCharacters_AllCharacters_Returns200StatusWithCharacters() - { - var response = await _httpClient.GetAsync("/api/characters"); - var data = await response.Content.ReadAsStringAsync(); - var characters = JsonSerializer.Deserialize>(data, _serializerOptions); - - Assert.IsNotNull(characters); - Assert.AreEqual(HttpStatusCode.OK, response.StatusCode); - } - } -} \ No newline at end of file diff --git a/server.integrationTests/Usings.cs b/server.integrationTests/Usings.cs deleted file mode 100644 index ab67c7e..0000000 --- a/server.integrationTests/Usings.cs +++ /dev/null @@ -1 +0,0 @@ -global using Microsoft.VisualStudio.TestTools.UnitTesting; \ No newline at end of file diff --git a/server.integrationTests/server.integrationTests.csproj b/server.integrationTests/server.integrationTests.csproj deleted file mode 100644 index 19c5be3..0000000 --- a/server.integrationTests/server.integrationTests.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net6.0 - enable - enable - - false - - - - - - - - - - - - - - - diff --git a/server.tests/controllers/CharactersControllerTests.cs b/server.tests/controllers/CharactersControllerTests.cs deleted file mode 100644 index d801e76..0000000 --- a/server.tests/controllers/CharactersControllerTests.cs +++ /dev/null @@ -1,124 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Moq; -using server.Controllers.v1; -using server.Models; -using server.Persistence.Repositories; -using server.tests.Mocks; -using System.Net; -using System.Text.Json; -using Xunit.Abstractions; - -namespace tests.controllers -{ - public class CharactersControllerTests - { - private readonly Mock _mockRepo; - private readonly CharactersController _controller; - private readonly ITestOutputHelper _output; - - public CharactersControllerTests(ITestOutputHelper output) - { - _mockRepo = new Mock(); - _controller = new CharactersController(_mockRepo.Object); - _output = output; - } - - [Fact] - public async Task GetCharactersAsync_NoFilterParamsWithCharacters_Returns200StatusWithCharactersCollection() - { - var filter = new CharacterFilter(); - - var character = new Character - { - Id = "62b7d5506c1b407771829926", - FirstName = "Jason", - LastName = "Gideon", - ActorFirstName = "Mandy", - ActorLastName = "Patinkin", - Seasons = new int[] {1,2,3,10,15}, - FirstEpisode = "Extreme Aggressor", - LastEpisode = "In Name and Blood", - Image = "https://criminalmindsapi.stevanfreeborn.com/characters/jason-gideon.png", - Bio = "Jason Gideon was a criminal profiler, formerly the Senior Supervisory Special Agent of the FBI's Behavioral Analysis Unit. At the beginning of Season Three, Gideon abruptly retired from the BAU due to emotional issues brought on by the murder of his girlfriend. His position is now held by his former partner and best friend David Rossi, who has held it to this day. In the Season Ten episode \"Nelson's Sparrow\", he was murdered by Donnie Mallick.", - }; - - var characters = new List - { - character - }; - - _mockRepo - .Setup(repo => repo.GetCharactersAsync(filter)) - .ReturnsAsync(characters); - - var result = await _controller.GetCharactersAsync(filter) as ObjectResult; - var data = result?.Value as List; - - _mockRepo.Verify(repo => repo.GetCharactersAsync(It.IsAny()), Times.Once()); - Assert.IsType(result); - Assert.IsType>(data); - Assert.Equal(HttpStatusCode.OK, (HttpStatusCode)result.StatusCode); - Assert.Single(data); - } - - [Fact] - public async Task GetCharactersAsync_RepoThrowsException_Returns500StatusWithProblemDetail() - { - var filter = new CharacterFilter(); - - _mockRepo - .Setup(repo => repo.GetCharactersAsync(filter)) - .Throws(new Exception()); - - var result = await _controller.GetCharactersAsync(filter) as ObjectResult; - var data = result?.Value; - - _mockRepo.Verify(repo => repo.GetCharactersAsync(It.IsAny()), Times.Once()); - Assert.IsType(result); - Assert.IsType(data); - Assert.Equal(HttpStatusCode.InternalServerError, (HttpStatusCode)result.StatusCode); - } - - [Fact] - public async Task GetCharacterByIdAsync_ValidCharacterId_Returns200StatusWithCharacter() - { - throw new NotImplementedException(); - } - - [Fact] - public async Task GetCharacterByIdAsync_InvalidCharacterId_Returns400StatusWithValidationProblemDetail() - { - var characterId = "1"; - - _controller.ProblemDetailsFactory = new MockProblemDetailsFactory(); - - var result = await _controller.GetCharacterByIdAsync(characterId) as ObjectResult; - var data = result?.Value; - - string json = JsonSerializer.Serialize(result); - - _output.WriteLine(json); - - // Assert.IsType(result); - // Assert.IsType(); - } - - [Fact] - public async Task GetCharacterByIdAsync_RepoThrowsException_Returns500StatusWithProblemDetail() - { - var characterId = "62b7d5506c1b407771829938"; - - _mockRepo - .Setup(repo => repo.GetCharacterByIdAsync(characterId)) - .Throws(new Exception()); - - var result = await _controller.GetCharacterByIdAsync(characterId) as ObjectResult; - var data = result?.Value; - - _mockRepo.Verify(repo => repo.GetCharacterByIdAsync(It.IsAny()), Times.Once()); - Assert.IsType(result); - Assert.IsType(data); - Assert.Equal(HttpStatusCode.InternalServerError, (HttpStatusCode)result.StatusCode); - } - } -} diff --git a/server.tests/integrationTests/CharactersControllerIntegrationTests.cs b/server.tests/integrationTests/CharactersControllerIntegrationTests.cs new file mode 100644 index 0000000..455a8d2 --- /dev/null +++ b/server.tests/integrationTests/CharactersControllerIntegrationTests.cs @@ -0,0 +1,24 @@ +using FluentAssertions; +using Microsoft.AspNetCore.Mvc.Testing; +using System.Net; + +namespace server.tests.integrationTests +{ + public class CharactersControllerIntegrationTests + { + private readonly HttpClient _client; + + public CharactersControllerIntegrationTests() + { + var webAppFactory = new WebApplicationFactory(); + _client = webAppFactory.CreateDefaultClient(); + } + + [Fact] + public async Task GetCharacters_RetrievesAllCharacters_Returns200StatusCodeWithCharacters() + { + var response = await _client.GetAsync("/api/characters"); + response.StatusCode.Should().Be(HttpStatusCode.OK); + } + } +} diff --git a/server.tests/server.tests.csproj b/server.tests/server.tests.csproj index bc23e61..a00c304 100644 --- a/server.tests/server.tests.csproj +++ b/server.tests/server.tests.csproj @@ -9,9 +9,11 @@ - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/server.tests/unitTests/CharacterControllerUnitTests.cs b/server.tests/unitTests/CharacterControllerUnitTests.cs new file mode 100644 index 0000000..9337729 --- /dev/null +++ b/server.tests/unitTests/CharacterControllerUnitTests.cs @@ -0,0 +1,18 @@ +using Moq; +using server.Controllers.v1; +using server.Persistence.Repositories; + +namespace server.tests.unitTests +{ + public class CharacterControllerUnitTests + { + private readonly Mock _mockRepo; + private readonly CharactersController _controller; + + public CharacterControllerUnitTests() + { + _mockRepo = new Mock(); + _controller = new CharactersController(_mockRepo.Object); + } + } +} diff --git a/server/server.csproj b/server/server.csproj index 309d659..d48351d 100644 --- a/server/server.csproj +++ b/server/server.csproj @@ -21,7 +21,7 @@ - +