Basic geocom tests finished

Author: MrClock8163

src/geocompy/tps1200p/__init__.py

@@ -166,10 +166,13 @@ def __init__(
         """Theodolite measurement and calculation subsystem."""
 
         for i in range(retry):
-            self._conn.send("\n")
-            response = self.com.nullproc()
-            if response.comcode and response.rpccode:
-                break
+            try:
+                self._conn.send("\n")
+                response = self.com.nullproc()
+                if response.comcode and response.rpccode:
+                    break
+            except Exception:
+                pass
 
             sleep(1)
         else:

tests/helpers_geocom.py

@@ -1,3 +1,4 @@
+from typing import Callable, Any
 import re
 
 from geocompy import GeoComProtocol
@@ -6,6 +7,8 @@
     Byte
 )
 
+from helpers import faulty_parser
+
 
 class DummyGeoComConnection(Connection):
     _RESP = re.compile(
@@ -19,31 +22,63 @@ class DummyGeoComConnection(Connection):
     _CMD = re.compile(
         r"^%R1Q,"
         r"(?P<rpc>\d+):"
-        r"(?:,(?P<params>.*))?$"
+        r"(?:(?P<params>.*))?$"
     )
 
     def send(self, message: str):
         return
 
     def exchange1(self, cmd: str) -> str:
-        print(cmd)
-
         if not self._CMD.match(cmd):
-            return "%R1P,0,2:"
+            return "%R1P,0,0:2"
 
-        if cmd == "%R1Q,0:":
-            return "%R1P,0,0:0"
+        if cmd == "%R1Q,5008:":
+            return "%R1P,0,0:0,1996,'07','19','10','13','2f'"
 
-        return ""
+        return "%R1P,0,0:0"
 
 
 class GeoComTester:
     @staticmethod
     def test_parse_response(instrument: GeoComProtocol):
+        cmd = "%R1Q,5008:"
+        answer = "%R1P,0,0:0,1996,'07','19','10','13','2f'"
+        parsers: dict[str, Callable[[str], Any]] = {
+            "year": int,
+            "month": Byte.parse,
+            "day": Byte.parse,
+            "hour": Byte.parse,
+            "minute": Byte.parse,
+            "second": Byte.parse
+        }
+        response = instrument.parse_response(
+            cmd,
+            answer,
+            parsers
+        )
+        assert response.params["year"] == 1996
+
         response = instrument.parse_response(
-            "%R1Q,5008:",
-            "%R1P,0,0:0,1996,'07','19','10','13','2f'",
-            {
+            cmd,
+            "%R1P,1,0:",
+            parsers
+        )
+        assert len(response.params) == 0
+
+        parsers_faulty = parsers.copy()
+        parsers_faulty["year"] = faulty_parser
+        response = instrument.parse_response(
+            cmd,
+            answer,
+            parsers_faulty
+        )
+        assert len(response.params) == 0
+
+    @staticmethod
+    def test_request(instrument: GeoComProtocol):
+        response = instrument.request(
+            5008,
+            parsers={
                 "year": int,
                 "month": Byte.parse,
                 "day": Byte.parse,
@@ -53,3 +88,10 @@ def test_parse_response(instrument: GeoComProtocol):
             }
         )
         assert response.params["year"] == 1996
+
+        response = instrument.request(
+            1,
+            (1, 2.0)
+        )
+        assert response.cmd == "%R1Q,1:1,2.0"
+        assert response.response == "%R1P,0,0:0"

tests/test_tps1200p.py

@@ -1,5 +1,6 @@
 import pytest
 
+from geocompy.communication import Connection
 from geocompy.tps1200p import TPS1200P
 
 from helpers_geocom import (
@@ -14,5 +15,17 @@ def tps() -> TPS1200P:
 
 
 class TestTPS1200P:
+    def test_init(self):
+        conn_bad = Connection()
+        with pytest.raises(ConnectionError):
+            TPS1200P(conn_bad, retry=1)
+
+        conn_good = DummyGeoComConnection()
+        instrument = TPS1200P(conn_good)
+        assert instrument._precision == 15
+
     def test_parse_response(self, tps: TPS1200P):
         GeoComTester.test_parse_response(tps)
+
+    def test_request(self, tps: TPS1200P):
+        GeoComTester.test_request(tps)