Merge branch 'tests' into 'dev'

Reorganized tests

See merge request sa4-2020/the-sanmarinoes/backend!156

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequestTest.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequestTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SceneSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java

@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchOperationRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequestTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequestTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableStateSaveRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatConditionSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequestTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatSaveRequest;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequestTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponseTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.error;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.error.*;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java

@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.utils;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.when;
@@ -6,7 +6,6 @@ import static org.mockito.Mockito.when;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;