From 2c3bc59483f692ab2e90b379f3b4c78b69721627 Mon Sep 17 00:00:00 2001
From: Erik Moravec <xmoravec@fi.muni.cz>
Date: Fri, 28 May 2021 19:54:01 +0200
Subject: [PATCH] fix: fixed warnings in facades tests
---
.../facades/LeagueManagerFacadeImplTest.java | 10 ++--------
.../icehockeymanager/facades/UserFacadeImplTest.java | 6 ++----
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
index ee74b01..f954dcb 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
@@ -45,13 +45,6 @@ public class LeagueManagerFacadeImplTest {
return team;
}
- public TeamDto buildTeamDTO(Long id, String name) {
- var team = new TeamDto();
- team.setId(id);
- team.setName(name);
- return team;
- }
-
public Game buildGameMock(Long id) {
var game = mock(Game.class);
when(game.getId()).thenReturn(id);
@@ -111,7 +104,7 @@ public class LeagueManagerFacadeImplTest {
public void updateGameScore() {
var game = buildGameMock(1L);
var gameUpdate = buildGameUpdateDTO(game, 1, 2);
- when(gameService.findGame(1L)).thenReturn(Optional.ofNullable(game));
+ when(gameService.findGame(1L)).thenReturn(Optional.of(game));
leagueManagerFacade.updateGameScore(gameUpdate);
verify(gameService).updateGameScore(game, 1, 2);
}
@@ -122,6 +115,7 @@ public class LeagueManagerFacadeImplTest {
when(gameService.findGame(1L)).thenReturn(Optional.ofNullable(game));
var team = buildTeamMock(1L, "edmonton");
when(teamService.findTeam(1L)).thenReturn(Optional.ofNullable(team));
+ assert game != null;
var gameWinner = buildGameWinnerDTO(game, 1L);
leagueManagerFacade.setGameWinner(gameWinner);
verify(gameService).setGameWinner(game, team);
diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
index 01593a2..afa09e8 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
@@ -216,18 +216,16 @@ class UserFacadeImplTest {
return game;
}
- private Team addHomeGames(Team team, Game... games) {
+ private void addHomeGames(Team team, Game... games) {
for (Game game : games)
when(game.getHomeTeam()).thenReturn(team);
when(team.getHomeGames()).thenReturn(new HashSet<>(Arrays.asList(games)));
- return team;
}
- private Team addAwayGames(Team team, Game... games) {
+ private void addAwayGames(Team team, Game... games) {
for (Game game : games)
when(game.getAwayTeam()).thenReturn(team);
when(team.getAwayGames()).thenReturn(new HashSet<>(Arrays.asList(games)));
- return team;
}
public PlayerDto buildPlayerDTO(Long id, String name) {
--
GitLab