Fixes

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

@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 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/models/BooleanConditionTests.java

@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switch;
 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/models/BooleanTriggerTests.java

@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switch;
 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/models/ButtonDimmerTests.java

@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmer;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;

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

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
 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/models/ConfirmationTokenTests.java

@@ -1,9 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationToken;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import java.util.Date;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

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

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Curtains;
 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/models/DimmableLightTests.java

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

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

@@ -1,9 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
 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/models/DimmableTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.util.HashSet;
 import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;

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

@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
 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/models/KnobDimmerTests.java

@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -44,4 +41,10 @@ public class KnobDimmerTests {
             }
         }
     }
+
+    @Test
+    public void testReadTriggerState() {
+        this.knobDimmer.setLightIntensity(1);
+        assertEquals(1, this.knobDimmer.readTriggerState());
+    }
 }

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

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -22,5 +21,6 @@ public class MotionSensorTests {
     public void setAndGetDetected() {
         this.motionSensor.setDetected(true);
         assertTrue(this.motionSensor.isDetected());
+        assertTrue(this.motionSensor.readTriggerState());
     }
 }

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OperatorTests.java

@@ -0,0 +1,21 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class OperatorTests {
+    @Test
+    public void testOperators() {
+        assertThat(Operator.EQUAL.checkAgainst(30, 30)).isTrue();
+        assertThat(Operator.EQUAL.checkAgainst(20, 30)).isFalse();
+        assertThat(Operator.LESS.checkAgainst(20, 30)).isTrue();
+        assertThat(Operator.LESS.checkAgainst(40, 30)).isFalse();
+        assertThat(Operator.LESS_EQUAL.checkAgainst(30, 30)).isTrue();
+        assertThat(Operator.LESS_EQUAL.checkAgainst(40, 30)).isFalse();
+        assertThat(Operator.GREATER.checkAgainst(40, 30)).isTrue();
+        assertThat(Operator.GREATER.checkAgainst(30, 30)).isFalse();
+        assertThat(Operator.GREATER_EQUAL.checkAgainst(30, 30)).isTrue();
+        assertThat(Operator.GREATER_EQUAL.checkAgainst(20, 30)).isFalse();
+    }
+}

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

@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
 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/models/RangeTriggerTests.java

@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
 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/models/RegularLightTests.java

@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
 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/models/RoomTests.java

@@ -1,11 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Room;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 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/models/ScenePriorityTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority;
 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/models/SceneTests.java

@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
 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/models/SecurityCameraTests.java

@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SecurityCamera;
 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/models/SensorTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor.SensorType;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +31,7 @@ public class SensorTests {
     public void getAndSetValue() {
         sensor.setValue(new BigDecimal(40));
 
-        assertEquals(new BigDecimal(40), sensor.getValue());
+        assertEquals(40.0, sensor.readTriggerState());
     }
 
     @Test

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

@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SmartPlug;
 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/models/StateTests.java

@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
 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/models/SwitchTests.java

@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 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/models/SwitchableStateTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
 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/models/ThermostatConditionTests.java

@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat.Mode;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition.Operator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -49,5 +47,13 @@ public class ThermostatConditionTests {
 
         thermostatCondition.setOperator(Operator.NOTEQUAL);
         assertFalse(thermostatCondition.triggered());
+
+        t.setMode(Mode.COOLING);
+
+        thermostatCondition.setOperator(Operator.EQUAL);
+        assertFalse(thermostatCondition.triggered());
+
+        thermostatCondition.setOperator(Operator.NOTEQUAL);
+        assertTrue(thermostatCondition.triggered());
     }
 }

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

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 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/models/TriggerTests.java

@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
 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/models/UserTests.java

@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 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/utils/UtilsTests.java

@@ -43,5 +43,15 @@ public class UtilsTests {
 
         assertThatThrownBy(() -> Utils.returnIfGuest(userRepository, "toReturn", 2L, principal))
                 .isInstanceOf(NotFoundException.class);
+
+        host.getGuests().clear();
+
+        assertThatThrownBy(
+                        () ->
+                                assertThat(
+                                                Utils.returnIfGuest(
+                                                        userRepository, "toReturn", 1L, principal))
+                                        .isEqualTo("toReturn"))
+                .isInstanceOf(NotFoundException.class);
     }
 }