Skip to content

Commit 1751a31

Browse files
bsrdjanbsrdjan
committed
test(Server): Automated server test
1 parent e899d67 commit 1751a31

2 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎tests/function_description_utils.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333

3434
def compare_function_description(fd1, fd2):
3535
# compare names
36-
fd1_name = fd1["name"] if type(fd1) is dict else fd1.name
37-
fd2_name = fd2["name"] if type(fd2) is dict else fd2.name
36+
fd1_name = fd1["name"] if isinstance(fd1, dict) else fd1.name
37+
fd2_name = fd2["name"] if isinstance(fd2, dict) else fd2.name
3838
# print(fd1_name, len(fd1_name))
3939
# print(fd2_name, len(fd2_name))
4040
assert fd1_name == fd2_name
4141
# compare parameters
42-
fd1_parameters = fd1["parameters"] if type(fd1) is dict else fd1.parameters
43-
fd2_parameters = fd2["parameters"] if type(fd2) is dict else fd2.parameters
42+
fd1_parameters = fd1["parameters"] if isinstance(fd1, dict) else fd1.parameters
43+
fd2_parameters = fd2["parameters"] if isinstance(fd2, dict) else fd2.parameters
4444
# print(len(fd1_parameters))
4545
# print(len(fd2_parameters))
4646
assert len(fd1_parameters) == len(fd2_parameters)
@@ -54,12 +54,12 @@ def compare_function_description(fd1, fd2):
5454
# compare fields
5555
fd1_fields = (
5656
param1["type_description"]["fields"]
57-
if type(param1["type_description"]) is dict
57+
if isinstance(param1["type_description"], dict)
5858
else param1["type_description"].fields
5959
)
6060
fd2_fields = (
6161
param2["type_description"]["fields"]
62-
if type(param2["type_description"]) is dict
62+
if isinstance(param2["type_description"], dict)
6363
else param2["type_description"].fields
6464
)
6565
assert len(fd1_fields) == len(fd2_fields)

‎tests/test_datatypes.py‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ def test_basic_datatypes():
9999
in_value = is_input[attr]
100100
out_value = res[attr]
101101
if attr == "ZFLTP":
102-
assert type(out_value) is float
102+
assert isinstance(out_value, float)
103103
else:
104-
assert type(out_value) is Decimal
104+
assert isinstance(out_value, Decimal)
105105
if type(in_value) != type(out_value):
106106
assert str(in_value) == str(out_value)
107107
else:
@@ -167,12 +167,12 @@ def test_min_max_positive():
167167
IV_COUNT=0,
168168
)["ES_OUTPUT"]
169169

170-
assert type(output["ZFLTP_MIN"]) is float
171-
assert type(output["ZFLTP_MAX"]) is float
172-
assert type(output["ZDECF16_MIN"]) is Decimal
173-
assert type(output["ZDECF16_MAX"]) is Decimal
174-
assert type(output["ZDECF34_MAX"]) is Decimal
175-
assert type(output["ZDECF16_MIN"]) is Decimal
170+
assert isinstance(output["ZFLTP_MIN"], float)
171+
assert isinstance(output["ZFLTP_MAX"], float)
172+
assert isinstance(output["ZDECF16_MIN"], Decimal)
173+
assert isinstance(output["ZDECF16_MAX"], Decimal)
174+
assert isinstance(output["ZDECF34_MAX"], Decimal)
175+
assert isinstance(output["ZDECF16_MIN"], Decimal)
176176

177177
assert float(IS_INPUT["ZFLTP_MIN"]) == output["ZFLTP_MIN"]
178178
assert float(IS_INPUT["ZFLTP_MAX"]) == output["ZFLTP_MAX"]
@@ -200,12 +200,12 @@ def test_min_max_negative():
200200
IV_COUNT=0,
201201
)["ES_OUTPUT"]
202202

203-
assert type(output["ZFLTP_MIN"]) is float
204-
assert type(output["ZFLTP_MAX"]) is float
205-
assert type(output["ZDECF16_MIN"]) is Decimal
206-
assert type(output["ZDECF16_MAX"]) is Decimal
207-
assert type(output["ZDECF16_MIN"]) is Decimal
208-
assert type(output["ZDECF34_MAX"]) is Decimal
203+
assert isinstance(output["ZFLTP_MIN"], float)
204+
assert isinstance(output["ZFLTP_MAX"], float)
205+
assert isinstance(output["ZDECF16_MIN"], Decimal)
206+
assert isinstance(output["ZDECF16_MAX"], Decimal)
207+
assert isinstance(output["ZDECF16_MIN"], Decimal)
208+
assert isinstance(output["ZDECF34_MAX"], Decimal)
209209

210210
assert float(IS_INPUT["ZFLTP_MIN"]) == output["ZFLTP_MIN"]
211211
assert float(IS_INPUT["ZFLTP_MAX"]) == output["ZFLTP_MAX"]
@@ -281,25 +281,25 @@ def test_bcd_floats_accept_strings():
281281
IS_INPUT=IS_INPUT,
282282
IV_COUNT=0,
283283
)["ES_OUTPUT"]
284-
assert type(output["ZFLTP"]) is float
284+
assert isinstance(output["ZFLTP"], float)
285285
assert float(IS_INPUT["ZFLTP"]) == output["ZFLTP"]
286286

287-
assert type(output["ZDEC"]) is Decimal
287+
assert isinstance(output["ZDEC"], Decimal)
288288
assert IS_INPUT["ZDEC"] == str(output["ZDEC"])
289289

290-
assert type(output["ZDECF16_MIN"]) is Decimal
290+
assert isinstance(output["ZDECF16_MIN"], Decimal)
291291
assert IS_INPUT["ZDECF16_MIN"] == str(output["ZDECF16_MIN"])
292292

293-
assert type(output["ZDECF34_MIN"]) is Decimal
293+
assert isinstance(output["ZDECF34_MIN"], Decimal)
294294
assert IS_INPUT["ZDECF34_MIN"] == str(output["ZDECF34_MIN"])
295295

296-
assert type(output["ZCURR"]) is Decimal
296+
assert isinstance(output["ZCURR"], Decimal)
297297
assert IS_INPUT["ZCURR"] == str(output["ZCURR"])
298298

299-
assert type(output["ZQUAN"]) is Decimal
299+
assert isinstance(output["ZQUAN"], Decimal)
300300
assert IS_INPUT["ZQUAN"] == str(output["ZQUAN"])
301301

302-
assert type(output["ZQUAN_SIGN"]) is Decimal
302+
assert isinstance(output["ZQUAN_SIGN"], Decimal)
303303
assert IS_INPUT["ZQUAN_SIGN"] == str(output["ZQUAN_SIGN"])
304304

305305

@@ -323,25 +323,25 @@ def test_bcd_floats_accept_strings_radix_comma():
323323
IS_INPUT=IS_INPUT,
324324
IV_COUNT=0,
325325
)["ES_OUTPUT"]
326-
assert type(output["ZFLTP"]) is float
326+
assert isinstance(output["ZFLTP"], float)
327327
assert float(IS_INPUT["ZFLTP"]) == output["ZFLTP"]
328328

329-
assert type(output["ZDEC"]) is Decimal
329+
assert isinstance(output["ZDEC"], Decimal)
330330
assert IS_INPUT["ZDEC"] == str(output["ZDEC"])
331331

332-
assert type(output["ZDECF16_MIN"]) is Decimal
332+
assert isinstance(output["ZDECF16_MIN"], Decimal)
333333
assert IS_INPUT["ZDECF16_MIN"] == str(output["ZDECF16_MIN"])
334334

335-
assert type(output["ZDECF34_MIN"]) is Decimal
335+
assert isinstance(output["ZDECF34_MIN"], Decimal)
336336
assert IS_INPUT["ZDECF34_MIN"] == str(output["ZDECF34_MIN"])
337337

338-
assert type(output["ZCURR"]) is Decimal
338+
assert isinstance(output["ZCURR"], Decimal)
339339
assert IS_INPUT["ZCURR"] == str(output["ZCURR"])
340340

341-
assert type(output["ZQUAN"]) is Decimal
341+
assert isinstance(output["ZQUAN"], Decimal)
342342
assert IS_INPUT["ZQUAN"] == str(output["ZQUAN"])
343343

344-
assert type(output["ZQUAN_SIGN"]) is Decimal
344+
assert isinstance(output["ZQUAN_SIGN"], Decimal)
345345
assert IS_INPUT["ZQUAN_SIGN"] == str(output["ZQUAN_SIGN"])
346346
# locale.setlocale(locale.LC_ALL, "")
347347

@@ -365,25 +365,25 @@ def test_bcd_floats_accept_decimals():
365365
IS_INPUT=IS_INPUT,
366366
IV_COUNT=0,
367367
)["ES_OUTPUT"]
368-
assert type(output["ZFLTP"]) is float
368+
assert isinstance(output["ZFLTP"], float)
369369
assert IS_INPUT["ZFLTP"] == Decimal(str(output["ZFLTP"]))
370370

371-
assert type(output["ZDEC"]) is Decimal
371+
assert isinstance(output["ZDEC"], Decimal)
372372
assert IS_INPUT["ZDEC"] == Decimal(str(output["ZDEC"]))
373373

374-
assert type(output["ZDECF16_MIN"]) is Decimal
374+
assert isinstance(output["ZDECF16_MIN"], Decimal)
375375
assert IS_INPUT["ZDECF16_MIN"] == Decimal(str(output["ZDECF16_MIN"]))
376376

377-
assert type(output["ZDECF34_MIN"]) is Decimal
377+
assert isinstance(output["ZDECF34_MIN"], Decimal)
378378
assert IS_INPUT["ZDECF34_MIN"] == Decimal(str(output["ZDECF34_MIN"]))
379379

380-
assert type(output["ZCURR"]) is Decimal
380+
assert isinstance(output["ZCURR"], Decimal)
381381
assert IS_INPUT["ZCURR"] == Decimal(str(output["ZCURR"]))
382382

383-
assert type(output["ZQUAN"]) is Decimal
383+
assert isinstance(output["ZQUAN"], Decimal)
384384
assert IS_INPUT["ZQUAN"] == Decimal(str(output["ZQUAN"]))
385385

386-
assert type(output["ZQUAN_SIGN"]) is Decimal
386+
assert isinstance(output["ZQUAN_SIGN"], Decimal)
387387
assert IS_INPUT["ZQUAN_SIGN"] == Decimal(str(output["ZQUAN_SIGN"]))
388388

389389

@@ -401,8 +401,8 @@ def test_raw_types_accept_bytes():
401401
)["ES_OUTPUT"]
402402
assert output["ZRAW"] == ZRAW + DIFF
403403
assert output["ZRAWSTRING"] == ZRAW
404-
assert type(output["ZRAW"]) is bytes
405-
assert type(output["ZRAWSTRING"]) is bytes
404+
assert isinstance(output["ZRAW"], bytes)
405+
assert isinstance(output["ZRAWSTRING"], bytes)
406406

407407

408408
def test_raw_types_accept_bytearray():
@@ -479,8 +479,8 @@ def test_date_accepts_string():
479479
IMPORTSTRUCT=IMPORTSTRUCT,
480480
RFCTABLE=IMPORTTABLE,
481481
)
482-
assert type(output["ECHOSTRUCT"]["RFCDATE"]) is str
483-
assert type(output["RFCTABLE"][0]["RFCDATE"]) is str
482+
assert isinstance(output["ECHOSTRUCT"]["RFCDATE"], str)
483+
assert isinstance(output["RFCTABLE"][0]["RFCDATE"], str)
484484
assert output["ECHOSTRUCT"]["RFCDATE"] == TEST_DATE
485485
assert output["RFCTABLE"][0]["RFCDATE"] == TEST_DATE
486486

@@ -494,8 +494,8 @@ def test_date_accepts_date():
494494
IMPORTSTRUCT=IMPORTSTRUCT,
495495
RFCTABLE=IMPORTTABLE,
496496
)
497-
assert type(output["ECHOSTRUCT"]["RFCDATE"]) is str
498-
assert type(output["RFCTABLE"][0]["RFCDATE"]) is str
497+
assert isinstance(output["ECHOSTRUCT"]["RFCDATE"], str)
498+
assert isinstance(output["RFCTABLE"][0]["RFCDATE"], str)
499499
assert output["ECHOSTRUCT"]["RFCDATE"] == python_to_ABAP_date(TEST_DATE)
500500
assert output["RFCTABLE"][0]["RFCDATE"] == python_to_ABAP_date(TEST_DATE)
501501

@@ -509,8 +509,8 @@ def test_time_accepts_string():
509509
IMPORTSTRUCT=IMPORTSTRUCT,
510510
RFCTABLE=IMPORTTABLE,
511511
)
512-
assert type(output["ECHOSTRUCT"]["RFCTIME"]) is str
513-
assert type(output["RFCTABLE"][0]["RFCTIME"]) is str
512+
assert isinstance(output["ECHOSTRUCT"]["RFCTIME"], str)
513+
assert isinstance(output["RFCTABLE"][0]["RFCTIME"], str)
514514
assert output["ECHOSTRUCT"]["RFCTIME"] == TEST_TIME
515515
assert output["RFCTABLE"][0]["RFCTIME"] == TEST_TIME
516516

@@ -524,8 +524,8 @@ def test_time_accepts_time():
524524
IMPORTSTRUCT=IMPORTSTRUCT,
525525
RFCTABLE=IMPORTTABLE,
526526
)
527-
assert type(output["ECHOSTRUCT"]["RFCTIME"]) is str
528-
assert type(output["RFCTABLE"][0]["RFCTIME"]) is str
527+
assert isinstance(output["ECHOSTRUCT"]["RFCTIME"], str)
528+
assert isinstance(output["RFCTABLE"][0]["RFCTIME"], str)
529529
assert output["ECHOSTRUCT"]["RFCTIME"] == python_to_ABAP_time(TEST_TIME)
530530
assert output["RFCTABLE"][0]["RFCTIME"] == python_to_ABAP_time(TEST_TIME)
531531

0 commit comments

Comments
 (0)