From 3d9ddb5ffdee6be7b9a445817e0936ed0ac00266 Mon Sep 17 00:00:00 2001 From: omenem Date: Fri, 15 May 2020 18:52:57 +0200 Subject: [PATCH 1/7] some tests --- .../smarthut/DimmableStateTests.java | 38 ++++++++++++ .../sa4/sanmarinoes/smarthut/DimmerTests.java | 44 +++++++++++++ .../smarthut/MotionSensorTests.java | 26 ++++++++ .../smarthut/RangeConditionTests.java | 61 ++++++++++++++++++ .../smarthut/RangeTriggerTests.java | 62 +++++++++++++++++++ .../smarthut/ScenePriorityTests.java | 43 +++++++++++++ .../sa4/sanmarinoes/smarthut/SceneTests.java | 52 ++++++++++++++++ .../smarthut/SecurityCameraTests.java | 44 +++++++++++++ .../sa4/sanmarinoes/smarthut/SensorTests.java | 46 ++++++++++++++ .../sa4/sanmarinoes/smarthut/StateTests.java | 58 +++++++++++++++++ 10 files changed, 474 insertions(+) create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java new file mode 100644 index 0000000..87bd181 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java @@ -0,0 +1,38 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +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; + +@DisplayName("Dimmable State Tests") +public class DimmableStateTests { + + private DimmableState dimmableState; + + @BeforeEach + public void createDimmableState() { + dimmableState = new DimmableState<>(); + } + + @Test + @DisplayName("get and set intensity") + public void getAndSetIntensity() { + this.dimmableState.setIntensity(20); + assertEquals(20, this.dimmableState.getIntensity()); + } + + @Test + @DisplayName("apply") + public void apply() { + DimmableLight d = new DimmableLight(); + d.setIntensity(45); + this.dimmableState.setDevice(d); + this.dimmableState.setIntensity(30); + this.dimmableState.apply(); + assertEquals(30, this.dimmableState.getDevice().getIntensity()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java new file mode 100644 index 0000000..b3971b8 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java @@ -0,0 +1,44 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.*; + +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; + +@DisplayName("Dimmer Tests") +public class DimmerTests { + + private KnobDimmer dimmer; + + @BeforeEach + public void createDimmer() { + dimmer = new KnobDimmer(); + } + + @Test + @DisplayName("connect true") + public void connectTrue() { + DimmableLight d = new DimmableLight(); + dimmer.connect(d, true); + + assertTrue(d.getDimmers().contains((this.dimmer))); + + assertTrue((this.dimmer.getOutputs().contains(d))); + } + + @Test + @DisplayName("connect off") + public void connectOff() { + DimmableLight d = new DimmableLight(); + d.getDimmers().add(this.dimmer); + dimmer.getOutputs().add(d); + dimmer.connect(d, false); + + assertFalse(d.getDimmers().contains((this.dimmer))); + + assertFalse((this.dimmer.getOutputs().contains(d))); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java new file mode 100644 index 0000000..9a547e0 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java @@ -0,0 +1,26 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +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; + +@DisplayName("Motion Sensor Tests") +public class MotionSensorTests { + + private MotionSensor motionSensor; + + @BeforeEach + public void createMotionSensor() { + motionSensor = new MotionSensor(); + } + + @Test + @DisplayName("set and get detected") + public void setAndGetDetected() { + this.motionSensor.setDetected(true); + assertTrue(this.motionSensor.isDetected()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java new file mode 100644 index 0000000..354d6da --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java @@ -0,0 +1,61 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.*; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition.Operator; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +@DisplayName("RAnge Condition Tests") +public class RangeConditionTests { + + private RangeCondition rangeCondition; + + @BeforeEach + public void creteRangeCondition() { + this.rangeCondition = new RangeCondition(); + } + + @Test + @DisplayName("set and get operator") + public void setAndGetOperator() { + rangeCondition.setOperator(RangeCondition.Operator.EQUAL); + + assertEquals(RangeCondition.Operator.EQUAL, rangeCondition.getOperator()); + } + + @Test + @DisplayName("set and get range") + public void setAndGetRange() { + rangeCondition.setRange(20.5); + + assertEquals(20.5, rangeCondition.getRange()); + } + + @Test + @DisplayName("triggered") + public void triggered() { + DimmableLight d = new DimmableLight(); + d.setIntensity(40); + rangeCondition.setDevice(d); + rangeCondition.setRange(45D); + + rangeCondition.setOperator(RangeCondition.Operator.EQUAL); + assertFalse(rangeCondition.triggered()); + + rangeCondition.setOperator(RangeCondition.Operator.LESS); + assertTrue(rangeCondition.triggered()); + + rangeCondition.setOperator(Operator.GREATER); + assertFalse(rangeCondition.triggered()); + + rangeCondition.setOperator(Operator.LESS_EQUAL); + assertTrue(rangeCondition.triggered()); + + rangeCondition.setOperator(Operator.GREATER_EQUAL); + assertFalse(rangeCondition.triggered()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java new file mode 100644 index 0000000..6dda510 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java @@ -0,0 +1,62 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.assertEquals; +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.RangeTrigger; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +@DisplayName("Range Trigger Tests") +public class RangeTriggerTests { + + private RangeTrigger rangeTrigger; + + @BeforeEach + public void createRangeTrigger() { + this.rangeTrigger = new RangeTrigger(); + } + + @Test + @DisplayName("set and get operator") + public void setAndGetOperator() { + rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL); + + assertEquals(RangeTrigger.Operator.EQUAL, rangeTrigger.getOperator()); + } + + @Test + @DisplayName("set and get range") + public void setAndGetRange() { + rangeTrigger.setRange(20.5); + + assertEquals(20.5, rangeTrigger.getRange()); + } + + @Test + @DisplayName("triggered") + public void triggered() { + DimmableLight d = new DimmableLight(); + d.setIntensity(40); + rangeTrigger.setDevice(d); + rangeTrigger.setRange(45D); + + rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL); + assertFalse(rangeTrigger.triggered()); + + rangeTrigger.setOperator(RangeTrigger.Operator.LESS); + assertTrue(rangeTrigger.triggered()); + + rangeTrigger.setOperator(RangeTrigger.Operator.GREATER); + assertFalse(rangeTrigger.triggered()); + + rangeTrigger.setOperator(RangeTrigger.Operator.LESS_EQUAL); + assertTrue(rangeTrigger.triggered()); + + rangeTrigger.setOperator(RangeTrigger.Operator.GREATER_EQUAL); + assertFalse(rangeTrigger.triggered()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java new file mode 100644 index 0000000..6d27fbf --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java @@ -0,0 +1,43 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +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; + +@DisplayName("Scene Priority Tests") +public class ScenePriorityTests { + + private ScenePriority scenePriority; + + @BeforeEach + public void scenePriorityCreate() { + this.scenePriority = new ScenePriority(); + } + + @Test + @DisplayName("get and set automation id") + public void getAndSetAutomationId() { + scenePriority.setAutomationId(20L); + + assertEquals(20, scenePriority.getAutomationId()); + } + + @Test + @DisplayName("get and set scene id") + public void getAndSetSceneId() { + scenePriority.setSceneId(20L); + + assertEquals(20, scenePriority.getSceneId()); + } + + @Test + @DisplayName("get and set priority") + public void getAndSetPriority() { + scenePriority.setPriority(20); + + assertEquals(20, scenePriority.getPriority()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java new file mode 100644 index 0000000..28c6f84 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java @@ -0,0 +1,52 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +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; + +@DisplayName("Scene Tests") +public class SceneTests { + + private Scene scene; + + @BeforeEach + public void createScene() { + this.scene = new Scene(); + } + + @Test + @DisplayName("get and set id") + public void getAndSetId() { + scene.setId(20L); + + assertEquals(20, scene.getId()); + } + + @Test + @DisplayName("get and set user id") + public void getAndSetUserId() { + scene.setUserId(20L); + + assertEquals(20, scene.getUserId()); + } + + @Test + @DisplayName("get and set name") + public void getAndSetName() { + scene.setName("ciao mamma"); + + assertEquals("ciao mamma", scene.getName()); + } + + @Test + @DisplayName("get access enabled") + public void accessEnabled() { + scene.setGuestAccessEnabled(true); + + assertTrue(scene.isGuestAccessEnabled()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java new file mode 100644 index 0000000..a9ed512 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java @@ -0,0 +1,44 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.*; + +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; + +@DisplayName("Security Camera Tests") +public class SecurityCameraTests { + + private SecurityCamera securityCamera; + + @BeforeEach + public void createSecurityCamera() { + securityCamera = new SecurityCamera(); + } + + @Test + @DisplayName("get and set Path") + public void getAndSetPath() { + securityCamera.setPath("ciao mamma"); + + assertEquals("ciao mamma", securityCamera.getPath()); + } + + @Test + @DisplayName("get and set On") + public void getAndSetOn() { + securityCamera.setOn(true); + + assertTrue(securityCamera.isOn()); + } + + @Test + @DisplayName("trigger state") + public void triggerState() { + + securityCamera.setOn(true); + + assertTrue(securityCamera.readTriggerState()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java new file mode 100644 index 0000000..0326d70 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java @@ -0,0 +1,46 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.*; + +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; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +@DisplayName("Sensor Tests") +public class SensorTests { + + Sensor sensor; + + @BeforeEach + public void createSensor() { + this.sensor = new Sensor(); + } + + @Test + @DisplayName("get and set sensor") + public void getAndSetSensor() { + sensor.setSensor(SensorType.LIGHT); + + assertEquals(SensorType.LIGHT, sensor.getSensor()); + } + + @Test + @DisplayName("get and set value") + public void getAndSetValue() { + sensor.setValue(new BigDecimal(40)); + + assertEquals(new BigDecimal(40), sensor.getValue()); + } + + @Test + @DisplayName("to String") + public void toStringTest() { + sensor.setValue(new BigDecimal(40)); + sensor.setSensor(SensorType.LIGHT); + + assertEquals("Sensor{value=40, sensor=LIGHT}", sensor.toString()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java new file mode 100644 index 0000000..85dc695 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java @@ -0,0 +1,58 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +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; + +@DisplayName("Curtains tests") +public class StateTests { + + private DimmableState state; + + @BeforeEach + public void createState() { + this.state = new DimmableState<>(); + } + + @Test + @DisplayName("get and set id") + public void getAndSetId() { + this.state.setId(20); + assertEquals(20, this.state.getId()); + } + + @Test + @DisplayName("get and set device") + public void getAndSetDevice() { + DimmableLight d = new DimmableLight(); + this.state.setDevice(d); + assertEquals(d, this.state.getDevice()); + } + + @Test + @DisplayName("get and set device id") + public void getAndSetDeviceId() { + this.state.setDeviceId(30L); + assertEquals(30, this.state.getDeviceId()); + } + + @Test + @DisplayName("get and set scene") + public void getAndSetScene() { + Scene s = new Scene(); + this.state.setScene(s); + assertEquals(s, this.state.getScene()); + } + + @Test + @DisplayName("get and set sceneId") + public void getAndSetSceneId() { + this.state.setSceneId(50L); + assertEquals(50, this.state.getSceneId()); + } +} From 7020f0d692a0f18d3de0db4d59d26100dba140ba Mon Sep 17 00:00:00 2001 From: omenem Date: Fri, 15 May 2020 19:01:28 +0200 Subject: [PATCH 2/7] fix --- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java index bc093e0..e72cbf6 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java @@ -2,6 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude; +import java.util.HashSet; import java.util.Set; import javax.persistence.*; import javax.validation.constraints.Max; @@ -19,7 +20,7 @@ public class Dimmable extends Switchable implements RangeTriggerable { @ManyToMany(mappedBy = "dimmables", cascade = CascadeType.DETACH) @GsonExclude @SocketGsonExclude - private Set dimmers; + private Set dimmers = new HashSet<>(); /** The light intensity value. Goes from 0 (off) to 100 (on) */ @NotNull From 3f568c77d32b3ac395c3c07b4337e95f578b5584 Mon Sep 17 00:00:00 2001 From: omenem Date: Sat, 16 May 2020 18:00:28 +0200 Subject: [PATCH 3/7] more tests --- .../sanmarinoes/smarthut/SmartPlugTests.java | 43 +++++++++++++++++++ .../smarthut/SwitchableStateTests.java | 28 ++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java new file mode 100644 index 0000000..921979e --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java @@ -0,0 +1,43 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.*; + +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; +import org.junit.jupiter.api.Test; + +@DisplayName("SmartPlug Tests") +public class SmartPlugTests { + + private SmartPlug smartPlug; + + @BeforeEach + public void createSmartPlug() { + this.smartPlug = new SmartPlug(); + } + + @Test + @DisplayName("set and get on") + public void testOn() { + smartPlug.setOn(true); + + assertTrue(smartPlug.isOn()); + } + + @Test + @DisplayName("read trigger state") + public void readTriggerState() { + smartPlug.setOn(true); + + assertTrue(smartPlug.readTriggerState()); + } + + @Test + @DisplayName("reset total consumption") + public void reset() { + + assertEquals(new BigDecimal(0), smartPlug.getTotalConsumption()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java new file mode 100644 index 0000000..c89e04f --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java @@ -0,0 +1,28 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.*; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight; +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; + +@DisplayName("Switchable State Tests") +public class SwitchableStateTests { + + private SwitchableState switchableState; + + @BeforeEach + public void createSwitchableState() { + switchableState = new SwitchableState<>(); + } + + @Test + @DisplayName("is on") + public void isOn() { + switchableState.setOn(true); + + assertTrue(switchableState.isOn()); + } +} From 198be1f66860b8db3f01a146edd6be0e8928bdda Mon Sep 17 00:00:00 2001 From: omenem Date: Sun, 17 May 2020 10:16:12 +0200 Subject: [PATCH 4/7] more tests --- .../smarthut/ThermostatConditionTests.java | 53 ++++++++++++ .../sanmarinoes/smarthut/TriggerTests.java | 64 ++++++++++++++ .../sa4/sanmarinoes/smarthut/UserTests.java | 83 +++++++++++++++++++ 3 files changed, 200 insertions(+) create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java new file mode 100644 index 0000000..d19ce69 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java @@ -0,0 +1,53 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +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; +import org.junit.jupiter.api.Test; + +@DisplayName("ThermostatCondition Tests") +public class ThermostatConditionTests { + + private ThermostatCondition thermostatCondition; + + @BeforeEach + public void createThermostatCondtion() { + this.thermostatCondition = new ThermostatCondition(); + } + + @Test + @DisplayName("get and set mode") + public void getAndSetMode() { + thermostatCondition.setMode(Thermostat.Mode.IDLE); + + assertEquals(Thermostat.Mode.IDLE, thermostatCondition.getMode()); + } + + @Test + @DisplayName("get and set operator") + public void getAndSeOperator() { + thermostatCondition.setOperator(Operator.EQUAL); + + assertEquals(Operator.EQUAL, thermostatCondition.getOperator()); + } + + @Test + @DisplayName("get and set operator") + public void triggered() { + thermostatCondition.setMode(Thermostat.Mode.IDLE); + thermostatCondition.setOperator(Operator.EQUAL); + Thermostat t = new Thermostat(); + t.setMode(Mode.IDLE); + thermostatCondition.setDevice(t); + + assertTrue(thermostatCondition.triggered()); + + thermostatCondition.setOperator(Operator.NOTEQUAL); + assertFalse(thermostatCondition.triggered()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java new file mode 100644 index 0000000..3790f3a --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java @@ -0,0 +1,64 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +import static org.junit.jupiter.api.Assertions.*; + +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; + +@DisplayName("Trigger Tests") +public class TriggerTests { + + private BooleanTrigger booleanTrigger; + + @BeforeEach + public void createBooleanTrigger() { + booleanTrigger = new BooleanTrigger(); + } + + @Test + @DisplayName("get Kind") + public void getKind() { + assertEquals("booleanTrigger", booleanTrigger.getKind()); + } + + @Test + @DisplayName("get and set id") + public void getAndSetId() { + booleanTrigger.setId(20); + assertEquals(20, booleanTrigger.getId()); + } + + @Test + @DisplayName("get and set device") + public void getAndSetDevice() { + RegularLight r = new RegularLight(); + booleanTrigger.setDevice(r); + assertEquals(r, booleanTrigger.getDevice()); + } + + @Test + @DisplayName("get and set device id") + public void getAndSetDeviceId() { + booleanTrigger.setDeviceId(20L); + assertEquals(20, booleanTrigger.getDeviceId()); + } + + @Test + @DisplayName("get and set automation") + public void getAndSetAutomation() { + Automation r = new Automation(); + booleanTrigger.setAutomation(r); + assertEquals(r, booleanTrigger.getAutomation()); + } + + @Test + @DisplayName("get and set automation id") + public void getAndSetAutomationId() { + booleanTrigger.setAutomationId(20L); + assertEquals(20, booleanTrigger.getAutomationId()); + } +} diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java new file mode 100644 index 0000000..1d16b16 --- /dev/null +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java @@ -0,0 +1,83 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut; + +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; + +@DisplayName(" USer Tests") +public class UserTests { + + private User user; + + @BeforeEach + public void createUser() { + user = new User(); + } + + @Test + @DisplayName("get and set id") + public void getAndSetId() { + user.setId(20l); + + assertEquals(20, user.getId()); + } + + @Test + @DisplayName("get and set id") + public void getAndSetName() { + user.setName("Paolo Bitta"); + + assertEquals("Paolo Bitta", user.getName()); + } + + @Test + @DisplayName("get and set id") + public void getAndSetUsername() { + user.setUsername("PaulB"); + + assertEquals("PaulB", user.getUsername()); + } + + @Test + @DisplayName("get and set email") + public void getAndSetEmail() { + user.setEmail("paolo.bitta@gmail.com"); + + assertEquals("paolo.bitta@gmail.com", user.getEmail()); + } + + @Test + @DisplayName("get and set password") + public void getAndSetPassword() { + user.setPassword("cameraCaffe"); + + assertEquals("cameraCaffe", user.getPassword()); + } + + @Test + @DisplayName("get and set enabled") + public void getAndSetEnabled() { + user.setEnabled(true); + + assertTrue(user.getEnabled()); + } + + @Test + @DisplayName("get and set Cameraenabled") + public void getAndSeCameraEnabled() { + user.setCameraEnabled(true); + + assertTrue(user.isCameraEnabled()); + } + + @Test + @DisplayName("equals") + public void eq() { + assertFalse(user.equals(null)); + + assertTrue(user.equals(user)); + } +} From 0ce6e84380b80104eb3848687d81dc75162ea1bd Mon Sep 17 00:00:00 2001 From: omenem Date: Sun, 17 May 2020 11:26:49 +0200 Subject: [PATCH 5/7] fix --- .../sanmarinoes/smarthut/DimmableStateTests.java | 4 ++-- .../sanmarinoes/smarthut/RangeConditionTests.java | 10 +++++----- .../sanmarinoes/smarthut/RangeTriggerTests.java | 15 ++++++++------- .../smarthut/SwitchableStateTests.java | 5 ++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java index 87bd181..7dbfe35 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java @@ -11,11 +11,11 @@ import org.junit.jupiter.api.Test; @DisplayName("Dimmable State Tests") public class DimmableStateTests { - private DimmableState dimmableState; + private DimmableState dimmableState; @BeforeEach public void createDimmableState() { - dimmableState = new DimmableState<>(); + dimmableState = new DimmableState(); } @Test diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java index 354d6da..1d7772e 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java @@ -3,8 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut; 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 ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition.Operator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -22,9 +22,9 @@ public class RangeConditionTests { @Test @DisplayName("set and get operator") public void setAndGetOperator() { - rangeCondition.setOperator(RangeCondition.Operator.EQUAL); + rangeCondition.setOperator(Operator.EQUAL); - assertEquals(RangeCondition.Operator.EQUAL, rangeCondition.getOperator()); + assertEquals(Operator.EQUAL, rangeCondition.getOperator()); } @Test @@ -43,10 +43,10 @@ public class RangeConditionTests { rangeCondition.setDevice(d); rangeCondition.setRange(45D); - rangeCondition.setOperator(RangeCondition.Operator.EQUAL); + rangeCondition.setOperator(Operator.EQUAL); assertFalse(rangeCondition.triggered()); - rangeCondition.setOperator(RangeCondition.Operator.LESS); + rangeCondition.setOperator(Operator.LESS); assertTrue(rangeCondition.triggered()); rangeCondition.setOperator(Operator.GREATER); diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java index 6dda510..4c46d70 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java @@ -5,6 +5,7 @@ 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.Operator; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -23,9 +24,9 @@ public class RangeTriggerTests { @Test @DisplayName("set and get operator") public void setAndGetOperator() { - rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL); + rangeTrigger.setOperator(Operator.EQUAL); - assertEquals(RangeTrigger.Operator.EQUAL, rangeTrigger.getOperator()); + assertEquals(Operator.EQUAL, rangeTrigger.getOperator()); } @Test @@ -44,19 +45,19 @@ public class RangeTriggerTests { rangeTrigger.setDevice(d); rangeTrigger.setRange(45D); - rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL); + rangeTrigger.setOperator(Operator.EQUAL); assertFalse(rangeTrigger.triggered()); - rangeTrigger.setOperator(RangeTrigger.Operator.LESS); + rangeTrigger.setOperator(Operator.LESS); assertTrue(rangeTrigger.triggered()); - rangeTrigger.setOperator(RangeTrigger.Operator.GREATER); + rangeTrigger.setOperator(Operator.GREATER); assertFalse(rangeTrigger.triggered()); - rangeTrigger.setOperator(RangeTrigger.Operator.LESS_EQUAL); + rangeTrigger.setOperator(Operator.LESS_EQUAL); assertTrue(rangeTrigger.triggered()); - rangeTrigger.setOperator(RangeTrigger.Operator.GREATER_EQUAL); + rangeTrigger.setOperator(Operator.GREATER_EQUAL); assertFalse(rangeTrigger.triggered()); } } diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java index c89e04f..737053d 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java @@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut; import static org.junit.jupiter.api.Assertions.*; -import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -11,11 +10,11 @@ import org.junit.jupiter.api.Test; @DisplayName("Switchable State Tests") public class SwitchableStateTests { - private SwitchableState switchableState; + private SwitchableState switchableState; @BeforeEach public void createSwitchableState() { - switchableState = new SwitchableState<>(); + switchableState = new SwitchableState(); } @Test From 940c072711d494a286d2776b6ee7ec931528ccaa Mon Sep 17 00:00:00 2001 From: omenem Date: Sun, 17 May 2020 11:33:30 +0200 Subject: [PATCH 6/7] fix --- .../usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java | 2 +- .../java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java index 7dbfe35..3c19612 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java @@ -33,6 +33,6 @@ public class DimmableStateTests { this.dimmableState.setDevice(d); this.dimmableState.setIntensity(30); this.dimmableState.apply(); - assertEquals(30, this.dimmableState.getDevice().getIntensity()); + assertEquals(30, d.getIntensity()); } } diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java index 85dc695..5dd87fa 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java @@ -12,11 +12,11 @@ import org.junit.jupiter.api.Test; @DisplayName("Curtains tests") public class StateTests { - private DimmableState state; + private DimmableState state; @BeforeEach public void createState() { - this.state = new DimmableState<>(); + this.state = new DimmableState(); } @Test From c5b3a57faa10560cb69fc5305ae1f72be3f4c8fe Mon Sep 17 00:00:00 2001 From: omenem Date: Sun, 17 May 2020 11:52:37 +0200 Subject: [PATCH 7/7] fix --- .../ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java index 5dd87fa..3c5ef86 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java @@ -19,13 +19,6 @@ public class StateTests { this.state = new DimmableState(); } - @Test - @DisplayName("get and set id") - public void getAndSetId() { - this.state.setId(20); - assertEquals(20, this.state.getId()); - } - @Test @DisplayName("get and set device") public void getAndSetDevice() {