Skip to content

Commit c015fd1

Browse files
hpoechehpoeche
committed
fix mypy and codestyle errors
1 parent 8880191 commit c015fd1

4 files changed

Lines changed: 64 additions & 33 deletions

File tree

‎compliance_tool/test/_test_helper.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def create_example_aas_core_properties() -> pyecma376_2.OPCCoreProperties:
2626
def create_read_into_mock(file: Literal['TestFile', 'TestFileWrong', None]):
2727
""""Creates side effect function for the AASXReader.read_into mock"""
2828

29-
def fill_stores (store, file_store, **kwargs) -> None:
29+
def fill_stores(store, file_store, **kwargs) -> None:
3030
for item in create_example_aas_binding():
3131
store.add(item)
3232

@@ -37,6 +37,7 @@ def fill_stores (store, file_store, **kwargs) -> None:
3737
file_store.add_file("/TestFile.pdf", io.BytesIO(b"dummy"), "application/pdf")
3838
return fill_stores
3939

40+
4041
def create_mock_effect(
4142
module: str,
4243
level: Literal['error', 'warning', 'info', 'debug'],
@@ -54,4 +55,3 @@ def mock_error(*args, **kwargs):
5455
raise error_cls(error_msg)
5556

5657
return mock_error
57-

‎compliance_tool/test/test_compliance_check_aasx.py‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import unittest
88
from unittest import mock
99

10-
from _test_helper import create_example_aas_core_properties, create_read_into_mock
10+
from ._test_helper import create_example_aas_core_properties, create_read_into_mock
1111
from aas_compliance_tool import compliance_check_aasx as compliance_tool
1212
from aas_compliance_tool.state_manager import ComplianceToolStateManager, Status
1313

@@ -59,7 +59,8 @@ def test_check_deserialization_success(self, mock_aasx_reader: mock.MagicMock) -
5959

6060
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
6161
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
62-
def test_check_aas_example_fail_on_open(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
62+
def test_check_aas_example_fail_on_open(self, mock_data_checker: mock.MagicMock,
63+
mock_aasx_reader: mock.MagicMock) -> None:
6364
manager = ComplianceToolStateManager()
6465

6566
mock_aasx_reader.side_effect = ValueError("Test error!")
@@ -73,7 +74,8 @@ def test_check_aas_example_fail_on_open(self, mock_data_checker: mock.MagicMock,
7374

7475
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
7576
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
76-
def test_check_aas_example_fail_on_read(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
77+
def test_check_aas_example_fail_on_read(self, mock_data_checker: mock.MagicMock,
78+
mock_aasx_reader: mock.MagicMock) -> None:
7779
manager = ComplianceToolStateManager()
7880

7981
mock_aasx_reader.return_value.read_into.side_effect = ValueError("Test error!")
@@ -87,7 +89,8 @@ def test_check_aas_example_fail_on_read(self, mock_data_checker: mock.MagicMock,
8789

8890
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
8991
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
90-
def test_check_aas_example_fail_on_data_check(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
92+
def test_check_aas_example_fail_on_data_check(self, mock_data_checker: mock.MagicMock,
93+
mock_aasx_reader: mock.MagicMock) -> None:
9194
manager = ComplianceToolStateManager()
9295

9396
mock_data_checker.return_value.checks = [CheckResult("Expected Behavior", False, dict())]
@@ -103,7 +106,8 @@ def test_check_aas_example_fail_on_data_check(self, mock_data_checker: mock.Magi
103106

104107
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
105108
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
106-
def test_check_aas_example_fail_on_core_properties(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
109+
def test_check_aas_example_fail_on_core_properties(self, mock_data_checker: mock.MagicMock,
110+
mock_aasx_reader: mock.MagicMock) -> None:
107111
manager = ComplianceToolStateManager()
108112

109113
mock_data_checker.return_value.checks = []
@@ -123,7 +127,8 @@ def test_check_aas_example_fail_on_core_properties(self, mock_data_checker: mock
123127

124128
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
125129
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
126-
def test_check_aas_example_fail_on_file_missing(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
130+
def test_check_aas_example_fail_on_file_missing(self, mock_data_checker: mock.MagicMock,
131+
mock_aasx_reader: mock.MagicMock) -> None:
127132
manager = ComplianceToolStateManager()
128133

129134
mock_data_checker.return_value.checks = []
@@ -142,7 +147,7 @@ def test_check_aas_example_fail_on_file_missing(self, mock_data_checker: mock.Ma
142147
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
143148
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
144149
def test_check_aas_example_fail_on_file_check(self, mock_data_checker: mock.MagicMock,
145-
mock_aasx_reader: mock.MagicMock) -> None:
150+
mock_aasx_reader: mock.MagicMock) -> None:
146151
manager = ComplianceToolStateManager()
147152

148153
mock_data_checker.return_value.checks = []
@@ -160,7 +165,8 @@ def test_check_aas_example_fail_on_file_check(self, mock_data_checker: mock.Magi
160165

161166
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
162167
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
163-
def test_check_aas_example_success(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
168+
def test_check_aas_example_success(self, mock_data_checker: mock.MagicMock,
169+
mock_aasx_reader: mock.MagicMock) -> None:
164170
manager = ComplianceToolStateManager()
165171

166172
mock_aasx_reader.return_value.read_into.side_effect = create_read_into_mock(file='TestFile')
@@ -177,10 +183,13 @@ def test_check_aas_example_success(self, mock_data_checker: mock.MagicMock, mock
177183

178184
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
179185
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
180-
def test_check_aasx_files_equivalence_file1_fail_on_open(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
186+
def test_check_aasx_files_equivalence_file1_fail_on_open(self, mock_data_checker: mock.MagicMock,
187+
mock_aasx_reader: mock.MagicMock) -> None:
181188
manager = ComplianceToolStateManager()
182189

183190
mock_aasx_reader.side_effect = [ValueError("Test error!"), mock_aasx_reader.return_value]
191+
mock_data_checker.return_value.checks = []
192+
mock_aasx_reader.return_value.get_core_properties.return_value = create_example_aas_core_properties()
184193
compliance_tool.check_aasx_files_equivalence("", "", manager)
185194

186195
self.assertEqual(6, len(manager.steps))
@@ -194,10 +203,13 @@ def test_check_aasx_files_equivalence_file1_fail_on_open(self, mock_data_checker
194203

195204
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
196205
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
197-
def test_check_aasx_files_equivalence_file2_fail_on_open(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
206+
def test_check_aasx_files_equivalence_file2_fail_on_open(self, mock_data_checker: mock.MagicMock,
207+
mock_aasx_reader: mock.MagicMock) -> None:
198208
manager = ComplianceToolStateManager()
199209

200210
mock_aasx_reader.side_effect = [mock_aasx_reader.return_value, ValueError("Test error!")]
211+
mock_data_checker.return_value.checks = []
212+
mock_aasx_reader.return_value.get_core_properties.return_value = create_example_aas_core_properties()
201213
compliance_tool.check_aasx_files_equivalence("", "", manager)
202214

203215
self.assertEqual(6, len(manager.steps))
@@ -211,11 +223,13 @@ def test_check_aasx_files_equivalence_file2_fail_on_open(self, mock_data_checker
211223

212224
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
213225
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
214-
def test_check_aasx_files_equivalence_fail_on_data_check(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
226+
def test_check_aasx_files_equivalence_fail_on_data_check(self, mock_data_checker: mock.MagicMock,
227+
mock_aasx_reader: mock.MagicMock) -> None:
215228
manager = ComplianceToolStateManager()
216229

217230
mock_data_checker.return_value.checks = [CheckResult("Test failure", False, dict())]
218231
mock_data_checker.return_value.failed_checks = iter(mock_data_checker.return_value.checks)
232+
mock_aasx_reader.return_value.get_core_properties.return_value = create_example_aas_core_properties()
219233
compliance_tool.check_aasx_files_equivalence("", "", manager)
220234

221235
self.assertEqual(6, len(manager.steps))
@@ -230,11 +244,12 @@ def test_check_aasx_files_equivalence_fail_on_data_check(self, mock_data_checker
230244
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
231245
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
232246
def test_check_aasx_files_equivalence_fail_on_core_properties(self, mock_data_checker: mock.MagicMock,
233-
mock_aasx_reader: mock.MagicMock) -> None:
247+
mock_aasx_reader: mock.MagicMock) -> None:
234248
manager = ComplianceToolStateManager()
235249

236250
mock_aasx_reader.return_value.read_into.side_effect = create_read_into_mock(file='TestFile')
237251
mock_data_checker.return_value.checks = []
252+
mock_aasx_reader.return_value.get_core_properties.return_value = create_example_aas_core_properties()
238253
mock_data_checker.return_value.failed_checks = iter([])
239254

240255
wrong_cp = create_example_aas_core_properties()
@@ -256,14 +271,15 @@ def test_check_aasx_files_equivalence_fail_on_core_properties(self, mock_data_ch
256271
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
257272
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
258273
def test_check_aasx_files_equivalence_fail_on_file_missing(self, mock_data_checker: mock.MagicMock,
259-
mock_aasx_reader: mock.MagicMock) -> None:
274+
mock_aasx_reader: mock.MagicMock) -> None:
260275
manager = ComplianceToolStateManager()
261276

262277
mock_data_checker.return_value.checks = []
263278
mock_data_checker.return_value.failed_checks = iter([])
264279
mock_aasx_reader.return_value.get_core_properties.return_value = create_example_aas_core_properties()
265280

266281
call_count = [0]
282+
267283
def setup_file_stores(*args, **kwargs):
268284
call_count[0] += 1
269285
if call_count[0] == 1:
@@ -279,14 +295,15 @@ def setup_file_stores(*args, **kwargs):
279295
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
280296
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
281297
def test_check_aasx_files_equivalence_fail_on_file_check(self, mock_data_checker: mock.MagicMock,
282-
mock_aasx_reader: mock.MagicMock) -> None:
298+
mock_aasx_reader: mock.MagicMock) -> None:
283299
manager = ComplianceToolStateManager()
284300

285301
mock_data_checker.return_value.checks = []
286302
mock_data_checker.return_value.failed_checks = iter([])
287303
mock_aasx_reader.return_value.get_core_properties.return_value = create_example_aas_core_properties()
288304

289305
call_count = [0]
306+
290307
def setup_file_stores(*args, **kwargs):
291308
call_count[0] += 1
292309
if call_count[0] == 1:
@@ -301,7 +318,8 @@ def setup_file_stores(*args, **kwargs):
301318

302319
@mock.patch("basyx.aas.adapter.aasx.AASXReader", autospec=True)
303320
@mock.patch("aas_compliance_tool.compliance_check_aasx.AASDataChecker", autospec=True)
304-
def test_check_aasx_files_equivalence_success(self, mock_data_checker: mock.MagicMock, mock_aasx_reader: mock.MagicMock) -> None:
321+
def test_check_aasx_files_equivalence_success(self, mock_data_checker: mock.MagicMock,
322+
mock_aasx_reader: mock.MagicMock) -> None:
305323
manager = ComplianceToolStateManager()
306324

307325
mock_aasx_reader.return_value.read_into.side_effect = create_read_into_mock(file='TestFile')

‎compliance_tool/test/test_compliance_check_json.py‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import unittest
88
from unittest import mock
99

10-
from _test_helper import create_mock_effect
10+
from ._test_helper import create_mock_effect
1111
from aas_compliance_tool import compliance_check_json as compliance_tool
1212
from aas_compliance_tool.state_manager import ComplianceToolStateManager, Status
1313

@@ -16,7 +16,6 @@
1616

1717
class ComplianceToolJsonTest(unittest.TestCase):
1818

19-
2019
def test_check_deserialization_no_file(self) -> None:
2120
manager = ComplianceToolStateManager()
2221

@@ -67,7 +66,8 @@ def test_check_deserialization_success(self, mock_read_json_file, mock_open) ->
6766
@mock.patch("builtins.open")
6867
@mock.patch("basyx.aas.adapter.json.json_deserialization.read_aas_json_file", autospec=True)
6968
@mock.patch("aas_compliance_tool.compliance_check_json.AASDataChecker", autospec=True)
70-
def test_check_example_success(self, mock_data_checker: mock.MagicMock, mock_read_json_file: mock.MagicMock, mock_open: mock.MagicMock) -> None:
69+
def test_check_example_success(self, mock_data_checker: mock.MagicMock, mock_read_json_file: mock.MagicMock,
70+
mock_open: mock.MagicMock) -> None:
7171
manager = ComplianceToolStateManager()
7272

7373
mock_data_checker.return_value.checks = []
@@ -83,23 +83,24 @@ def test_check_example_success(self, mock_data_checker: mock.MagicMock, mock_rea
8383
@mock.patch("basyx.aas.adapter.json.json_deserialization.read_aas_json_file", autospec=True)
8484
@mock.patch("aas_compliance_tool.compliance_check_json.AASDataChecker", autospec=True)
8585
def test_check_example_fail_on_read(self, mock_data_checker: mock.MagicMock, mock_read_json_file: mock.MagicMock,
86-
mock_open: mock.MagicMock) -> None:
86+
mock_open: mock.MagicMock) -> None:
8787
manager = ComplianceToolStateManager()
8888

89-
mock_read_json_file.side_effect = create_mock_effect('basyx.aas.adapter.json.json_deserialization', 'error', error_msg="Error on reading aas json file!")
89+
mock_read_json_file.side_effect = create_mock_effect('basyx.aas.adapter.json.json_deserialization', 'error',
90+
error_msg="Error on reading aas json file!")
9091
compliance_tool.check_aas_example("", manager)
9192

9293
self.assertEqual(3, len(manager.steps))
9394
self.assertEqual(Status.SUCCESS, manager.steps[0].status)
9495
self.assertEqual(Status.FAILED, manager.steps[1].status)
95-
self.assertIn("Error on reading aas json file!", manager.format_step(1, verbose_level=1) )
96+
self.assertIn("Error on reading aas json file!", manager.format_step(1, verbose_level=1))
9697
self.assertEqual(Status.NOT_EXECUTED, manager.steps[2].status)
9798

9899
@mock.patch("builtins.open")
99100
@mock.patch("basyx.aas.adapter.json.json_deserialization.read_aas_json_file", autospec=True)
100101
@mock.patch("aas_compliance_tool.compliance_check_json.AASDataChecker", autospec=True)
101102
def test_check_example_fail_on_check(self, mock_data_checker: mock.MagicMock, mock_read_json_file: mock.MagicMock,
102-
mock_open: mock.MagicMock) -> None:
103+
mock_open: mock.MagicMock) -> None:
103104
manager = ComplianceToolStateManager()
104105
mock_data_checker.return_value.checks = [CheckResult("Expected Behavior", False, dict())]
105106
mock_data_checker.return_value.failed_checks = iter(mock_data_checker.return_value.checks)
@@ -115,10 +116,12 @@ def test_check_example_fail_on_check(self, mock_data_checker: mock.MagicMock, mo
115116
@mock.patch("builtins.open")
116117
@mock.patch("basyx.aas.adapter.json.json_deserialization.read_aas_json_file", autospec=True)
117118
@mock.patch("aas_compliance_tool.compliance_check_json.AASDataChecker", autospec=True)
118-
def test_check_json_files_equivalence_file1_fail_on_deserialization(self, mock_data_checker, mock_read_json_file, mock_open) -> None:
119+
def test_check_json_files_equivalence_file1_fail_on_deserialization(self, mock_data_checker, mock_read_json_file,
120+
mock_open) -> None:
119121
manager = ComplianceToolStateManager()
120122

121123
call_count = [0]
124+
122125
def mock_first_fails(*args, **kwargs):
123126
call_count[0] += 1
124127
if call_count[0] == 1:
@@ -138,10 +141,12 @@ def mock_first_fails(*args, **kwargs):
138141
@mock.patch("builtins.open")
139142
@mock.patch("basyx.aas.adapter.json.json_deserialization.read_aas_json_file", autospec=True)
140143
@mock.patch("aas_compliance_tool.compliance_check_json.AASDataChecker", autospec=True)
141-
def test_check_json_files_equivalence_file2_fail_on_deserialization(self, mock_data_checker, mock_read_json_file, mock_open) -> None:
144+
def test_check_json_files_equivalence_file2_fail_on_deserialization(self, mock_data_checker, mock_read_json_file,
145+
mock_open) -> None:
142146
manager = ComplianceToolStateManager()
143147

144148
call_count = [0]
149+
145150
def mock_second_fails(*args, **kwargs):
146151
call_count[0] += 1
147152
if call_count[0] == 2:
@@ -178,7 +183,8 @@ def test_check_json_files_equivalence_success(self, mock_data_checker, mock_read
178183
@mock.patch("builtins.open")
179184
@mock.patch("basyx.aas.adapter.json.json_deserialization.read_aas_json_file", autospec=True)
180185
@mock.patch("aas_compliance_tool.compliance_check_json.AASDataChecker", autospec=True)
181-
def test_check_json_files_equivalence_fail_on_check(self, mock_data_checker: mock.MagicMock, mock_read_json_file, mock_open) -> None:
186+
def test_check_json_files_equivalence_fail_on_check(self, mock_data_checker: mock.MagicMock, mock_read_json_file,
187+
mock_open) -> None:
182188
manager = ComplianceToolStateManager()
183189

184190
mock_data_checker.return_value.checks = [CheckResult("Test failure", False, dict())]

0 commit comments

Comments
 (0)