Skip to content

Commit e09488b

Browse files
committed
Removed DNA references from GSI Online tester
Resolves #17
1 parent d74249b commit e09488b

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

tests/helpers_gsionline.py

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
from geocompy.communication import Connection
44
from geocompy.data import gsiword
5-
from geocompy.dna import DNA
6-
from geocompy.dna.meta import DNAErrors
5+
from geocompy.protocols import GsiOnlineProtocol
76

87
from helpers import faulty_parser
98

@@ -54,57 +53,57 @@ def exchange(self, cmd: str) -> str:
5453

5554
class GsiOnlineTester:
5655
@staticmethod
57-
def test_request(dna: DNA):
58-
response = dna.request("d")
56+
def test_request(instrument: GsiOnlineProtocol):
57+
response = instrument.request("d")
5958
assert not response.value
60-
response = dna.request("a")
59+
response = instrument.request("a")
6160
assert response.value
6261

6362
@staticmethod
64-
def test_setrequest(dna: DNA):
65-
response = dna.setrequest(0, 0)
63+
def test_setrequest(instrument: GsiOnlineProtocol):
64+
response = instrument.setrequest(0, 0)
6665
assert not response.value
6766
assert response.comment == "INSTRUMENT"
68-
assert response.response == DNAErrors.W_INVCMD
67+
assert response.response == "@W427"
6968

70-
response = dna.setrequest(1, 1)
69+
response = instrument.setrequest(1, 1)
7170
assert response.value
7271

7372
@staticmethod
74-
def test_confrequest(dna: DNA):
75-
response = dna.confrequest(0, int)
73+
def test_confrequest(instrument: GsiOnlineProtocol):
74+
response = instrument.confrequest(0, int)
7675
assert not response.value
7776
assert response.comment == "INSTRUMENT"
78-
assert response.response == DNAErrors.W_INVCMD
77+
assert response.response == "@W427"
7978

80-
response = dna.confrequest(1, faulty_parser)
79+
response = instrument.confrequest(1, faulty_parser)
8180
assert response.value is None
8281
assert response.comment == "PARSE"
8382

84-
response = dna.confrequest(1, int)
83+
response = instrument.confrequest(1, int)
8584
assert response.comment == ""
8685
assert response.response == "0001/0000"
8786
assert response.value == 0
8887

8988
@staticmethod
90-
def test_putrequest(dna: DNA):
91-
response = dna.putrequest(0, "0.....+00000000 ")
89+
def test_putrequest(instrument: GsiOnlineProtocol):
90+
response = instrument.putrequest(0, "0.....+00000000 ")
9291
assert not response.value
9392
assert response.comment == "INSTRUMENT"
94-
assert response.response == DNAErrors.W_INVCMD
93+
assert response.response == "@W427"
9594

96-
response = dna.putrequest(1, "1.....+00000001 ")
95+
response = instrument.putrequest(1, "1.....+00000001 ")
9796
assert response.value
9897

9998
@staticmethod
100-
def test_getrequest(dna: DNA):
101-
response = dna.getrequest("I", 0, int)
99+
def test_getrequest(instrument: GsiOnlineProtocol):
100+
response = instrument.getrequest("I", 0, int)
102101
assert response.value is None
103-
assert response.response == DNAErrors.W_INVCMD
102+
assert response.response == "@W427"
104103

105-
response = dna.getrequest("I", 1, faulty_parser)
104+
response = instrument.getrequest("I", 1, faulty_parser)
106105
assert response.value is None
107106
assert response.comment == "PARSE"
108107

109-
response = dna.getrequest("I", 1, gsiparser)
108+
response = instrument.getrequest("I", 1, gsiparser)
110109
assert response.value == 1

0 commit comments

Comments
 (0)