From e8c2de7d84bd97c3b8ade6424b94b6673091da35 Mon Sep 17 00:00:00 2001
From: Dawit Gulino 20013954 <32634333+DawitG96@users.noreply.github.com>
Date: Wed, 27 Jun 2018 10:31:41 +0200
Subject: [PATCH] Modified something

---
 src/main/java/device/Hue.java    |  3 +++
 src/main/java/device/Sensor.java | 12 ++++++++----
 src/test/java/TestSensor.java    | 28 ++++++++++++++++++++--------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/main/java/device/Hue.java b/src/main/java/device/Hue.java
index 1ee4c98..7257150 100644
--- a/src/main/java/device/Hue.java
+++ b/src/main/java/device/Hue.java
@@ -37,6 +37,9 @@ public class Hue {
         }
     }
 
+    public int getCurrentLuminiscence() {
+        return 0;
+    }
     public void turnOff() {
         for (String light : allLights.keySet()) {
             String callURL = lightsURL + light + "/state";
diff --git a/src/main/java/device/Sensor.java b/src/main/java/device/Sensor.java
index 572a944..0aa2c8b 100644
--- a/src/main/java/device/Sensor.java
+++ b/src/main/java/device/Sensor.java
@@ -19,14 +19,17 @@ public class Sensor {
     public String password = "raz4reti2";
 
     public IZWayApi zwayApi;
-    DeviceList allZWaveDevices;
-    DeviceList devices;
+    private DeviceList allZWaveDevices;
+    private DeviceList devices;
+    private Integer nodeId;
 
     public Sensor() {
         this(null);
     }
 
     public Sensor (Integer nodeId) {
+        this.nodeId = nodeId;
+
         // create an instance of the Z-Way library; all the params are mandatory (we are not going to use the remote service/id)
         zwayApi = new ZWayApiHttp(ipAddress, 8083, "http", username, password, 0, false, new ZWaySimpleCallback());
 
@@ -53,10 +56,11 @@ public class Sensor {
         return -99;
     }
 
-    synchronized public void update(int nodeId) throws InterruptedException {
+    synchronized public void update(int timeout) throws InterruptedException {
+        //setInitialValues();
         for (Device device : devices.getAllDevices())
             device.update();
-        wait(10000);
+        wait(timeout);
     }
     /*public boolean IsLowLuminescence(int Luminescence) {
                 if (dev.getProbeType().equalsIgnoreCase("Luminescence"))
diff --git a/src/test/java/TestSensor.java b/src/test/java/TestSensor.java
index 8a73166..720564c 100644
--- a/src/test/java/TestSensor.java
+++ b/src/test/java/TestSensor.java
@@ -6,27 +6,39 @@ import java.util.HashSet;
 import java.util.Set;
 
  public class TestSensor {
-    Sensor sensor = new Sensor(5);
-    Hue lights = new Hue();
+    Sensor sensor = new Sensor(2);
+     Hue lights;
 
     @Test
      synchronized public void firstTestSensor() throws InterruptedException {
-        sensor.update(5);
+        sensor.update(2);
         System.out.println(sensor.luminiscenceLevel());
     }
 
     @Test
-    public void secondTestSensor() throws InterruptedException {
-        sensor.update(5);
+    synchronized public void secondTestSensor() throws InterruptedException {
+        int i=0;
+        lights = new Hue();
         Set<String> toRemove = new HashSet<>();
+
         for(String str: lights.getNameLights())
             if(!str.equals("4"))
                 toRemove.add(str);
         lights.removeLights(toRemove);
+        lights.turnOn();
 
-        if(sensor.luminiscenceLevel() < 100) {
-            lights.turnOn();
-            lights.setBrightness(200);
+        while(i<999999) {
+            if (sensor.luminiscenceLevel() < 200) {
+                lights.getCurrentLuminiscence();
+                lights.setBrightness(200);
+            }
+
+            if (sensor.luminiscenceLevel() > 600) {
+                lights.setBrightness(0);
+            }
+            System.out.println(i+"-"+sensor.luminiscenceLevel());
+            sensor.update(100);
+            i++;
         }
     }
 }