From dc74902cdf481474c34bf3a6214fe1c927f49455 Mon Sep 17 00:00:00 2001
From: "Maxime Alves LIRMM@home" <maxime.alves@lirmm.fr>
Date: Wed, 16 Dec 2020 05:24:22 +0100
Subject: [PATCH] [tests] fix tests for previous commit

---
 db/pyheatpump.sql             |  2 +-
 db/test_variable_values.sql   |  9 +++++++--
 tests/test_heatpump.py        |  5 +++--
 tests/test_variable_values.py | 33 ++++++++++++++++++++++++++++++---
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/db/pyheatpump.sql b/db/pyheatpump.sql
index b7ea617..ba9c38b 100644
--- a/db/pyheatpump.sql
+++ b/db/pyheatpump.sql
@@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS var_value (
 INSERT INTO var_type (slabel, label, type, start_address, end_address) VALUES (
   'A', 'Analog', 'float', 1, 1250);
 INSERT INTO var_type (slabel, label, type, start_address, end_address) VALUES (
-  'I', 'Integer', 'int', 5002, 6252;
+  'I', 'Integer', 'int', 5002, 6252);
 INSERT INTO var_type (slabel, label, type, start_address, end_address) VALUES (
   'D', 'Digital', 'bool', 1, 1000);
 
diff --git a/db/test_variable_values.sql b/db/test_variable_values.sql
index b006cab..9c5f83e 100644
--- a/db/test_variable_values.sql
+++ b/db/test_variable_values.sql
@@ -1,7 +1,12 @@
 INSERT INTO var_value (type, address, value, time) VALUES
 ('A', 10, 42, strftime('%s', 'now')),
-('A', 11, 24, strftime('%s', datetime('now', '-1 hours'))),
-('A', 10, 20, strftime('%s', datetime('now', '-1 days'))),
+('A', 11, 65530, strftime('%s', 'now')),
+('A', 12, 32000, strftime('%s', 'now')),
+('A', 13, 4200, strftime('%s', 'now')),
+('A', 14, 42000, strftime('%s', 'now')),
+('A', 15, 10024, strftime('%s', 'now')),
+('A', 16, 24000, strftime('%s', datetime('now', '-1 hours'))),
+('A', 17, 36000, strftime('%s', datetime('now', '-1 days'))),
 ('A', 10, 0, strftime('%s', datetime('now', '-2 days'))),
 ('I', 5010, 42, strftime('%s',  datetime('now'))),
 ('I', 5011, 24, strftime('%s',  datetime('now'))),
diff --git a/tests/test_heatpump.py b/tests/test_heatpump.py
index f286ca9..5fcae16 100644
--- a/tests/test_heatpump.py
+++ b/tests/test_heatpump.py
@@ -19,7 +19,7 @@ def test_get_(set_test_db):
     assert isinstance(d_resp, dict)
 
 
-def test_dict(set_db_values):
+def test_dict(set_test_db):
     c = TestClient(app)
     r = c.get('/')
     assert r.status_code == 200
@@ -29,6 +29,7 @@ def test_dict(set_db_values):
 
     d_resp = json.loads(resp)
     assert isinstance(d_resp, dict)
+    print(d_resp)
 
     assert 'macAddress' in d_resp.keys()
     assert isinstance(d_resp['macAddress'], str)
@@ -40,5 +41,5 @@ def test_dict(set_db_values):
     assert isinstance(d_resp['Integer'], dict)
     int_keys = list(map(int, d_resp['Integer'].keys()))
     assert min(int_keys) == 1
-    assert max(int_keys) == 1250
+    assert max(int_keys) == 2
 
diff --git a/tests/test_variable_values.py b/tests/test_variable_values.py
index 3bd39b2..a395528 100644
--- a/tests/test_variable_values.py
+++ b/tests/test_variable_values.py
@@ -14,24 +14,51 @@ def test_get_type_address(set_test_db):
     assert r.status_code == 200
 
     d_resp = r.content.decode()
-    assert int(d_resp) == 42
+    assert float(d_resp) == 4.2
 
     try:
         r = c.get('/X/10')
     except HTTPException as e:
         assert e.status_code == 404
 
+    r = c.get('/A/11')
+    d_resp = r.content.decode()
+    assert float(d_resp) == -0.6
+
+
+    r = c.get('/A/12')
+    d_resp = r.content.decode()
+    assert float(d_resp) == 3200.0
+
+
+    r = c.get('/A/14')
+    d_resp = r.content.decode()
+    assert float(d_resp) == -2353.6
+
+
+    r = c.get('/A/17')
+    d_resp = r.content.decode()
+    assert float(d_resp) == -2953.6
+
+
     r = c.get('/A/10/{}'.format(
         (datetime.now() - timedelta(days=1)).isoformat()
     ))
     d_resp = r.content.decode()
-    assert int(d_resp) == 20
+    assert float(d_resp) == 0
 
     r = c.get('/A/10/{}'.format(
         (datetime.now() - timedelta(days=2)).isoformat()
     ))
     d_resp = r.content.decode()
-    assert int(d_resp) == 0
+    assert float(d_resp) == 0
+
+    r = c.get('/A/10/{}'.format(
+        (datetime.now() - timedelta(days=2)).isoformat()
+    ))
+    d_resp = r.content.decode()
+    assert float(d_resp) == 0
+
 
     r = c.get('/I/5010')
     d_resp = r.content.decode()