Skip to content

Commit 3546172

Browse files
valentin-gauthier-geosirisvalentin-gauthier-geosiris
committed
black
1 parent b44a856 commit 3546172

File tree

4 files changed

+114
-110
lines changed

4 files changed

+114
-110
lines changed

‎tests/data/arrays.py

Lines changed: 99 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,107 @@
1-
from etptypes.energistics.etp.v12.protocol.data_array.get_data_arrays import GetDataArrays
1+
from etptypes.energistics.etp.v12.protocol.data_array.get_data_arrays import (
2+
GetDataArrays,
3+
)
24

35
from etpproto.messages import Message
46

5-
get_data_array_0 = GetDataArrays.parse_obj({
6-
"dataArrays": {
7-
"0": {
8-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
9-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch0"
10-
},
11-
"1": {
12-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
13-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch1"
14-
},
15-
"2": {
16-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
17-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch2"
18-
},
19-
"3": {
20-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
21-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch3"
22-
},
23-
"4": {
24-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
25-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch4"
26-
},
27-
"5": {
28-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
29-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch5"
30-
},
31-
"6": {
32-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
33-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch6"
34-
},
35-
"7": {
36-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
37-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch7"
38-
},
39-
"8": {
40-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
41-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch8"
42-
},
43-
"9": {
44-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
45-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch9"
46-
},
47-
"10": {
48-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
49-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch10"
50-
},
51-
"11": {
52-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
53-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch11"
54-
},
55-
"12": {
56-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
57-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch12"
58-
},
59-
"13": {
60-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
61-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch13"
62-
},
63-
"14": {
64-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
65-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch14"
66-
},
67-
"15": {
68-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
69-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch15"
70-
},
71-
"16": {
72-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
73-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch16"
74-
},
75-
"17": {
76-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
77-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch17"
78-
},
79-
"18": {
80-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
81-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch18"
82-
},
83-
"19": {
84-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
85-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch19"
86-
},
87-
"20": {
88-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
89-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch20"
90-
},
91-
"21": {
92-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
93-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch21"
94-
},
95-
"22": {
96-
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
97-
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch22"
7+
get_data_array_0 = GetDataArrays.parse_obj(
8+
{
9+
"dataArrays": {
10+
"0": {
11+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
12+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch0",
13+
},
14+
"1": {
15+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
16+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch1",
17+
},
18+
"2": {
19+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
20+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch2",
21+
},
22+
"3": {
23+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
24+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch3",
25+
},
26+
"4": {
27+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
28+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch4",
29+
},
30+
"5": {
31+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
32+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch5",
33+
},
34+
"6": {
35+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
36+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch6",
37+
},
38+
"7": {
39+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
40+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch7",
41+
},
42+
"8": {
43+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
44+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch8",
45+
},
46+
"9": {
47+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
48+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch9",
49+
},
50+
"10": {
51+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
52+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch10",
53+
},
54+
"11": {
55+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
56+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch11",
57+
},
58+
"12": {
59+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
60+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch12",
61+
},
62+
"13": {
63+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
64+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch13",
65+
},
66+
"14": {
67+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
68+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch14",
69+
},
70+
"15": {
71+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
72+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch15",
73+
},
74+
"16": {
75+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
76+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch16",
77+
},
78+
"17": {
79+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
80+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch17",
81+
},
82+
"18": {
83+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
84+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch18",
85+
},
86+
"19": {
87+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
88+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch19",
89+
},
90+
"20": {
91+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
92+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch20",
93+
},
94+
"21": {
95+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
96+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch21",
97+
},
98+
"22": {
99+
"uri": "eml:///dataspace('volve-eqn-plus')/resqml22.TriangulatedSetRepresentation(c6ec3a44-37a3-421f-ade6-91b2ced532e8)",
100+
"pathInResource": "RESQML/c6ec3a44-37a3-421f-ade6-91b2ced532e8/point_patch22",
101+
},
98102
}
99103
}
100-
})
104+
)
101105

102106
if __name__ == "__main__":
103107
print(get_data_array_0)

‎tests/test_connection.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ async def test_connection_state_request_session_as_bytes() -> None:
251251
connection = ETPConnection()
252252

253253
async for m in connection.handle_bytes_generator(
254-
requestSession_msg.encode_message()
254+
requestSession_msg.encode_message()
255255
):
256256
pass
257257

@@ -263,12 +263,12 @@ async def test_connection_state_close_session_as_bytes() -> None:
263263
connection = ETPConnection()
264264

265265
async for m in connection.handle_bytes_generator(
266-
requestSession_msg.encode_message()
266+
requestSession_msg.encode_message()
267267
):
268268
pass
269269

270270
async for m in connection.handle_bytes_generator(
271-
closeSession_msg.encode_message()
271+
closeSession_msg.encode_message()
272272
):
273273
pass
274274

@@ -293,7 +293,7 @@ async def test_connection_requestSession_answer_as_bytes() -> None:
293293

294294
answer = []
295295
async for m in connection.handle_bytes_generator(
296-
requestSession_msg.encode_message()
296+
requestSession_msg.encode_message()
297297
):
298298
answer.append(m)
299299

@@ -311,7 +311,7 @@ async def test_connection_requestSession_answer_as_bytes_generator() -> None:
311311

312312
answer = []
313313
async for m in (
314-
connection.handle_bytes_generator(requestSession_msg.encode_message())
314+
connection.handle_bytes_generator(requestSession_msg.encode_message())
315315
):
316316
answer.append(
317317
Message.decode_binary_message(
@@ -348,7 +348,7 @@ async def test_connection_closeSession_answer_as_bytes_generator() -> None:
348348

349349
answer = []
350350
async for m in (
351-
connection.handle_bytes_generator(closeSession_msg.encode_message())
351+
connection.handle_bytes_generator(closeSession_msg.encode_message())
352352
):
353353
answer.append(
354354
Message.decode_binary_message(
@@ -366,7 +366,7 @@ async def test_send_msg_without_connection_generator() -> None:
366366

367367
answer = []
368368
async for m in (
369-
connection.handle_bytes_generator(getResources_msg.encode_message())
369+
connection.handle_bytes_generator(getResources_msg.encode_message())
370370
):
371371
answer.append(
372372
Message.decode_binary_message(
@@ -393,7 +393,7 @@ async def test_connection_first_msg_attributes() -> None:
393393
assert len(answer) == 1
394394
assert answer[0].header.message_id == 1
395395
assert (
396-
answer[0].header.correlation_id == requestSession_msg.header.message_id
396+
answer[0].header.correlation_id == requestSession_msg.header.message_id
397397
)
398398
assert answer[0].is_final_msg()
399399

@@ -405,9 +405,9 @@ async def test_connection_requestSession_answer_as_bytes_generator_acknowledge()
405405

406406
answer = []
407407
async for m in (
408-
connection.handle_bytes_generator(
409-
requestSession_msg_ask_acknowledge.encode_message()
410-
)
408+
connection.handle_bytes_generator(
409+
requestSession_msg_ask_acknowledge.encode_message()
410+
)
411411
):
412412
answer.append(
413413
Message.decode_binary_message(

‎tests/test_messages.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,6 @@ async def test_msg_multipart_chunks_reassembled_in_connection_get_ressources():
372372
)
373373
)
374374

375-
376-
377375

378376
# if __name__ == "__main__":
379377
# asyncio.run(test_connection_multipart_msg_one_part_answer_generator())

‎tests/test_uris.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ def test_uri_dataspace_2() -> None:
2525

2626

2727
def test_uri_dataspace_3() -> None:
28-
uri = parse_uri("eml:///dataspace('volve-eqn-plus')/resqml20.obj_Grid2dRepresentation(3a45fb70-8ba9-4341-a701-0f514270ba9c)")
28+
uri = parse_uri(
29+
"eml:///dataspace('volve-eqn-plus')/resqml20.obj_Grid2dRepresentation(3a45fb70-8ba9-4341-a701-0f514270ba9c)"
30+
)
2931
assert isinstance(uri, DataObjectURI)
3032
assert uri.dataspace is not None
31-
assert uri.dataspace == 'volve-eqn-plus'
33+
assert uri.dataspace == "volve-eqn-plus"
3234

3335

3436
def test_uri_data_object_0() -> None:

0 commit comments

Comments
 (0)