Made code look nicer: openprocurement_client.robot

mykhaly
1 parent ae96a02e
Showing 1 changed file with 61 additions and 38 deletions
op_robot_tests/tests_files/brokers/openprocurement_client.robot
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @28832b9
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @28832b9
 *** Settings ***
 Library  openprocurement_client_helper.py
+
 *** Keywords ***
 Отримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
@@ -19,6 +20,7 @@ Library  openprocurement_client_helper.py
   Dictionary Should Contain Key  ${ID_MAP}  ${ARGUMENTS[1]}
   Run Keyword And Return  Get From Dictionary  ${ID_MAP}  ${ARGUMENTS[1]}
+
 Підготувати клієнт для користувача
   [Arguments]  @{ARGUMENTS}
   [Documentation]  Відкрити браузер, створити об’єкт api wrapper, тощо
@@ -28,10 +30,12 @@ Library  openprocurement_client_helper.py
   Set Suite Variable  ${ID_MAP}
   Log Variables
+
 Підготувати дані для оголошення тендера
   ${INITIAL_TENDER_DATA}=  prepare_test_tender_data
   [return]   ${INITIAL_TENDER_DATA}
+
 Створити тендер
   [Arguments]  @{ARGUMENTS}
   ${TENDER_DATA}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  create_tender  ${ARGUMENTS[1]}
@@ -44,6 +48,7 @@ Library  openprocurement_client_helper.py
   Log   ${USERS.users['${ARGUMENTS[0]}'].TENDER_DATA}
   [return]  ${TENDER_DATA.data.tenderID}
+
 Пошук тендера по ідентифікатору
   [Arguments]  @{ARGUMENTS}
   [Documentation]
@@ -54,12 +59,15 @@ Library  openprocurement_client_helper.py
   Set To Dictionary  ${USERS.users['${ARGUMENTS[0]}']}   tender_data   ${tender_data}
   [return]   ${tender_data}
+
 Оновити сторінку з тендером
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tenderId
-  openprocurement_client.Пошук тендера по ідентифікатору    @{ARGUMENTS}
+  ${tender_data}=  openprocurement_client.Пошук тендера по ідентифікатору    @{ARGUMENTS}
+  Log  ${tender_data}
+
 Отримати інформацію із тендера
   [Arguments]  @{ARGUMENTS}
@@ -71,6 +79,7 @@ Library  openprocurement_client_helper.py
   Log  ${field_value}
   [return]  ${field_value}
+
 Внести зміни в тендер
   [Arguments]  @{ARGUMENTS}
   [Documentation]
@@ -85,6 +94,7 @@ Library  openprocurement_client_helper.py
   ${TENDER_DATA}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  patch_tender  ${TENDER_DATA}
   Set Global Variable  ${TENDER_DATA}
+
 Отримати тендер
   [Arguments]  @{ARGUMENTS}
   [Documentation]
@@ -95,6 +105,7 @@ Library  openprocurement_client_helper.py
   ${TENDER_DATA}=  set_access_key  ${TENDER_DATA}  ${USERS.users['${ARGUMENTS[0]}'].access_token}
   Set Global Variable  ${TENDER_DATA}
+
 Відняти предмети закупівлі
   [Arguments]  @{ARGUMENTS}
   [Documentation]
@@ -112,6 +123,7 @@ Library  openprocurement_client_helper.py
   ${TENDER_DATA}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  patch_tender  ${TENDER_DATA}
   ${TENDER_DATA}=  set_access_key  ${TENDER_DATA}  ${USERS.users['${ARGUMENTS[0]}'].access_token}
+
 Додати предмети закупівлі
   [Arguments]  @{ARGUMENTS}
   [Documentation]
@@ -130,19 +142,21 @@ Library  openprocurement_client_helper.py
   ${TENDER_DATA}=  set_access_key  ${TENDER_DATA}  ${USERS.users['${ARGUMENTS[0]}'].access_token}
   ${TENDER_DATA}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  patch_tender  ${TENDER_DATA}
+
 Задати питання
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_uid
   ...      ${ARGUMENTS[2]} ==  question
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
-  log   ${USERS.users['${ARGUMENTS[0]}']}
+  Log   ${USERS.users['${ARGUMENTS[0]}']}
   ${biddingresponse}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  create_question  ${tender}  ${ARGUMENTS[2]}
   [return]  ${biddingresponse}
+
 Відповісти на питання
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
@@ -150,23 +164,24 @@ Library  openprocurement_client_helper.py
   ...      ${ARGUMENTS[2]} ==  question_id
   ...      ${ARGUMENTS[3]} ==  answer_data
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
-  log many     ${USERS.users['${ARGUMENTS[0]}']}
+  Log many     ${USERS.users['${ARGUMENTS[0]}']}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${ARGUMENTS[0]}'].access_token}
   ${ARGUMENTS[3].data.id}=  Set Variable   ${tender.data.questions[${ARGUMENTS[2]}].id}
   ${question_with_answer}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  patch_question  ${tender}  ${ARGUMENTS[3]}
-  log many   ${USERS.users['${ARGUMENTS[0]}'].client}  ${tender}  ${ARGUMENTS[3]}
+  Log many   ${USERS.users['${ARGUMENTS[0]}'].client}  ${tender}  ${ARGUMENTS[3]}
   Log object data   ${question_with_answer}  question_with_answer
+
 Подати скаргу
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_uid
   ...      ${ARGUMENTS[2]} ==  complaint
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
   ${complaint}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  _create_tender_resource_item  ${tender}  ${ARGUMENTS[2]}   complaints
@@ -174,23 +189,25 @@ Library  openprocurement_client_helper.py
   Set To Dictionary  ${USERS.users['${ARGUMENTS[0]}']}   access_token   ${access_token}
   Log object data   ${complaint}  complaint
+
 Порівняти скаргу
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_uid
   ...      ${ARGUMENTS[2]} ==  complaint
   [Arguments]  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
   ${complaint}=   Get Variable Value  ${tender.data.complaints[0]}
-  log   ${complaint}
-  log   ${ARGUMENTS[2]}
+  Log   ${complaint}
   #TODO: COMPARE
   #Dictionary Should Contain Sub Dictionary   ${complaint}   ${ARGUMENTS[2].data}
   #:FOR  ${element}  IN  ${ARGUMENTS[2].data}
-  #\  log  ${element}
+  #\  Log  ${element}
   #\  Dictionary Should Contain Value  ${complaint}  ${element}
+
 Обробити скаргу
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
@@ -198,28 +215,30 @@ Library  openprocurement_client_helper.py
   ...      ${ARGUMENTS[2]} ==  question_id
   ...      ${ARGUMENTS[3]} ==  answer_data
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${ARGUMENTS[0]}'].access_token}
   ${ARGUMENTS[3].data.id}=  Set Variable   ${tender.data.complaints[${ARGUMENTS[2]}].id}
   ${complaint_with_answer}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  _patch_tender_resource_item  ${tender}  ${ARGUMENTS[3]}  complaints
-  log many   ${USERS.users['${ARGUMENTS[0]}'].client}  ${tender}  ${ARGUMENTS[3]}
+  Log many   ${USERS.users['${ARGUMENTS[0]}'].client}  ${tender}  ${ARGUMENTS[3]}
   Log object data   ${complaint_with_answer}  complaint_with_answer
+
 Подати цінову пропозицію
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_uid
   ...      ${ARGUMENTS[2]} ==  bid
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
-  log  ${tender}Отримати
+  Log  ${tender}
   ${biddingresponse}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  create_bid  ${tender}  ${ARGUMENTS[2]}
   [return]  ${biddingresponse}
+
 Змінити цінову пропозицію
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
@@ -232,20 +251,22 @@ Library  openprocurement_client_helper.py
   Log  ${changed_bid}
   [return]   ${changed_bid}
+
 Скасувати цінову пропозицію
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_uid
   ...      ${ARGUMENTS[2]} ==  bid
   [Arguments]  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
-  log   ${tender}
-  log   ${ARGUMENTS[2]}Отримати
+  Log   ${tender}
   ${changed_bid}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  delete_bid   ${tender}  ${ARGUMENTS[2]}
   Log  ${changed_bid}
   [return]   ${changed_bid}
+
 Прийняти цінову пропозицію
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
@@ -259,25 +280,25 @@ Library  openprocurement_client_helper.py
   Log  ${award_activeted_response}
   [return]  ${award_activeted_response}
+
 Завантажити документ в ставку
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  path
   ...      ${ARGUMENTS[2]} ==  tenderid
   [Arguments]  @{ARGUMENTS}
-  log  ${ARGUMENTS[0]}
-  log  ${ARGUMENTS[1]}
-  log  ${ARGUMENTS[2]}
+  Log many  @{ARGUMENTS}
   ${bid_id}=  Get Variable Value   ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].data.id}
   ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[2]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].access.token}
   ${response}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  upload_bid_document  ${ARGUMENTS[1]}  ${tender}  ${bid_id}
   ${uploaded_file} =  Create Dictionary   filepath  ${ARGUMENTS[1]}   upload_response  ${response}
-  log  ${response}
+  Log  ${response}
   Log object data   ${uploaded_file}
   [return]  ${uploaded_file}
+
 Змінити документ в ставці
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
@@ -285,27 +306,24 @@ Library  openprocurement_client_helper.py
   ...      ${ARGUMENTS[2]} ==  bidid
   ...      ${ARGUMENTS[3]} ==  docid
   [Arguments]  @{ARGUMENTS}
-  log  ${ARGUMENTS[0]}
-  log  ${ARGUMENTS[1]}
-  log  ${ARGUMENTS[2]}
-  ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${TENDER['TENDER_UAID']}
+  Log many  @{ARGUMENTS}
+  ${internalid}=  Отримати internal id по UAid  ${ARGUMENTS[0]}  ${TENDER['TENDER['TENDER_UAID']']}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].access.token}
   ${response}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  update_bid_document  ${ARGUMENTS[1]}  ${tender}   ${ARGUMENTS[2]}   ${ARGUMENTS[3]}
   ${uploaded_file} =  Create Dictionary   filepath  ${ARGUMENTS[1]}   upload_response  ${response}
-  log  ${response}
+  Log  ${response}
   Log object data   ${uploaded_file}
   [return]  ${uploaded_file}
+
 Завантажити документ
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  filepath
-  ...      ${ARGUMENTS[2]} ==  tenderUAID
+  ...      ${ARGUMENTS[2]} ==  TENDER['TENDER_UAID']
   [Arguments]  @{ARGUMENTS}
-  log  ${ARGUMENTS[0]}
-  log  ${ARGUMENTS[1]}
-  log  ${ARGUMENTS[2]}
+  Log many  @{ARGUMENTS}
   ${tenderID}=  openprocurement_client.Отримати internal id по UAid  ${ARGUMENTS[0]}   ${ARGUMENTS[2]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${tenderID}
   ${tender}=  set_access_key  ${tender}   ${USERS.users['${ARGUMENTS[0]}'].access_token}
@@ -313,17 +331,20 @@ Library  openprocurement_client_helper.py
   Log object data   ${reply}  reply
   [return]   ${reply}
+
 Отримати посилання на аукціон для глядача
   [Arguments]  ${username}  ${tender_uid}
   ${internalid}=  Отримати internal id по UAid  ${username}  ${tender_uid}
   ${tender}=  Call Method  ${USERS.users['${username}'].client}  get_tender  ${internalid}
   [return]  ${tender.data.auctionUrl}
+
 Отримати посилання на аукціон для учасника
   [Arguments]  ${username}  ${tender_uid}
   ${bid}=  Викликати для учасника  ${username}  Отримати пропозицію  ${tender_uid}
   [return]  ${bid.data.participationUrl}
+
 Отримати пропозицію
   [Arguments]  ${username}  ${tender_uid}
   ${internalid}=  Отримати internal id по UAid  ${username}  ${tender_uid}
@@ -333,20 +354,19 @@ Library  openprocurement_client_helper.py
   ${bid}=  Call Method  ${USERS.users['${username}'].client}  get_bid  ${tender}  ${bid_id}  ${token}
   [return]  ${bid}
+
 Отримати документ
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  tenderUaID
+  ...      ${ARGUMENTS[1]} ==  TENDER['TENDER_UAID']
   ...      ${ARGUMENTS[2]} ==  url
   [Arguments]  @{ARGUMENTS}
-  log  ${ARGUMENTS[0]}
-  log  ${ARGUMENTS[1]}
-  log  ${ARGUMENTS[2]}
+  Log many  @{ARGUMENTS}
   ${tenderID}=  openprocurement_client.Отримати internal id по UAid  ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${tenderID}
   ${token}=    Get Variable Value  ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].access.token}
   ${contents}  ${filename}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_file   ${tender}   ${ARGUMENTS[2]}   ${token}
-  log   ${filename}
+  Log   ${filename}
   [return]   ${contents}  ${filename}
@@ -356,24 +376,26 @@ Library  openprocurement_client_helper.py
   ...      ${ARGUMENTS[1]} ==  tender
   ...      ${ARGUMENTS[2]} ==  lot
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${tender}=  set_access_key  ${ARGUMENTS[1]}  ${USERS.users['${ARGUMENTS[0]}'].access_token}
   ${tender_lot}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}   create_lot   ${tender}    ${ARGUMENTS[2]}
   Log   ${tender_lot}
   [return]  ${tender_lot}
+
 Змінити лот
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender
   ...      ${ARGUMENTS[2]} ==  lot
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${tender}=  set_access_key  ${ARGUMENTS[1]}   ${USERS.users['${ARGUMENTS[0]}'].access_token}
   ${tender_lot}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}   patch_lot   ${tender}    ${ARGUMENTS[2]}
   Log   ${tender_lot}
   [return]  ${tender_lot}
+
 Завантажити документ в лот
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
@@ -381,7 +403,7 @@ Library  openprocurement_client_helper.py
   ...      ${ARGUMENTS[2]} ==  tenderUAID
   ...      ${ARGUMENTS[3]} ==  lot_id
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${tenderID}=  openprocurement_client.Отримати internal id по UAid  ${ARGUMENTS[0]}   ${ARGUMENTS[2]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${tenderID}
   ${tender}=  set_access_key  ${tender}   ${USERS.users['${ARGUMENTS[0]}'].access_token}
@@ -391,13 +413,14 @@ Library  openprocurement_client_helper.py
   Log object data   ${reply}  reply
   [return]   ${reply}
+
 Видалити лот
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender
   ...      ${ARGUMENTS[2]} ==  lot
   [Arguments]  @{ARGUMENTS}
-  log many  @{ARGUMENTS}
+  Log many  @{ARGUMENTS}
   ${tender}=  set_access_key  ${ARGUMENTS[1]}   ${USERS.users['${ARGUMENTS[0]}'].access_token}
   ${tender_lot}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}   delete_lot   ${tender}   ${ARGUMENTS[2]}
   Log   ${tender_lot}