Showing
4 changed files
with
17 additions
and
3 deletions
| @@ -33,6 +33,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | @@ -33,6 +33,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | ||
| 33 | ... gmdn_index=${${GMDN_INDEX}} | 33 | ... gmdn_index=${${GMDN_INDEX}} |
| 34 | ... plan_tender=${${PLAN_TENDER}} | 34 | ... plan_tender=${${PLAN_TENDER}} |
| 35 | ... article_17=${${ARTICLE_17}} | 35 | ... article_17=${${ARTICLE_17}} |
| 36 | + ... criteria_guarantee=${${CRITERIA_GUARANTEE}} | ||
| 36 | ${DIALOGUE_TYPE}= Get Variable Value ${DIALOGUE_TYPE} | 37 | ${DIALOGUE_TYPE}= Get Variable Value ${DIALOGUE_TYPE} |
| 37 | ${FUNDING_KIND}= Get Variable Value ${FUNDING_KIND} | 38 | ${FUNDING_KIND}= Get Variable Value ${FUNDING_KIND} |
| 38 | Run keyword if '${DIALOGUE_TYPE}' != '${None}' Set to dictionary ${tender_parameters} dialogue_type=${DIALOGUE_TYPE} | 39 | Run keyword if '${DIALOGUE_TYPE}' != '${None}' Set to dictionary ${tender_parameters} dialogue_type=${DIALOGUE_TYPE} |
| @@ -44,11 +45,10 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | @@ -44,11 +45,10 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status | ||
| 44 | Log ${plan_data} | 45 | Log ${plan_data} |
| 45 | ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data} | 46 | ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data} |
| 46 | ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} | 47 | ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} |
| 47 | - ${article_17_data}= Run keyword If ${ARTICLE_17} == True Підготувати дані по критеріям статті 17 | ||
| 48 | ${TENDER_UAID}= Run keyword If ${ARTICLE_17} == True Run As ${tender_owner} Створити тендер з критеріями | 48 | ${TENDER_UAID}= Run keyword If ${ARTICLE_17} == True Run As ${tender_owner} Створити тендер з критеріями |
| 49 | ... ${adapted_data} | 49 | ... ${adapted_data} |
| 50 | ... ${ARTIFACT.tender_uaid} | 50 | ... ${ARTIFACT.tender_uaid} |
| 51 | - ... ${article_17_data} | 51 | + ... ${CRITERIA_GUARANTEE} |
| 52 | ... ELSE Run As ${tender_owner} Створити тендер | 52 | ... ELSE Run As ${tender_owner} Створити тендер |
| 53 | ... ${adapted_data} | 53 | ... ${adapted_data} |
| 54 | ... ${ARTIFACT.tender_uaid} | 54 | ... ${ARTIFACT.tender_uaid} |
| @@ -253,7 +253,7 @@ Library Collections | @@ -253,7 +253,7 @@ Library Collections | ||
| 253 | 253 | ||
| 254 | 254 | ||
| 255 | Створити тендер з критеріями | 255 | Створити тендер з критеріями |
| 256 | - [Arguments] ${username} ${tender_data} ${plan_uaid} ${article_17_data} | 256 | + [Arguments] ${username} ${tender_data} ${plan_uaid} ${CRITERIA_GUARANTEE} #${article_17_data} |
| 257 | ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml | 257 | ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml |
| 258 | ${ARTIFACT}= load_data_from ${file_path} | 258 | ${ARTIFACT}= load_data_from ${file_path} |
| 259 | Log ${ARTIFACT.tender_owner_access_token} | 259 | Log ${ARTIFACT.tender_owner_access_token} |
| @@ -264,10 +264,17 @@ Library Collections | @@ -264,10 +264,17 @@ Library Collections | ||
| 264 | ... access_token=${ARTIFACT.tender_owner_access_token} | 264 | ... access_token=${ARTIFACT.tender_owner_access_token} |
| 265 | Log ${tender} | 265 | Log ${tender} |
| 266 | ${access_token}= Get Variable Value ${tender.access.token} | 266 | ${access_token}= Get Variable Value ${tender.access.token} |
| 267 | + ${article_17_data}= Підготувати дані по критеріям статті 17 | ||
| 267 | ${tender_criteria}= Call Method ${USERS.users['${username}'].client} create_criteria | 268 | ${tender_criteria}= Call Method ${USERS.users['${username}'].client} create_criteria |
| 268 | ... ${tender.data.id} | 269 | ... ${tender.data.id} |
| 269 | ... ${article_17_data} | 270 | ... ${article_17_data} |
| 270 | ... access_token=${tender.access.token} | 271 | ... access_token=${tender.access.token} |
| 272 | + Log ${CRITERIA_GUARANTEE} | ||
| 273 | + ${criteria_guarantee_data}= Run keyword If ${CRITERIA_GUARANTEE} == True Підготувати дані по критеріям гарантії | ||
| 274 | + ${tender_criteria_guarantee}= Run keyword If ${CRITERIA_GUARANTEE} == True Call Method ${USERS.users['${username}'].client} create_criteria | ||
| 275 | + ... ${tender.data.id} | ||
| 276 | + ... ${criteria_guarantee_data} | ||
| 277 | + ... access_token=${tender.access.token} | ||
| 271 | ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY} | 278 | ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY} |
| 272 | ${status}= Set Variable If 'below' in '${MODE}' active.enquiries ${status} | 279 | ${status}= Set Variable If 'below' in '${MODE}' active.enquiries ${status} |
| 273 | ${status}= Set Variable If 'selection' in '${MODE}' draft.pending ${status} | 280 | ${status}= Set Variable If 'selection' in '${MODE}' draft.pending ${status} |
| @@ -456,6 +456,12 @@ Get Broker Property By Username | @@ -456,6 +456,12 @@ Get Broker Property By Username | ||
| 456 | [Return] ${article_17_data} | 456 | [Return] ${article_17_data} |
| 457 | 457 | ||
| 458 | 458 | ||
| 459 | +Підготувати дані по критеріям гарантії | ||
| 460 | + ${criteria_guarantee_data}= test_criteria_guarantee_data | ||
| 461 | + Log ${criteria_guarantee_data} | ||
| 462 | + [Return] ${criteria_guarantee_data} | ||
| 463 | + | ||
| 464 | + | ||
| 459 | Підготувати дані для відповіді на критерії в пропозиції | 465 | Підготувати дані для відповіді на критерії в пропозиції |
| 460 | [Arguments] ${username} ${tender_data} ${bid_data} ${bid_data_document} | 466 | [Arguments] ${username} ${tender_data} ${bid_data} ${bid_data_document} |
| 461 | @{criteria}= get_from_object ${tender_data.data} criteria | 467 | @{criteria}= get_from_object ${tender_data.data} criteria |
| @@ -25,6 +25,7 @@ ${BID_AMOUNT_1} ${500} | @@ -25,6 +25,7 @@ ${BID_AMOUNT_1} ${500} | ||
| 25 | ${BID_AMOUNT_2} ${1000} | 25 | ${BID_AMOUNT_2} ${1000} |
| 26 | ${BID_AMOUNT_3} ${1100} | 26 | ${BID_AMOUNT_3} ${1100} |
| 27 | ${ARTICLE_17} ${False} | 27 | ${ARTICLE_17} ${False} |
| 28 | +${CRITERIA_GUARANTEE} ${False} | ||
| 28 | 29 | ||
| 29 | *** Test Cases *** | 30 | *** Test Cases *** |
| 30 | Можливість оголосити тендер | 31 | Можливість оголосити тендер |
Please
register
or
login
to post a comment