|
2 | 2 |
|
3 | 3 | from geocompy.communication import Connection |
4 | 4 | from geocompy.data import gsiword |
5 | | -from geocompy.dna import DNA |
6 | | -from geocompy.dna.meta import DNAErrors |
| 5 | +from geocompy.protocols import GsiOnlineProtocol |
7 | 6 |
|
8 | 7 | from helpers import faulty_parser |
9 | 8 |
|
@@ -54,57 +53,57 @@ def exchange(self, cmd: str) -> str: |
54 | 53 |
|
55 | 54 | class GsiOnlineTester: |
56 | 55 | @staticmethod |
57 | | - def test_request(dna: DNA): |
58 | | - response = dna.request("d") |
| 56 | + def test_request(instrument: GsiOnlineProtocol): |
| 57 | + response = instrument.request("d") |
59 | 58 | assert not response.value |
60 | | - response = dna.request("a") |
| 59 | + response = instrument.request("a") |
61 | 60 | assert response.value |
62 | 61 |
|
63 | 62 | @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) |
66 | 65 | assert not response.value |
67 | 66 | assert response.comment == "INSTRUMENT" |
68 | | - assert response.response == DNAErrors.W_INVCMD |
| 67 | + assert response.response == "@W427" |
69 | 68 |
|
70 | | - response = dna.setrequest(1, 1) |
| 69 | + response = instrument.setrequest(1, 1) |
71 | 70 | assert response.value |
72 | 71 |
|
73 | 72 | @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) |
76 | 75 | assert not response.value |
77 | 76 | assert response.comment == "INSTRUMENT" |
78 | | - assert response.response == DNAErrors.W_INVCMD |
| 77 | + assert response.response == "@W427" |
79 | 78 |
|
80 | | - response = dna.confrequest(1, faulty_parser) |
| 79 | + response = instrument.confrequest(1, faulty_parser) |
81 | 80 | assert response.value is None |
82 | 81 | assert response.comment == "PARSE" |
83 | 82 |
|
84 | | - response = dna.confrequest(1, int) |
| 83 | + response = instrument.confrequest(1, int) |
85 | 84 | assert response.comment == "" |
86 | 85 | assert response.response == "0001/0000" |
87 | 86 | assert response.value == 0 |
88 | 87 |
|
89 | 88 | @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 ") |
92 | 91 | assert not response.value |
93 | 92 | assert response.comment == "INSTRUMENT" |
94 | | - assert response.response == DNAErrors.W_INVCMD |
| 93 | + assert response.response == "@W427" |
95 | 94 |
|
96 | | - response = dna.putrequest(1, "1.....+00000001 ") |
| 95 | + response = instrument.putrequest(1, "1.....+00000001 ") |
97 | 96 | assert response.value |
98 | 97 |
|
99 | 98 | @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) |
102 | 101 | assert response.value is None |
103 | | - assert response.response == DNAErrors.W_INVCMD |
| 102 | + assert response.response == "@W427" |
104 | 103 |
|
105 | | - response = dna.getrequest("I", 1, faulty_parser) |
| 104 | + response = instrument.getrequest("I", 1, faulty_parser) |
106 | 105 | assert response.value is None |
107 | 106 | assert response.comment == "PARSE" |
108 | 107 |
|
109 | | - response = dna.getrequest("I", 1, gsiparser) |
| 108 | + response = instrument.getrequest("I", 1, gsiparser) |
110 | 109 | assert response.value == 1 |
0 commit comments