Alex / prozorro-robot_tests · Commits

Commit 6c9c70de79ca63a90ba8f12f95655bd9cffeb583

Authored by Yurii Mykhalchuk
Committed by GitHub
2 parents d2d38152 15647881

Merge pull request #286 from kosaniak/new_master 

Note `Create Dictionary` with two and more arguments in a few rows
Inline Side-by-side
Showing 3 changed files with 114 additions and 32 deletions
... ... @@ -43,7 +43,10 @@ Resource resource.robot
43 43 ${file_path} ${file_name} ${file_content}= create_fake_doc
44 44 Run As ${tender_owner} Завантажити документ ${file_path} ${TENDER['TENDER_UAID']}
45 45 ${doc_id}= get_id_from_doc_name ${file_name}
46   - ${tender_document}= Create Dictionary doc_name=${file_name} doc_id=${doc_id} doc_content=${file_content}
  46 + ${tender_document}= Create Dictionary
  47 + ... doc_name=${file_name}
  48 + ... doc_id=${doc_id}
  49 + ... doc_content=${file_content}
47 50 Set To Dictionary ${USERS.users['${tender_owner}']} tender_document=${tender_document}
48 51 Remove File ${file_path}
49 52
... ... @@ -52,7 +55,9 @@ Resource resource.robot
52 55 ${item}= Підготувати дані для створення предмету закупівлі ${USERS.users['${tender_owner}'].initial_data.data['items'][0]['classification']['id']}
53 56 Run As ${tender_owner} Додати предмет закупівлі ${TENDER['TENDER_UAID']} ${item}
54 57 ${item_id}= get_id_from_object ${item}
55   - ${item_data}= Create Dictionary item=${item} item_id=${item_id}
  58 + ${item_data}= Create Dictionary
  59 + ... item=${item}
  60 + ... item_id=${item_id}
56 61 ${item_data}= munch_dict arg=${item_data}
57 62 Set To Dictionary ${USERS.users['${tender_owner}']} item_data=${item_data}
58 63
... ... @@ -158,7 +163,10 @@ Resource resource.robot
158 163 ${file_path} ${file_name} ${file_content}= create_fake_doc
159 164 Run As ${tender_owner} Завантажити документ в лот ${file_path} ${TENDER['TENDER_UAID']} ${lot_id}
160 165 ${doc_id}= get_id_from_doc_name ${file_name}
161   - ${data}= Create Dictionary doc_name=${file_name} doc_id=${doc_id} doc_content=${file_content}
  166 + ${data}= Create Dictionary
  167 + ... doc_name=${file_name}
  168 + ... doc_id=${doc_id}
  169 + ... doc_content=${file_content}
162 170 ${empty_list}= Create List
163 171 ${lots_documents}= Get variable value ${USERS.users['${tender_owner}'].lots_documents} ${empty_list}
164 172 Append to list ${lots_documents} ${data}
... ... @@ -177,7 +185,9 @@ Resource resource.robot
177 185 ${item}= Підготувати дані для створення предмету закупівлі ${USERS.users['${tender_owner}'].initial_data.data['items'][0]['classification']['id']}
178 186 Run As ${tender_owner} Додати предмет закупівлі в лот ${TENDER['TENDER_UAID']} ${lot_id} ${item}
179 187 ${item_id}= get_id_from_object ${item}
180   - ${item_data}= Create Dictionary item=${item} item_id=${item_id}
  188 + ${item_data}= Create Dictionary
  189 + ... item=${item}
  190 + ... item_id=${item_id}
181 191 ${item_data}= munch_dict arg=${item_data}
182 192 Set To Dictionary ${USERS.users['${tender_owner}']} item_data=${item_data}
183 193
... ... @@ -214,10 +224,15 @@ Resource resource.robot
214 224 ${item}= Підготувати дані для створення предмету закупівлі ${USERS.users['${tender_owner}'].initial_data.data['items'][0]['classification']['id']}
215 225 ${lot_resp}= Run As ${tender_owner} Створити лот із предметом закупівлі ${TENDER['TENDER_UAID']} ${lot} ${item}
216 226 ${item_id}= get_id_from_object ${item}
217   - ${item_data}= Create Dictionary item=${item} item_id=${item_id}
  227 + ${item_data}= Create Dictionary
  228 + ... item=${item}
  229 + ... item_id=${item_id}
218 230 ${item_data}= munch_dict arg=${item_data}
219 231 ${lot_id}= get_id_from_object ${lot.data}
220   - ${lot_data}= Create Dictionary lot=${lot} lot_resp=${lot_resp} lot_id=${lot_id}
  232 + ${lot_data}= Create Dictionary
  233 + ... lot=${lot}
  234 + ... lot_resp=${lot_resp}
  235 + ... lot_id=${lot_id}
221 236 ${lot_data}= munch_dict arg=${lot_data}
222 237 Set To Dictionary ${USERS.users['${tender_owner}']} item_data=${item_data} lot_data=${lot_data}
223 238
... ... @@ -286,7 +301,9 @@ Resource resource.robot
286 301 Set To Dictionary ${feature} featureOf=tenderer
287 302 Run As ${tender_owner} Додати неціновий показник на тендер ${TENDER['TENDER_UAID']} ${feature}
288 303 ${feature_id}= get_id_from_object ${feature}
289   - ${feature_data}= Create Dictionary feature=${feature} feature_id=${feature_id}
  304 + ${feature_data}= Create Dictionary
  305 + ... feature=${feature}
  306 + ... feature_id=${feature_id}
290 307 ${feature_data}= munch_dict arg=${feature_data}
291 308 Set To Dictionary ${USERS.users['${tender_owner}']} feature_data=${feature_data}
292 309
... ... @@ -297,7 +314,9 @@ Resource resource.robot
297 314 ${lot_id}= get_id_from_object ${USERS.users['${tender_owner}'].tender_data.data.lots[${lot_index}]}
298 315 Run As ${tender_owner} Додати неціновий показник на лот ${TENDER['TENDER_UAID']} ${feature} ${lot_id}
299 316 ${feature_id}= get_id_from_object ${feature}
300   - ${feature_data}= Create Dictionary feature=${feature} feature_id=${feature_id}
  317 + ${feature_data}= Create Dictionary
  318 + ... feature=${feature}
  319 + ... feature_id=${feature_id}
301 320 ${feature_data}= munch_dict arg=${feature_data}
302 321 Set To Dictionary ${USERS.users['${tender_owner}']} feature_data=${feature_data}
303 322
... ... @@ -308,7 +327,9 @@ Resource resource.robot
308 327 ${item_id}= get_id_from_object ${USERS.users['${tender_owner}'].tender_data.data['items'][${item_index}]}
309 328 Run As ${tender_owner} Додати неціновий показник на предмет ${TENDER['TENDER_UAID']} ${feature} ${item_id}
310 329 ${feature_id}= get_id_from_object ${feature}
311   - ${feature_data}= Create Dictionary feature=${feature} feature_id=${feature_id}
  330 + ${feature_data}= Create Dictionary
  331 + ... feature=${feature}
  332 + ... feature_id=${feature_id}
312 333 ${feature_data}= munch_dict arg=${feature_data}
313 334 Set To Dictionary ${USERS.users['${tender_owner}']} feature_data=${feature_data}
314 335
... ... @@ -361,7 +382,10 @@ Resource resource.robot
361 382 ${now}= Get Current TZdate
362 383 ${question.data.date}= Set variable ${now}
363 384 ${question_id}= get_id_from_object ${question.data}
364   - ${question_data}= Create Dictionary question=${question} question_resp=${question_resp} question_id=${question_id}
  385 + ${question_data}= Create Dictionary
  386 + ... question=${question}
  387 + ... question_resp=${question_resp}
  388 + ... question_id=${question_id}
365 389 ${question_data}= munch_dict arg=${question_data}
366 390 Set To Dictionary ${USERS.users['${username}']} tender_question_data=${question_data}
367 391
... ... @@ -373,7 +397,10 @@ Resource resource.robot
373 397 ${now}= Get Current TZdate
374 398 ${question.data.date}= Set variable ${now}
375 399 ${question_id}= get_id_from_object ${question.data}
376   - ${question_data}= Create Dictionary question=${question} question_resp=${question_resp} question_id=${question_id}
  400 + ${question_data}= Create Dictionary
  401 + ... question=${question}
  402 + ... question_resp=${question_resp}
  403 + ... question_id=${question_id}
377 404 ${question_data}= munch_dict arg=${question_data}
378 405 Set To Dictionary ${USERS.users['${username}']} lots_${lot_index}_question_data=${question_data}
379 406
... ... @@ -385,7 +412,10 @@ Resource resource.robot
385 412 ${now}= Get Current TZdate
386 413 ${question.data.date}= Set variable ${now}
387 414 ${question_id}= get_id_from_object ${question.data}
388   - ${question_data}= Create Dictionary question=${question} question_resp=${question_resp} question_id=${question_id}
  415 + ${question_data}= Create Dictionary
  416 + ... question=${question}
  417 + ... question_resp=${question_resp}
  418 + ... question_id=${question_id}
389 419 ${question_data}= munch_dict arg=${question_data}
390 420 Set To Dictionary ${USERS.users['${username}']} items_${item_index}_question_data=${question_data}
391 421
... ... @@ -454,7 +484,9 @@ Resource resource.robot
454 484 ... Створити чернетку вимоги про виправлення умов закупівлі
455 485 ... ${TENDER['TENDER_UAID']}
456 486 ... ${claim}
457   - ${claim_data}= Create Dictionary claim=${claim} complaintID=${complaintID}
  487 + ${claim_data}= Create Dictionary
  488 + ... claim=${claim}
  489 + ... complaintID=${complaintID}
458 490 ${claim_data}= munch_dict arg=${claim_data}
459 491 Set To Dictionary ${USERS.users['${provider}']} claim_data ${claim_data}
460 492
... ... @@ -467,7 +499,9 @@ Resource resource.robot
467 499 ... ${TENDER['TENDER_UAID']}
468 500 ... ${claim}
469 501 ... ${lot_id}
470   - ${claim_data}= Create Dictionary claim=${claim} complaintID=${complaintID}
  502 + ${claim_data}= Create Dictionary
  503 + ... claim=${claim}
  504 + ... complaintID=${complaintID}
471 505 ${claim_data}= munch_dict arg=${claim_data}
472 506 Set To Dictionary ${USERS.users['${provider}']} claim_data ${claim_data}
473 507
... ... @@ -479,7 +513,9 @@ Resource resource.robot
479 513 ... ${TENDER['TENDER_UAID']}
480 514 ... ${claim}
481 515 ... ${award_index}
482   - ${claim_data}= Create Dictionary claim=${claim} complaintID=${complaintID}
  516 + ${claim_data}= Create Dictionary
  517 + ... claim=${claim}
  518 + ... complaintID=${complaintID}
483 519 ${claim_data}= munch_dict arg=${claim_data}
484 520 Set To Dictionary ${USERS.users['${provider}']} claim_data ${claim_data}
485 521
... ... @@ -493,7 +529,12 @@ Resource resource.robot
493 529 ... ${claim}
494 530 ... ${file_path}
495 531 ${doc_id}= get_id_from_doc_name ${file_name}
496   - ${claim_data}= Create Dictionary claim=${claim} complaintID=${complaintID} doc_name=${file_name} doc_id=${doc_id} doc_content=${file_content}
  532 + ${claim_data}= Create Dictionary
  533 + ... claim=${claim}
  534 + ... complaintID=${complaintID}
  535 + ... doc_name=${file_name}
  536 + ... doc_id=${doc_id}
  537 + ... doc_content=${file_content}
497 538 ${claim_data}= munch_dict arg=${claim_data}
498 539 Set To Dictionary ${USERS.users['${provider}']} claim_data ${claim_data}
499 540 Remove File ${file_path}
... ... @@ -510,7 +551,12 @@ Resource resource.robot
510 551 ... ${lot_id}
511 552 ... ${file_path}
512 553 ${doc_id}= get_id_from_doc_name ${file_name}
513   - ${claim_data}= Create Dictionary claim=${claim} complaintID=${complaintID} doc_name=${file_name} doc_id=${doc_id} doc_content=${file_content}
  554 + ${claim_data}= Create Dictionary
  555 + ... claim=${claim}
  556 + ... complaintID=${complaintID}
  557 + ... doc_name=${file_name}
  558 + ... doc_id=${doc_id}
  559 + ... doc_content=${file_content}
514 560 ${claim_data}= munch_dict arg=${claim_data}
515 561 Set To Dictionary ${USERS.users['${provider}']} claim_data ${claim_data}
516 562 Remove File ${file_path}
... ... @@ -526,7 +572,12 @@ Resource resource.robot
526 572 ... ${award_index}
527 573 ... ${file_path}
528 574 ${doc_id}= get_id_from_doc_name ${file_name}
529   - ${claim_data}= Create Dictionary claim=${claim} complaintID=${complaintID} doc_name=${file_name} doc_id=${doc_id} doc_content=${file_content}
  575 + ${claim_data}= Create Dictionary
  576 + ... claim=${claim}
  577 + ... complaintID=${complaintID}
  578 + ... doc_name=${file_name}
  579 + ... doc_id=${doc_id}
  580 + ... doc_content=${file_content}
530 581 ${claim_data}= munch_dict arg=${claim_data}
531 582 Set To Dictionary ${USERS.users['${provider}']} claim_data ${claim_data}
532 583 Remove File ${file_path}
... ... @@ -534,7 +585,9 @@ Resource resource.robot
534 585
535 586 Можливість скасувати вимогу про виправлення умов закупівлі
536 587 ${cancellation_reason}= create_fake_sentence
537   - ${data}= Create Dictionary status=cancelled cancellationReason=${cancellation_reason}
  588 + ${data}= Create Dictionary
  589 + ... status=cancelled
  590 + ... cancellationReason=${cancellation_reason}
538 591 ${cancellation_data}= Create Dictionary data=${data}
539 592 ${cancellation_data}= munch_dict arg=${cancellation_data}
540 593 Run As ${provider}
... ... @@ -555,7 +608,9 @@ Resource resource.robot
555 608
556 609 Можливість скасувати вимогу про виправлення умов лоту
557 610 ${cancellation_reason}= create_fake_sentence
558   - ${data}= Create Dictionary status=cancelled cancellationReason=${cancellation_reason}
  611 + ${data}= Create Dictionary
  612 + ... status=cancelled
  613 + ... cancellationReason=${cancellation_reason}
559 614 ${cancellation_data}= Create Dictionary data=${data}
560 615 ${cancellation_data}= munch_dict arg=${cancellation_data}
561 616 Run As ${provider}
... ... @@ -577,7 +632,9 @@ Resource resource.robot
577 632 Можливість скасувати вимогу про виправлення визначення ${award_index} переможця
578 633 ${cancellation_reason}= create_fake_sentence
579 634 ${status}= Set variable if 'open' in '${MODE}' stopping cancelled
580   - ${data}= Create Dictionary status=${status} cancellationReason=${cancellation_reason}
  635 + ${data}= Create Dictionary
  636 + ... status=${status}
  637 + ... cancellationReason=${cancellation_reason}
581 638 ${cancellation_data}= Create Dictionary data=${data}
582 639 ${cancellation_data}= munch_dict arg=${cancellation_data}
583 640 Run As ${provider}
... ... @@ -600,7 +657,9 @@ Resource resource.robot
600 657
601 658
602 659 Можливість перетворити вимогу про виправлення умов закупівлі в скаргу
603   - ${data}= Create Dictionary status=pending satisfied=${False}
  660 + ${data}= Create Dictionary
  661 + ... status=pending
  662 + ... satisfied=${False}
604 663 ${escalation_data}= Create Dictionary data=${data}
605 664 ${escalation_data}= munch_dict arg=${escalation_data}
606 665 Run As ${provider}
... ... @@ -620,7 +679,9 @@ Resource resource.robot
620 679
621 680
622 681 Можливість перетворити вимогу про виправлення умов лоту в скаргу
623   - ${data}= Create Dictionary status=pending satisfied=${False}
  682 + ${data}= Create Dictionary
  683 + ... status=pending
  684 + ... satisfied=${False}
624 685 ${escalation_data}= Create Dictionary data=${data}
625 686 ${escalation_data}= munch_dict arg=${escalation_data}
626 687 Run As ${provider}
... ... @@ -640,7 +701,9 @@ Resource resource.robot
640 701
641 702
642 703 Можливість перетворити вимогу про виправлення визначення ${award_index} переможця в скаргу
643   - ${data}= Create Dictionary status=pending satisfied=${False}
  704 + ${data}= Create Dictionary
  705 + ... status=pending
  706 + ... satisfied=${False}
644 707 ${escalation_data}= Create Dictionary data=${data}
645 708 ${escalation_data}= munch_dict arg=${escalation_data}
646 709 Run As ${provider}
... ... @@ -746,7 +809,9 @@ Resource resource.robot
746 809
747 810
748 811 Можливість підтвердити задоволення вимоги про виправлення умов закупівлі
749   - ${data}= Create Dictionary status=resolved satisfied=${True}
  812 + ${data}= Create Dictionary
  813 + ... status=resolved
  814 + ... satisfied=${True}
750 815 ${confirmation_data}= Create Dictionary data=${data}
751 816 ${confirmation_data}= munch_dict arg=${confirmation_data}
752 817 Run As ${provider}
... ... @@ -766,7 +831,9 @@ Resource resource.robot
766 831
767 832
768 833 Можливість підтвердити задоволення вимоги про виправлення умов лоту
769   - ${data}= Create Dictionary status=resolved satisfied=${True}
  834 + ${data}= Create Dictionary
  835 + ... status=resolved
  836 + ... satisfied=${True}
770 837 ${confirmation_data}= Create Dictionary data=${data}
771 838 ${confirmation_data}= munch_dict arg=${confirmation_data}
772 839 Run As ${provider}
... ... @@ -786,7 +853,9 @@ Resource resource.robot
786 853
787 854
788 855 Можливість підтвердити задоволення вимоги про виправлення визначення ${award_index} переможця
789   - ${data}= Create Dictionary status=resolved satisfied=${True}
  856 + ${data}= Create Dictionary
  857 + ... status=resolved
  858 + ... satisfied=${True}
790 859 ${confirmation_data}= Create Dictionary data=${data}
791 860 ${confirmation_data}= munch_dict arg=${confirmation_data}
792 861 Run As ${provider}
... ...
... ... @@ -231,7 +231,10 @@ Library openprocurement_client_helper.py
231 231 [Arguments] ${username} ${tender_uaid} ${lot_id} ${cancellation_reason} ${document} ${new_description}
232 232 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
233 233 ${lot_id}= Get Variable Value ${tender.data.lots[${lot_index}].id}
234   - ${data}= Create dictionary reason=${cancellation_reason} cancellationOf=lot relatedLot=${lot_id}
  234 + ${data}= Create dictionary
  235 + ... reason=${cancellation_reason}
  236 + ... cancellationOf=lot
  237 + ... relatedLot=${lot_id}
235 238 ${cancellation_data}= Create dictionary data=${data}
236 239 ${cancellation_data}= munch_dict arg=${cancellation_data}
237 240 ${cancel_reply}= Call Method ${USERS.users['${username}'].client} create_cancellation ${tender} ${cancellation_data}
... ... @@ -741,7 +744,9 @@ Library openprocurement_client_helper.py
741 744 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
742 745 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].bidresponses['resp'].access.token}
743 746 ${response}= Call Method ${USERS.users['${username}'].client} upload_bid_document ${path} ${tender} ${bid_id} ${doc_type}
744   - ${uploaded_file} = Create Dictionary filepath=${path} upload_response=${response}
  747 + ${uploaded_file} = Create Dictionary
  748 + ... filepath=${path}
  749 + ... upload_response=${response}
745 750 Log object data ${uploaded_file}
746 751 [return] ${uploaded_file}
747 752
... ... @@ -752,7 +757,9 @@ Library openprocurement_client_helper.py
752 757 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
753 758 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].bidresponses['resp'].access.token}
754 759 ${response}= Call Method ${USERS.users['${username}'].client} update_bid_document ${path} ${tender} ${bid_id} ${docid}
755   - ${uploaded_file} = Create Dictionary filepath=${path} upload_response=${response}
  760 + ${uploaded_file} = Create Dictionary
  761 + ... filepath=${path}
  762 + ... upload_response=${response}
756 763 Log object data ${uploaded_file}
757 764 [return] ${uploaded_file}
758 765
... ...
... ... @@ -183,7 +183,10 @@ Get Broker Property By Username
183 183 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact.yaml
184 184 ${ARTIFACT}= load_data_from ${file_path}
185 185 Run Keyword And Ignore Error Set To Dictionary ${USERS.users['${tender_owner}']} access_token=${ARTIFACT.access_token}
186   - ${TENDER}= Create Dictionary TENDER_UAID=${ARTIFACT.tender_uaid} LAST_MODIFICATION_DATE=${ARTIFACT.last_modification_date} LOT_ID=${Empty}
  186 + ${TENDER}= Create Dictionary
  187 + ... TENDER_UAID=${ARTIFACT.tender_uaid}
  188 + ... LAST_MODIFICATION_DATE=${ARTIFACT.last_modification_date}
  189 + ... LOT_ID=${Empty}
187 190 ${lot_index}= Get Variable Value ${lot_index} 0
188 191 Run Keyword And Ignore Error Set To Dictionary ${TENDER} LOT_ID=${ARTIFACT.lots[${lot_index}]}
189 192 ${MODE}= Get Variable Value ${MODE} ${ARTIFACT.mode}
... ... @@ -273,7 +276,10 @@ Get Broker Property By Username
273 276 ... doc_content=${file_content}
274 277 ... doc_id=${doc_id}
275 278 ${new_description}= create_fake_sentence
276   - ${cancellation_data}= Create Dictionary cancellation_reason=${cancellation_reason} document=${document} description=${new_description}
  279 + ${cancellation_data}= Create Dictionary
  280 + ... cancellation_reason=${cancellation_reason}
  281 + ... document=${document}
  282 + ... description=${new_description}
277 283 ${cancellation_data}= munchify ${cancellation_data}
278 284 Set To Dictionary ${USERS.users['${username}']} cancellation_data=${cancellation_data}
279 285 [Return] ${cancellation_data}
... ...
Please register or login to post a comment