Fixes
This commit is contained in:
parent
d57a218fc9
commit
f00850edd9
1 changed files with 8 additions and 16 deletions
|
@ -11,17 +11,8 @@ import static org.mockito.Mockito.when;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DimmableSaveRequest;
|
import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DimmableSaveRequest;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
|
import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
|
import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
|
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLightRepository;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
|
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
|
import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
|
|
||||||
import java.security.Principal;
|
import java.security.Principal;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import lombok.SneakyThrows;
|
import lombok.SneakyThrows;
|
||||||
|
@ -115,12 +106,13 @@ public class DimmableLightControllerTests {
|
||||||
when(deviceService.saveAsGuest(any(DimmableLight.class), eq("user"), anyLong()))
|
when(deviceService.saveAsGuest(any(DimmableLight.class), eq("user"), anyLong()))
|
||||||
.thenAnswer(i -> i.getArguments()[0]);
|
.thenAnswer(i -> i.getArguments()[0]);
|
||||||
|
|
||||||
when(Utils.returnIfGuest(
|
User guest = new User();
|
||||||
any(UserRepository.class),
|
User host = new User();
|
||||||
any(DimmableLight.class),
|
host.getGuests().add(guest);
|
||||||
anyLong(),
|
guest.getHosts().add(host);
|
||||||
any(Principal.class)))
|
|
||||||
.thenAnswer(i -> i.getArguments()[1]);
|
when(userRepository.findById(20L)).thenReturn(Optional.of(host));
|
||||||
|
when(userRepository.findByUsername("user")).thenReturn(guest);
|
||||||
|
|
||||||
MockHttpServletRequest request = new MockHttpServletRequest();
|
MockHttpServletRequest request = new MockHttpServletRequest();
|
||||||
RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
|
RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
|
||||||
|
|
Loading…
Reference in a new issue