S allius/issue186 (#188)

* increase test coverage

app/config/default_config.toml

@@ -34,6 +34,8 @@ inverters.allow_all = true   # allow inverters, even if we have no inverter mapp
 modbus_polling = false        # Disable optional MODBUS polling
 #pv1 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv2 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
+# end of block [inverters."R170000000000001"]
+
 
 #[inverters."R17xxxxxxxxxxxx2"]
 #node_id = ''                 # Optional, MQTT replacement for inverters serial number  
@@ -41,6 +43,8 @@ modbus_polling = false        # Disable optional MODBUS polling
 #modbus_polling = false        # Disable optional MODBUS polling
 #pv1 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv2 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
+# end of block [inverters."R170000000000002"]
+
 
 [inverters."Y170000000000001"]
 monitor_sn = 2000000000       # The "Monitoring SN:" can be found on a sticker enclosed with the inverter
@@ -56,9 +60,12 @@ modbus_polling = true         # Enable optional MODBUS polling
 #pv2 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv3 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv4 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
+# end of block [inverters."Y170000000000001"]
+
 
 [gen3plus.at_acl]
 tsun.allow = ['AT+Z', 'AT+UPURL', 'AT+SUPDATE']
 tsun.block = []
 mqtt.allow = ['AT+']
 mqtt.block = []
+# end of block [gen3plus.at_acl]

app/src/gen3/inverter_g3.py

@@ -9,6 +9,7 @@ if __name__ == "app.src.gen3.inverter_g3":
     from app.src.config import Config
     from app.src.inverter import Inverter
     from app.src.gen3.connection_g3 import ConnectionG3
+    from app.src.infos import Infos
 else:  # pragma: no cover
     from config import Config
     from inverter import Inverter

app/tests/test_inverter_g3.py

@@ -0,0 +1,235 @@
+# test_with_pytest.py
+import pytest
+import asyncio
+
+from mock import patch
+from enum import Enum
+from app.src.infos import Infos
+from app.src.config import Config
+from app.src.inverter import Inverter
+from app.src.singleton import Singleton
+from app.src.gen3.connection_g3 import ConnectionG3
+from app.src.gen3.inverter_g3 import InverterG3
+
+from app.tests.test_modbus_tcp import patch_mqtt_err, patch_mqtt_except, test_port, test_hostname
+
+pytest_plugins = ('pytest_asyncio',)
+
+# initialize the proxy statistics
+Infos.static_init()
+
+@pytest.fixture
+def config_conn():
+    Config.act_config = {
+        'mqtt':{
+            'host': test_hostname,
+            'port': test_port,
+            'user': '',
+            'passwd': ''
+        },
+        'ha':{
+            'auto_conf_prefix': 'homeassistant',
+            'discovery_prefix': 'homeassistant', 
+            'entity_prefix': 'tsun',
+            'proxy_node_id': 'test_1',
+            'proxy_unique_id': ''
+        },
+        'tsun':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234}, 'inverters':{'allow_all':True}
+    }
+
+@pytest.fixture(scope="module", autouse=True)
+def module_init():
+    Singleton._instances.clear()
+    yield
+
+@pytest.fixture
+def patch_conn_init():
+    with patch.object(ConnectionG3, '__init__', return_value= None) as conn:
+        yield conn
+
+@pytest.fixture
+def patch_conn_close():
+    with patch.object(ConnectionG3, 'close') as conn:
+        yield conn
+
+class FakeReader():
+    def __init__(self):
+        self.on_recv =  asyncio.Event()
+    async def read(self, max_len: int):
+        await self.on_recv.wait()
+        return b''
+    def feed_eof(self):
+        return
+
+
+class FakeWriter():
+    def write(self, buf: bytes):
+        return
+    def get_extra_info(self, sel: str):
+        if sel == 'peername':
+            return 'remote.intern'
+        elif sel == 'sockname':
+            return 'sock:1234'
+        assert False
+    def is_closing(self):
+        return False
+    def close(self):
+        return
+    async def wait_closed(self):
+        return
+
+class TestType(Enum):
+    RD_TEST_0_BYTES = 1
+    RD_TEST_TIMEOUT = 2
+    RD_TEST_EXCEPT = 3
+
+
+test  = TestType.RD_TEST_0_BYTES
+
+@pytest.fixture
+def patch_open_connection():
+    async def new_conn(conn):
+        await asyncio.sleep(0)
+        return FakeReader(), FakeWriter()
+    
+    def new_open(host: str, port: int):
+        global test
+        if test == TestType.RD_TEST_TIMEOUT:
+            raise ConnectionRefusedError
+        elif test == TestType.RD_TEST_EXCEPT:
+            raise ValueError("Value cannot be negative") # Compliant
+        return new_conn(None)
+
+    with patch.object(asyncio, 'open_connection', new_open) as conn:
+        yield conn
+
+
+def test_method_calls(patch_conn_init, patch_conn_close):
+    spy1 = patch_conn_init
+    spy2 = patch_conn_close
+    reader = FakeReader()
+    writer =  FakeWriter()
+    addr = ('proxy.local', 10000)
+    inverter = InverterG3(reader, writer, addr)
+    inverter.l_addr = ''
+    inverter.r_addr = ''
+
+    spy1.assert_called_once()
+    spy1.assert_called_once_with(reader, writer, addr, None, True)
+
+    inverter.close()
+    spy2.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_remote_conn(config_conn, patch_open_connection, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+
+    inverter = InverterG3(FakeReader(), FakeWriter(), ('proxy.local', 10000))
+    
+    await inverter.async_create_remote()
+    await asyncio.sleep(0)
+    assert inverter.remote_stream
+    inverter.close()
+    spy1.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_remote_except(config_conn, patch_open_connection, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+    
+    global test
+    test  = TestType.RD_TEST_TIMEOUT
+
+    inverter = InverterG3(FakeReader(), FakeWriter(), ('proxy.local', 10000))
+
+    await inverter.async_create_remote()
+    await asyncio.sleep(0)
+    assert inverter.remote_stream==None
+
+    test  = TestType.RD_TEST_EXCEPT
+    await inverter.async_create_remote()
+    await asyncio.sleep(0)
+    assert inverter.remote_stream==None
+    inverter.close()
+    spy1.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_mqtt_publish(config_conn, patch_open_connection, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+    
+    Inverter.class_init()
+
+    inverter = InverterG3(FakeReader(), FakeWriter(), ('proxy.local', 10000))
+    inverter._Talent__set_serial_no(serial_no= "123344")
+    
+    inverter.new_data['inverter'] = True
+    inverter.db.db['inverter'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['inverter'] == False
+
+    inverter.new_data['env'] = True
+    inverter.db.db['env'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['env'] == False
+
+    Infos.new_stat_data['proxy'] = True
+    await inverter.async_publ_mqtt()
+    assert Infos.new_stat_data['proxy'] == False
+
+    inverter.close()
+    spy1.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    _ = patch_mqtt_err
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+    
+    Inverter.class_init()
+
+    inverter = InverterG3(FakeReader(), FakeWriter(), ('proxy.local', 10000))
+    inverter._Talent__set_serial_no(serial_no= "123344")
+    
+    inverter.new_data['inverter'] = True
+    inverter.db.db['inverter'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['inverter'] == True
+
+    inverter.close()
+    spy1.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_mqtt_except(config_conn, patch_open_connection, patch_mqtt_except, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    _ = patch_mqtt_except
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+    
+    Inverter.class_init()
+
+    inverter = InverterG3(FakeReader(), FakeWriter(), ('proxy.local', 10000))
+    inverter._Talent__set_serial_no(serial_no= "123344")
+    
+    inverter.new_data['inverter'] = True
+    inverter.db.db['inverter'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['inverter'] == True
+
+    inverter.close()
+    spy1.assert_called_once()

app/tests/test_inverter_g3p.py

@@ -4,13 +4,14 @@ import asyncio
 
 from mock import patch
 from enum import Enum
+from app.src.infos import Infos
 from app.src.config import Config
+from app.src.inverter import Inverter
 from app.src.singleton import Singleton
 from app.src.gen3plus.connection_g3p import ConnectionG3P
 from app.src.gen3plus.inverter_g3p import InverterG3P
-from app.src.gen3plus.infos_g3p import InfosG3P
 
-from app.src.infos import Infos
+from app.tests.test_modbus_tcp import patch_mqtt_err, patch_mqtt_except, test_port, test_hostname
 
 
 pytest_plugins = ('pytest_asyncio',)
@@ -20,7 +21,22 @@ Infos.static_init()
 
 @pytest.fixture
 def config_conn():
-    Config.act_config = {'solarman':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234}, 'inverters':{'allow_all':True}}
+    Config.act_config = {
+        'mqtt':{
+            'host': test_hostname,
+            'port': test_port,
+            'user': '',
+            'passwd': ''
+        },
+        'ha':{
+            'auto_conf_prefix': 'homeassistant',
+            'discovery_prefix': 'homeassistant', 
+            'entity_prefix': 'tsun',
+            'proxy_node_id': 'test_1',
+            'proxy_unique_id': ''
+        },
+        'solarman':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234}, 'inverters':{'allow_all':True}
+    }
 
 @pytest.fixture(scope="module", autouse=True)
 def module_init():
@@ -112,16 +128,9 @@ async def test_remote_conn(config_conn, patch_open_connection, patch_conn_close)
     assert asyncio.get_running_loop()
 
     spy1 = patch_conn_close
-    reader = FakeReader()
-    writer =  FakeWriter()
 
-    addr = ('proxy.local', 10000)
+    inverter = InverterG3P(FakeReader(), FakeWriter(), ('proxy.local', 10000), client_mode=False)
-
+    
-    inverter = InverterG3P(reader, writer, addr, client_mode=False)
-    inverter.l_addr = ''
-    inverter.r_addr = ''
-    inverter.node_id = 'Test'
-    inverter.db = InfosG3P(client_mode= False)
     await inverter.async_create_remote()
     await asyncio.sleep(0)
     assert inverter.remote_stream
@@ -135,19 +144,12 @@ async def test_remote_except(config_conn, patch_open_connection, patch_conn_clos
     assert asyncio.get_running_loop()
 
     spy1 = patch_conn_close
-    reader = FakeReader()
+    
-    writer =  FakeWriter()
-
-    addr = ('proxy.local', 10000)
     global test
     test  = TestType.RD_TEST_TIMEOUT
 
-    inverter = InverterG3P(reader, writer, addr, client_mode=False)
+    inverter = InverterG3P(FakeReader(), FakeWriter(), ('proxy.local', 10000), client_mode=False)
-    inverter.l_addr = ''
+
-    inverter.r_addr = ''
-    inverter.node_id = 'Test'
-    inverter.db = InfosG3P(client_mode= False)
-    test  = TestType.RD_TEST_TIMEOUT
     await inverter.async_create_remote()
     await asyncio.sleep(0)
     assert inverter.remote_stream==None
@@ -158,3 +160,77 @@ async def test_remote_except(config_conn, patch_open_connection, patch_conn_clos
     assert inverter.remote_stream==None
     inverter.close()
     spy1.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_mqtt_publish(config_conn, patch_open_connection, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+    
+    Inverter.class_init()
+
+    inverter = InverterG3P(FakeReader(), FakeWriter(), ('proxy.local', 10000), client_mode=False)
+    inverter._SolarmanV5__set_serial_no(snr= 123344)
+    
+    inverter.new_data['inverter'] = True
+    inverter.db.db['inverter'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['inverter'] == False
+
+    inverter.new_data['env'] = True
+    inverter.db.db['env'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['env'] == False
+
+    Infos.new_stat_data['proxy'] = True
+    await inverter.async_publ_mqtt()
+    assert Infos.new_stat_data['proxy'] == False
+
+    inverter.close()
+    spy1.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    _ = patch_mqtt_err
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+    
+    Inverter.class_init()
+
+    inverter = InverterG3P(FakeReader(), FakeWriter(), ('proxy.local', 10000), client_mode=False)
+    inverter._SolarmanV5__set_serial_no(snr= 123344)
+    
+    inverter.new_data['inverter'] = True
+    inverter.db.db['inverter'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['inverter'] == True
+
+    inverter.close()
+    spy1.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_mqtt_except(config_conn, patch_open_connection, patch_mqtt_except, patch_conn_close):
+    _ = config_conn
+    _ = patch_open_connection
+    _ = patch_mqtt_except
+    assert asyncio.get_running_loop()
+
+    spy1 = patch_conn_close
+    
+    Inverter.class_init()
+
+    inverter = InverterG3P(FakeReader(), FakeWriter(), ('proxy.local', 10000), client_mode=False)
+    inverter._SolarmanV5__set_serial_no(snr= 123344)
+    
+    inverter.new_data['inverter'] = True
+    inverter.db.db['inverter'] = {}
+    await inverter.async_publ_mqtt()
+    assert inverter.new_data['inverter'] == True
+
+    inverter.close()
+    spy1.assert_called_once()