mirror of
https://codeberg.org/beerbrawl/beerbrawl.git
synced 2024-09-23 09:40:52 +02:00
test(#28): fix beer pong table issues from rebase
This commit is contained in:
parent
5eaeb04cfc
commit
dfd4ad9f3b
|
@ -13,7 +13,6 @@ import at.ac.tuwien.sepr.groupphase.backend.service.TournamentService;
|
|||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -53,11 +52,6 @@ public class BeerPongTableEndpointTest extends TestUserData implements TestData
|
|||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@AfterEach
|
||||
void cleanupUser() {
|
||||
userRepository.deleteAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createNewBeerPongTableForExistingTournamentThatWasCreatedByTheCurrentUser() throws Exception {
|
||||
// setup
|
||||
|
@ -75,7 +69,7 @@ public class BeerPongTableEndpointTest extends TestUserData implements TestData
|
|||
tableDto.setTournamentId(tournament.getId());
|
||||
|
||||
var mvcResult = this.mockMvc.perform(post(BEER_PONG_TABLE_BASE_URI)
|
||||
.header(securityProperties.getAuthHeader(), jwtTokenizer.getAuthToken(user.getUsername(), ADMIN_ROLES))
|
||||
.header(securityProperties.getAuthHeader(), jwtTokenizer.getAuthToken(user.getUsername(), TEST_USER_ROLES))
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(tableDto)))
|
||||
.andDo(print())
|
||||
|
@ -111,7 +105,7 @@ public class BeerPongTableEndpointTest extends TestUserData implements TestData
|
|||
|
||||
var mvcResult = this.mockMvc.perform(post(BEER_PONG_TABLE_BASE_URI)
|
||||
.header(securityProperties.getAuthHeader(),
|
||||
jwtTokenizer.getAuthToken(user.getUsername() + "_", ADMIN_ROLES))
|
||||
jwtTokenizer.getAuthToken(user.getUsername() + "_", TEST_USER_ROLES))
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(tableDto)))
|
||||
.andDo(print())
|
||||
|
@ -129,7 +123,7 @@ public class BeerPongTableEndpointTest extends TestUserData implements TestData
|
|||
|
||||
var mvcResult = this.mockMvc.perform(post(BEER_PONG_TABLE_BASE_URI)
|
||||
.header(securityProperties.getAuthHeader(),
|
||||
jwtTokenizer.getAuthToken(ADMIN_USER, ADMIN_ROLES))
|
||||
jwtTokenizer.getAuthToken(TEST_USER, TEST_USER_ROLES))
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(tableDto)))
|
||||
.andDo(print())
|
||||
|
|
|
@ -3,7 +3,7 @@ package at.ac.tuwien.sepr.groupphase.backend.integrationtest;
|
|||
import at.ac.tuwien.sepr.groupphase.backend.basetest.TestData;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.basetest.TestUserData;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.config.properties.SecurityProperties;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.datagenerator.TestUserGenerator;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.datagenerator.TestDataGenerator;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.endpoint.dto.CreateTournamentDto;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.endpoint.dto.TournamentDto;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.endpoint.dto.TournamentQualificationMatchDto;
|
||||
|
@ -127,7 +127,7 @@ public class TournamentEndpointTest extends TestUserData implements TestData {
|
|||
var tournament = new Tournament();
|
||||
tournament.setName("TOURNAMENT_WITH_TEAMS");
|
||||
tournament.setMaxParticipants(64l);
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestUserGenerator.TEST_USER));
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestDataGenerator.TEST_USER));
|
||||
tournament.setRegistrationEnd(LocalDateTime.now().plusDays(1));
|
||||
|
||||
tournamentRepository.saveAndFlush(tournament);
|
||||
|
@ -179,7 +179,7 @@ public class TournamentEndpointTest extends TestUserData implements TestData {
|
|||
var tournament = new Tournament();
|
||||
tournament.setName("TOURNAMENT_WITHOUT_TEAMS");
|
||||
tournament.setMaxParticipants(64l);
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestUserGenerator.TEST_USER));
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestDataGenerator.TEST_USER));
|
||||
tournament.setRegistrationEnd(LocalDateTime.now().plusDays(1));
|
||||
|
||||
tournamentRepository.saveAndFlush(tournament);
|
||||
|
@ -205,7 +205,7 @@ public class TournamentEndpointTest extends TestUserData implements TestData {
|
|||
var tournament = new Tournament();
|
||||
tournament.setName("TOURNAMENT_WITHOUT_TEAMS");
|
||||
tournament.setMaxParticipants(64l);
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestUserGenerator.TEST_USER));
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestDataGenerator.TEST_USER));
|
||||
tournament.setRegistrationEnd(LocalDateTime.now().plusDays(1));
|
||||
|
||||
tournamentRepository.saveAndFlush(tournament);
|
||||
|
|
|
@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
|
|||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
|
@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
import at.ac.tuwien.sepr.groupphase.backend.basetest.TestData;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.basetest.TestUserData;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.entity.Tournament;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.datagenerator.TestUserGenerator;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.datagenerator.TestDataGenerator;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.entity.Team;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.exception.NotFoundException;
|
||||
import at.ac.tuwien.sepr.groupphase.backend.exception.PreconditionFailedException;
|
||||
|
@ -53,7 +53,7 @@ public class TournamentServiceTest extends TestUserData implements TestData {
|
|||
tournament.setName("TEST_TOURNAMENT");
|
||||
tournament.setRegistrationEnd(LocalDateTime.now().plusDays(1));
|
||||
tournament.setMaxParticipants(64L);
|
||||
tournament = tournamentService.create(tournament, TestUserGenerator.TEST_USER);
|
||||
tournament = tournamentService.create(tournament, TestDataGenerator.TEST_USER);
|
||||
|
||||
assertNotNull(tournament);
|
||||
assertTrue(tournamentRepository.existsById(tournament.getId()));
|
||||
|
@ -68,7 +68,7 @@ public class TournamentServiceTest extends TestUserData implements TestData {
|
|||
var tournament = new Tournament();
|
||||
tournament.setName("TOURNAMENT_WITH_TEAMS");
|
||||
tournament.setMaxParticipants(64l);
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestUserGenerator.TEST_USER));
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestDataGenerator.TEST_USER));
|
||||
tournament.setRegistrationEnd(LocalDateTime.now().plusDays(1));
|
||||
|
||||
tournamentRepository.saveAndFlush(tournament);
|
||||
|
@ -110,7 +110,7 @@ public class TournamentServiceTest extends TestUserData implements TestData {
|
|||
var tournament = new Tournament();
|
||||
tournament.setName("TOURNAMENT_WITHOUT_TEAMS");
|
||||
tournament.setMaxParticipants(64l);
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestUserGenerator.TEST_USER));
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestDataGenerator.TEST_USER));
|
||||
tournament.setRegistrationEnd(LocalDateTime.now().plusDays(1));
|
||||
|
||||
tournamentRepository.saveAndFlush(tournament);
|
||||
|
@ -125,7 +125,7 @@ public class TournamentServiceTest extends TestUserData implements TestData {
|
|||
var tournament = new Tournament();
|
||||
tournament.setName("TOURNAMENT_WITHOUT_TEAMS");
|
||||
tournament.setMaxParticipants(64l);
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestUserGenerator.TEST_USER));
|
||||
tournament.setOrganizer(userRepository.findByUsername(TestDataGenerator.TEST_USER));
|
||||
tournament.setRegistrationEnd(LocalDateTime.now().plusDays(1));
|
||||
|
||||
tournamentRepository.saveAndFlush(tournament);
|
||||
|
|
Loading…
Reference in a new issue