fix issues on api testing

Jowindebondt · Jun 6, 2024 · 83271aa · 83271aa
1 parent cdc5b62
commit 83271aa
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 31 deletions.
diff --git a/Server/TournamentManager.Api.Test/GameApi/UnitTestGameController.cs b/Server/TournamentManager.Api.Test/GameApi/UnitTestGameController.cs
@@ -43,18 +43,20 @@ public void GetList_ReturnsOkWithFilledList_ServiceGetAllCalledOnce()
 
     [Fact]
     [Trait(TraitCategories.TestLevel, TestLevels.UnitTest)]
-    public void GetList_ReturnsNotFound_ServiceGetAllCalledOnce()
+    public void GetList_ReturnsOkWithEmptyList_ServiceGetAllCalledOnce()
     {
         // arrange
         _mockService.Setup(service => service.GetAll(It.IsAny<int>())).Returns((IEnumerable<Game>)null);
+        OkObjectResult okResult = null;
 
         // act
         var result = _controller.GetList(-1);
 
         // assert
         Assert.Multiple(
             () => _mockService.Verify(service => service.GetAll(It.IsAny<int>()), Times.Once),
-            () => Assert.IsType<NotFoundResult>(result)
+            () => okResult = Assert.IsType<OkObjectResult>(result),
+            () => Assert.Null(okResult.Value)
         );
     }
 

diff --git a/Server/TournamentManager.Api.Test/MatchApi/UnitTestMatchController.cs b/Server/TournamentManager.Api.Test/MatchApi/UnitTestMatchController.cs
@@ -42,18 +42,20 @@ public void GetList_ReturnsOkWithFilledList_ServiceGetAllCalledOnce()
 
     [Fact]
     [Trait(TraitCategories.TestLevel, TestLevels.UnitTest)]
-    public void GetList_ReturnsNotFound_ServiceGetAllCalledOnce()
+    public void GetList_ReturnsOkWithEmptyList_ServiceGetAllCalledOnce()
     {
         // arrange
         _mockService.Setup(service => service.GetAll(It.IsAny<int>())).Returns((IEnumerable<Domain.Match>)null);
+        OkObjectResult okResult = null;
 
         // act
         var result = _controller.GetList(-1);
 
         // assert
         Assert.Multiple(
             () => _mockService.Verify(service => service.GetAll(It.IsAny<int>()), Times.Once),
-            () => Assert.IsType<NotFoundResult>(result)
+            () => okResult = Assert.IsType<OkObjectResult>(result),
+            () => Assert.Null(okResult.Value)
         );
     }
 

diff --git a/Server/TournamentManager.Api.Test/MemberApi/UnitTestMemberController.cs b/Server/TournamentManager.Api.Test/MemberApi/UnitTestMemberController.cs
@@ -43,18 +43,20 @@ public void GetList_ReturnsOkWithFilledList_ServiceGetAllCalledOnce()
 
     [Fact]
     [Trait(TraitCategories.TestLevel, TestLevels.UnitTest)]
-    public void GetList_ReturnsNotFound_ServiceGetAllCalledOnce()
+    public void GetList_ReturnsOkWithEmptyList_ServiceGetAllCalledOnce()
     {
         // arrange
         _mockService.Setup(service => service.GetAll(It.IsAny<int>())).Returns((IEnumerable<Member>)null);
+        OkObjectResult okResult = null;
 
         // act
         var result = _controller.GetList(-1);
 
         // assert
         Assert.Multiple(
             () => _mockService.Verify(service => service.GetAll(It.IsAny<int>()), Times.Once),
-            () => Assert.IsType<NotFoundResult>(result)
+            () => okResult = Assert.IsType<OkObjectResult>(result),
+            () => Assert.Null(okResult.Value)
         );
     }
 

diff --git a/Server/TournamentManager.Api.Test/PouleApi/UnitTestPouleController.cs b/Server/TournamentManager.Api.Test/PouleApi/UnitTestPouleController.cs
@@ -43,18 +43,20 @@ public void GetList_ReturnsOkWithFilledList_ServiceGetAllCalledOnce()
 
     [Fact]
     [Trait(TraitCategories.TestLevel, TestLevels.UnitTest)]
-    public void GetList_ReturnsNotFound_ServiceGetAllCalledOnce()
+    public void GetList_ReturnsOkWithEmptyList_ServiceGetAllCalledOnce()
     {
         // arrange
         _mockService.Setup(service => service.GetAll(It.IsAny<int>())).Returns((IEnumerable<Poule>)null);
+        OkObjectResult okResult = null;
 
         // act
         var result = _controller.GetList(-1);
 
         // assert
         Assert.Multiple(
             () => _mockService.Verify(service => service.GetAll(It.IsAny<int>()), Times.Once),
-            () => Assert.IsType<NotFoundResult>(result)
+            () => okResult = Assert.IsType<OkObjectResult>(result),
+            () => Assert.Null(okResult.Value)
         );
     }
 

diff --git a/Server/TournamentManager.Api.Test/RoundApi/UnitTestRoundController.cs b/Server/TournamentManager.Api.Test/RoundApi/UnitTestRoundController.cs
@@ -43,18 +43,20 @@ public void GetList_ReturnsOkWithFilledList_ServiceGetAllCalledOnce()
 
     [Fact]
     [Trait(TraitCategories.TestLevel, TestLevels.UnitTest)]
-    public void GetList_ReturnsNotFound_ServiceGetAllCalledOnce()
+    public void GetList_ReturnsOkWithEmptyList_ServiceGetAllCalledOnce()
     {
         // arrange
         _mockService.Setup(service => service.GetAll(It.IsAny<int>())).Returns((IEnumerable<Round>)null);
+        OkObjectResult okResult = null;
 
         // act
         var result = _controller.GetList(-1);
 
         // assert
         Assert.Multiple(
             () => _mockService.Verify(service => service.GetAll(It.IsAny<int>()), Times.Once),
-            () => Assert.IsType<NotFoundResult>(result)
+            () => okResult = Assert.IsType<OkObjectResult>(result),
+            () => Assert.Null(okResult.Value)
         );
     }
 

diff --git a/Server/TournamentManager.Api.Test/TournamentApi/UnitTestTournamentController.cs b/Server/TournamentManager.Api.Test/TournamentApi/UnitTestTournamentController.cs
@@ -48,7 +48,6 @@ public void GetList_ReturnsOkWithEmptyList_ServiceGetAllCalledOnce()
         _mockService.Setup(service => service.GetAll()).Returns((IEnumerable<Tournament>)null);
         var controller = new TournamentController(_mockService.Object);
         OkObjectResult okResult = null;
-        IEnumerable<Tournament> content = null;
 
         // act
         var result = controller.GetList();

diff --git a/Server/TournamentManager.Api/Controllers/GameController.cs b/Server/TournamentManager.Api/Controllers/GameController.cs
@@ -31,9 +31,6 @@ public GameController(IGameService gameService)
     public IActionResult GetList([FromRoute]int matchId) 
     {
         var list = _gameService.GetAll(matchId);
-        if (list == null) {
-            return NotFound();
-        }
         return Ok(list); 
     }
 

diff --git a/Server/TournamentManager.Api/Controllers/MatchController.cs b/Server/TournamentManager.Api/Controllers/MatchController.cs
@@ -31,9 +31,6 @@ public MatchController(IMatchService matchService)
     public IActionResult GetList([FromRoute]int pouleId) 
     {
         var list = _matchService.GetAll(pouleId);
-        if (list == null) {
-            return NotFound();
-        }
         return Ok(list); 
     }
 

diff --git a/Server/TournamentManager.Api/Controllers/MemberController.cs b/Server/TournamentManager.Api/Controllers/MemberController.cs
@@ -31,9 +31,6 @@ public MemberController(IMemberService memberService)
     public IActionResult GetList([FromRoute]int tournamentId) 
     {
         var list = _memberService.GetAll(tournamentId);
-        if (list == null) {
-            return NotFound();
-        }
         return Ok(list); 
     }
 

diff --git a/Server/TournamentManager.Api/Controllers/PouleController.cs b/Server/TournamentManager.Api/Controllers/PouleController.cs
@@ -31,9 +31,6 @@ public PouleController(IPouleService pouleService)
     public IActionResult GetList([FromRoute]int roundId) 
     {
         var list = _pouleService.GetAll(roundId);
-        if (list == null) {
-            return NotFound();
-        }
         return Ok(list); 
     }
 

diff --git a/Server/TournamentManager.Api/Controllers/RoundController.cs b/Server/TournamentManager.Api/Controllers/RoundController.cs
@@ -30,9 +30,6 @@ public RoundController(IRoundService roundService)
     public IActionResult GetList([FromRoute]int tournamentId) 
     {
         var list = _roundService.GetAll(tournamentId);
-        if (list == null) {
-            return NotFound();
-        }
         return Ok(list); 
     }
 

diff --git a/Server/TournamentManager.Api/Program.cs b/Server/TournamentManager.Api/Program.cs
@@ -20,6 +20,10 @@
 builder.Services.AddScoped<ITournamentService, TournamentService>();
 builder.Services.AddScoped<IRoundService, RoundService>();
 builder.Services.AddScoped<IPouleService, PouleService>();
+builder.Services.AddScoped<IMemberService, MemberService>();
+builder.Services.AddScoped<IMatchService, MatchService>();
+builder.Services.AddScoped<IGameService, GameService>();
+builder.Services.AddScoped<IPlayerService, PlayerService>();
 #endregion
 
 var app = builder.Build();

diff --git a/Server/TournamentManager.Domain/Entities/Member.cs b/Server/TournamentManager.Domain/Entities/Member.cs
@@ -29,9 +29,9 @@ public class Member : BaseEntity
     /// <summary>
     /// Reference to the related <see cref="Tournament"/>
     /// </summary>
-    public virtual Tournament Tournament { get; set; } = null!;
+    public virtual Tournament? Tournament { get; set; } = null!;
     /// <summary>
     /// Reference to the <see cref="Player"/>
     /// </summary>
-    public virtual Player Player { get; set; } = null!; 
+    public virtual Player? Player { get; set; } = null!; 
 }
diff --git a/Server/TournamentManager.Domain/Entities/Poule.cs b/Server/TournamentManager.Domain/Entities/Poule.cs
@@ -22,7 +22,7 @@ public class Poule : BaseEntity
     /// <summary>
     /// Reference to the related <see cref="Round"/>
     /// </summary>
-    public virtual Round Round { get; set; } = null!;
+    public virtual Round? Round { get; set; } = null!;
 
     /// <summary>
     /// Collection of <see cref="Match"/>es that are part of this poule

diff --git a/Server/TournamentManager.Domain/Entities/Round.cs b/Server/TournamentManager.Domain/Entities/Round.cs
@@ -17,12 +17,12 @@ public class Round : BaseEntity
     /// <summary>
     /// Reference to the related <see cref="Tournament"/>
     /// </summary>
-    public virtual Tournament Tournament { get; set; } = null!;
+    public virtual Tournament? Tournament { get; set; } = null!;
 
     /// <summary>
     /// Reference of the <see cref="RoundSettings"/> that are applied to the round
     /// </summary>
-    public virtual RoundSettings Settings { get; set; } = null!;
+    public virtual RoundSettings? Settings { get; set; } = null!;
     /// <summary>
     /// Collection of <see cref="Poule"/>s that are part of this round.
     /// </summary>