diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequestTest.java similarity index 98% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequestTest.java index aec1231..d796526 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequestTests.java similarity index 91% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequestTests.java index e9b0516..8bd6cc0 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java index 7a219b1..6c99297 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java similarity index 91% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java index 1a6634a..74fafc3 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequestTests.java similarity index 92% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequestTests.java index 816c588..ac3b7a2 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequestTests.java similarity index 89% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequestTests.java index 7a3be15..d98311b 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java similarity index 93% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java index eeb108b..51b4fd2 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequestTests.java similarity index 94% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequestTests.java index 90dbc3f..5592bd2 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequestTests.java similarity index 91% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequestTests.java index 8126088..232c8f5 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponseTests.java similarity index 90% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponseTests.java index 621f64c..ba82712 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java index 07ff076..adf0a52 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java similarity index 98% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java index 2bbd99b..7c4e7c7 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java similarity index 96% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanConditionTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java index 8e7a885..824a8fb 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanConditionTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java similarity index 96% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanTriggerTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java index 8972d70..a1fc6e7 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanTriggerTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java similarity index 96% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java index 7f2829f..421ca0f 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java similarity index 94% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConditionTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java index 6c66cd5..b676b28 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConditionTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConfirmationTokenTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConfirmationTokenTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java index 363fa0c..5503552 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConfirmationTokenTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/CurtainsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/CurtainsTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java index 06bd3e2..c366510 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/CurtainsTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableLightTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java similarity index 98% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableLightTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java index f54e754..a72b16e 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableLightTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java index 3c19612..9b58d94 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java index 54d1992..a50d2cb 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java index 0d2b24e..5f1ec32 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java similarity index 96% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java index 2a77c47..181dc57 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java similarity index 92% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java index 9a547e0..9c4d9ac 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java index 1d7772e..d963fda 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java index 28e2a29..27a5623 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java similarity index 96% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java index 17ec2e4..97a66b4 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java index e6fd907..538806f 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java index 6d27fbf..b2309b4 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java index 28c6f84..a72557c 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java index 857f64e..1fc45fc 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java index 4cc53c8..f9c49ad 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java similarity index 95% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java index a586128..046a2d2 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java similarity index 96% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java index 3c5ef86..7b1e513 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java similarity index 98% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java index 7b1738d..b05bb94 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java similarity index 92% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java index d95d01c..c9be074 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java index d19ce69..3e3de78 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java similarity index 98% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java index abff3be..c708c93 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java index eeced96..ca8dec0 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java +++ b/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; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java similarity index 97% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java index 2331dc3..9a4c1e0 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java +++ b/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.*; diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java similarity index 94% rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java index 554783b..c5fcc8d 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java +++ b/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;