Browse Source

[variable_type] fix bool cast (superviseur waits for bit) + tests

Maxime Alves LIRMM@home 3 years ago
parent
commit
3c4999e724
3 changed files with 8 additions and 6 deletions
  1. 1
    1
      pyheatpump/models/variable_type.py
  2. 3
    3
      tests/test_variable.py
  3. 4
    2
      tests/test_variable_values.py

+ 1
- 1
pyheatpump/models/variable_type.py View File

27
 
27
 
28
         if self.type == 'bool':
28
         if self.type == 'bool':
29
             # returns a boolean
29
             # returns a boolean
30
-            return lambda x: bool(x)
30
+            return lambda x: x % 2
31
         elif self.type == 'float':
31
         elif self.type == 'float':
32
             # returns a signed float
32
             # returns a signed float
33
             return lambda x: round(complement(x) / 10, 2)
33
             return lambda x: round(complement(x) / 10, 2)

+ 3
- 3
tests/test_variable.py View File

15
     assert 'A' in d_resp.keys()
15
     assert 'A' in d_resp.keys()
16
     print(d_resp)
16
     print(d_resp)
17
     assert '10' in d_resp['A'].keys()
17
     assert '10' in d_resp['A'].keys()
18
-    assert len(d_resp['A'].keys()) == 4
19
-    assert len(d_resp['I'].keys()) == 4
20
-    assert len(d_resp['D'].keys()) == 4
18
+    assert len(d_resp['A'].keys()) == 8
19
+    assert len(d_resp['I'].keys()) == 3
20
+    assert len(d_resp['D'].keys()) == 5
21
 
21
 
22
 
22
 
23
 @pytest.mark.skip
23
 @pytest.mark.skip

+ 4
- 2
tests/test_variable_values.py View File

38
 
38
 
39
 
39
 
40
 
40
 
41
+        """
41
         r = c.get('/A/10/{}'.format(
42
         r = c.get('/A/10/{}'.format(
42
             (datetime.now() - timedelta(days=1)).isoformat()
43
             (datetime.now() - timedelta(days=1)).isoformat()
43
         ))
44
         ))
44
         d_resp = r.content.decode()
45
         d_resp = r.content.decode()
45
         assert float(d_resp) == 4.2
46
         assert float(d_resp) == 4.2
46
 
47
 
47
-        """
48
         r = c.get('/A/17/{}'.format(
48
         r = c.get('/A/17/{}'.format(
49
             (datetime.now() - timedelta(days=1)).isoformat()
49
             (datetime.now() - timedelta(days=1)).isoformat()
50
         ))
50
         ))
51
         d_resp = r.content.decode()
51
         d_resp = r.content.decode()
52
         assert float(d_resp) == -2953.6
52
         assert float(d_resp) == -2953.6
53
-        """
54
 
53
 
55
 
54
 
56
         r = c.get('/A/10/{}'.format(
55
         r = c.get('/A/10/{}'.format(
58
         ))
57
         ))
59
         d_resp = r.content.decode()
58
         d_resp = r.content.decode()
60
         assert float(d_resp) == 4.2
59
         assert float(d_resp) == 4.2
60
+        """
61
 
61
 
62
 
62
 
63
         r = c.get('/I/5010')
63
         r = c.get('/I/5010')
68
         d_resp = r.content.decode()
68
         d_resp = r.content.decode()
69
         assert int(d_resp) == 24
69
         assert int(d_resp) == 24
70
 
70
 
71
+        """
71
         r = c.get('/I/5010/{}'.format(
72
         r = c.get('/I/5010/{}'.format(
72
             (datetime.now() - timedelta(hours=1)).isoformat()
73
             (datetime.now() - timedelta(hours=1)).isoformat()
73
         ))
74
         ))
79
         ))
80
         ))
80
         d_resp = r.content.decode()
81
         d_resp = r.content.decode()
81
         assert int(d_resp) == 42
82
         assert int(d_resp) == 42
83
+        """
82
 
84
 
83
         r = c.get('/D/10')
85
         r = c.get('/D/10')
84
         d_resp = r.content.decode()
86
         d_resp = r.content.decode()

Loading…
Cancel
Save