[tests] fit tests to new DB class

tests/cli/test_fetch.py

@@ -6,7 +6,7 @@ from tempfile import mkstemp
 
 from pyheatpump.cli import cli
 from pyheatpump.config import config
-from pyheatpump.db import initialize, connect
+from pyheatpump.db import DB
 from pyheatpump.models import VariableValue
 
 @pytest.fixture(scope='module')
@@ -14,13 +14,13 @@ def set_test_db():
     _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
     print(f'Will store database in {tmpdb}')
     config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
+    if not DB.initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
         sys.exit(-1)
 
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
+    if not DB.initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
         sys.exit(-1)
 
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variable_values.sql')):
+    if not DB.initialize(os.path.join(os.getcwd(), 'db/test_variable_values.sql')):
         sys.exit(-1)
 
     yield

tests/cli/test_supervise.py

@@ -7,7 +7,7 @@ import requests
 
 from pyheatpump.cli import cli
 from pyheatpump.config import config
-from pyheatpump.db import initialize, connect
+from pyheatpump.db import DB
 from pyheatpump.models import VariableValue
 
 @pytest.fixture(scope='module')
@@ -15,7 +15,7 @@ def set_test_db():
     _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
     print(f'Will store database in {tmpdb}')
     config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.test.sql')):
+    if not DB.initialize(os.path.join(os.getcwd(), 'db/pyheatpump.test.sql')):
         sys.exit(-1)
 
     yield

tests/conftest.py

@@ -1 +1,31 @@
+import os
+import pytest
+import sys
+from tempfile import mkstemp
+
+from pyheatpump import DB
+from pyheatpump.models import *
+from pyheatpump.config import config
+
 pytest_plugins = "pytester"
+
+@pytest.fixture(scope="module")
+def set_test_db():
+    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
+    print(f'Will store database in {tmpdb}')
+    config['heatpump']['database'] = tmpdb
+    assert DB.initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql'))
+
+    DB.sqlf(os.path.join(os.getcwd(), 'db/test_variables.sql'))
+
+    DB.sqlf(os.path.join(os.getcwd(), 'db/test_variable_values.sql'))
+
+    DB.sqlf(os.path.join(os.getcwd(), 'db/test_variable_values_wo_time.sql'))
+
+    yield
+
+
+
+@pytest.fixture
+def var_types():
+    return VariableType.getall()

tests/models/test_variable_value.py

@@ -1,48 +1,11 @@
 #!/usr/bin/env python3
 import pytest
-from starlette.authentication import UnauthenticatedUser
-from starlette.testclient import TestClient
-#from pyheatpump.config import app, config, default_config, CONFIG_FILES, get_config, set_config, config_route, ROUTES
-from unittest.mock import patch, MagicMock
-from pprint import pprint
-import json
-from tempfile import mkstemp
-from configparser import ConfigParser
-import os
-import sys
 from datetime import datetime
 
-from pyheatpump.config import config
-from pyheatpump.db import initialize, connect
 from pyheatpump.variable_types import app, get_variable_types, set_variable_types, ROUTES
 from pyheatpump.models import *
 
 
-@pytest.fixture()
-def set_test_db():
-    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
-    print(f'Will store database in {tmpdb}')
-    config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
-        sys.exit(-1)
-
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
-        sys.exit(-1)
-
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variable_values.sql')):
-        sys.exit(-1)
-
-    yield
-
-
-    os.unlink(tmpdb)
-
-
-@pytest.fixture
-def var_types():
-    return VariableType.getall()
-
-
 def test_last_update(set_test_db, var_types):
     for _, var_type in var_types.items():
         for _, variable in var_type.get_variables().items():

tests/test_heatpump.py

@@ -1,31 +1,10 @@
 #!/usr/bin/env python3
 import pytest
-from starlette.authentication import UnauthenticatedUser
 from starlette.testclient import TestClient
-from pyheatpump.config import app, config, default_config, CONFIG_FILES, get_config, set_config, config_route, ROUTES
-from pyheatpump.db import initialize, connect
-from unittest.mock import patch, MagicMock
-from pprint import pprint
 import json
-from tempfile import mkstemp
-from configparser import ConfigParser
-import os
 
-@pytest.fixture(scope='module')
-def set_test_db():
-    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
-    print(f'Will store database in {tmpdb}')
-    config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
-        sys.exit(-1)
+from pyheatpump.heatpump import app
 
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
-        sys.exit(-1)
-
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variable_values.sql')):
-        sys.exit(-1)
-
-    yield
 
 def test_get_(set_test_db):
     c = TestClient(app)

tests/test_modbus.py

@@ -2,45 +2,12 @@
 import pytest
 from unittest.mock import patch, MagicMock
 
-from starlette.authentication import UnauthenticatedUser
-from starlette.testclient import TestClient
-from pprint import pprint
-import json
-from tempfile import mkstemp
-from configparser import ConfigParser
-import os
-
 from serial import Serial
 import umodbus
 from umodbus.client.serial import rtu
 
-
-from pyheatpump.config import config
-from pyheatpump.db import initialize
-from pyheatpump.models.variable_type import VariableType
 from pyheatpump import modbus
 
-@pytest.fixture(scope='module')
-def set_test_db():
-    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
-    print(f'Will store database in {tmpdb}')
-    config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
-        sys.exit(-1)
-
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
-        sys.exit(-1)
-
-    yield
-
-    os.unlink(tmpdb)
-
-@pytest.fixture(scope='module')
-def serial_conn():
-    s = modbus.connect()
-    assert type(s) == Serial
-    return s
-
 
 @patch('umodbus.client.serial.rtu.send_message')
 @patch('umodbus.client.serial.rtu.read_coils')
@@ -82,9 +49,6 @@ def test_rtu_call_holding_registers(serial_conn):
     assert type(r) == list
     assert len(r) == 150
 
-@pytest.fixture
-def var_types():
-    return VariableType.getall()
 
 def test_get_analog(set_test_db, serial_conn, var_types):
     analog = var_types['Analog']

tests/test_variable.py

@@ -1,34 +1,9 @@
 #!/usr/bin/env python3
 import pytest
-from starlette.authentication import UnauthenticatedUser
 from starlette.testclient import TestClient
-from unittest.mock import patch, MagicMock
-from pprint import pprint
-import json
-from tempfile import mkstemp
-from configparser import ConfigParser
-import os
-import sys
 
-from pyheatpump.config import config
-from pyheatpump.db import initialize, connect
 from pyheatpump.variables import app, get_variables, set_variables, ROUTES
 
-@pytest.fixture(scope='module')
-def set_test_db():
-    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
-    print(f'Will store database in {tmpdb}')
-    config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
-        sys.exit(-1)
-
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
-        sys.exit(-1)
-
-    yield
-
-    os.unlink(tmpdb)
-
 
 def test_get_(set_test_db):
     c = TestClient(app)
@@ -38,6 +13,7 @@ def test_get_(set_test_db):
     d_resp = r.json()
     assert type(d_resp) is dict
     assert 'A' in d_resp.keys()
+    print(d_resp)
     assert '10' in d_resp['A'].keys()
     assert len(d_resp['A'].keys()) == 4
     assert len(d_resp['I'].keys()) == 4

tests/test_variable_types.py

@@ -1,32 +1,11 @@
 #!/usr/bin/env python3
 import pytest
-from starlette.authentication import UnauthenticatedUser
 from starlette.testclient import TestClient
-#from pyheatpump.config import app, config, default_config, CONFIG_FILES, get_config, set_config, config_route, ROUTES
 from unittest.mock import patch, MagicMock
-from pprint import pprint
 import json
-from tempfile import mkstemp
-from configparser import ConfigParser
-import os
-import sys
 
-from pyheatpump.config import config
-from pyheatpump.db import initialize, connect
 from pyheatpump.variable_types import app, get_variable_types, set_variable_types, ROUTES
 
-@pytest.fixture(scope='module')
-def set_test_db():
-    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
-    print(f'Will store database in {tmpdb}')
-    config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
-        sys.exit(-1)
-
-    yield
-
-    os.unlink(tmpdb)
-
 
 def test_get_(set_test_db):
     c = TestClient(app)

tests/test_variable_values.py

@@ -1,40 +1,11 @@
 #!/usr/bin/env python3
 import pytest
-from starlette.authentication import UnauthenticatedUser
 from starlette.exceptions import HTTPException 
 from starlette.testclient import TestClient
-from unittest.mock import patch, MagicMock
-from pprint import pprint
-import json
-from tempfile import mkstemp
-from configparser import ConfigParser
-import os
-import sys
 from datetime import datetime, timedelta
 
-from pyheatpump.config import config
-from pyheatpump.db import initialize, connect
 from pyheatpump.variables import app, get_variables, set_variables, ROUTES
 from pyheatpump.variable_values import app, get_variable_value, set_variable_value, ROUTES
-from pyheatpump.models.variable_value import VariableValue
-
-@pytest.fixture(scope='module')
-def set_test_db():
-    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
-    print(f'Will store database in {tmpdb}')
-    config['heatpump']['database'] = tmpdb
-    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
-        sys.exit(-1)
-
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
-        sys.exit(-1)
-
-    if not initialize(os.path.join(os.getcwd(), 'db/test_variable_values.sql')):
-        sys.exit(-1)
-
-    yield
-
-    os.unlink(tmpdb)
 
 
 def test_get_type_address(set_test_db):