Commit 9f817596eeca02be3f5bcde60802c4e23e6330df
1 parent
c54a94b5
added verification to prevent 'None == None' situation
Showing
1 changed file
with
10 additions
and
1 deletions
| @@ -56,6 +56,9 @@ TestSuiteSetup | @@ -56,6 +56,9 @@ TestSuiteSetup | ||
| 56 | Set Global Variable ${REPLIES} | 56 | Set Global Variable ${REPLIES} |
| 57 | ${INITIAL_TENDER_DATA}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} ${mode} | 57 | ${INITIAL_TENDER_DATA}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} ${mode} |
| 58 | Set Global Variable ${INITIAL_TENDER_DATA} | 58 | Set Global Variable ${INITIAL_TENDER_DATA} |
| 59 | + ${TENDER}= Create Dictionary | ||
| 60 | + Set Global Variable ${TENDER} | ||
| 61 | + Log ${TENDER} | ||
| 59 | Log ${INITIAL_TENDER_DATA} | 62 | Log ${INITIAL_TENDER_DATA} |
| 60 | 63 | ||
| 61 | Завантажуємо бібліотеку з реалізацією ${keywords_file} площадки | 64 | Завантажуємо бібліотеку з реалізацією ${keywords_file} площадки |
| @@ -71,7 +74,7 @@ TestSuiteSetup | @@ -71,7 +74,7 @@ TestSuiteSetup | ||
| 71 | ... ${ARGUMENTS[2]} == id | 74 | ... ${ARGUMENTS[2]} == id |
| 72 | 75 | ||
| 73 | ${now}= Get Current Date | 76 | ${now}= Get Current Date |
| 74 | - ${delta}= Subtract Date From Date ${now} ${LAST_MODIFICATION_DATE} | 77 | + ${delta}= Subtract Date From Date ${now} ${TENDER['LAST_MODIFICATION_DATE']} |
| 75 | ${wait_timout}= Subtract Time From Time ${BROKERS['${USERS.users['${username}'].broker}'].timout_on_wait} ${delta} | 78 | ${wait_timout}= Subtract Time From Time ${BROKERS['${USERS.users['${username}'].broker}'].timout_on_wait} ${delta} |
| 76 | Run Keyword If ${wait_timout}>0 Sleep ${wait_timout} | 79 | Run Keyword If ${wait_timout}>0 Sleep ${wait_timout} |
| 77 | 80 | ||
| @@ -83,23 +86,29 @@ TestSuiteSetup | @@ -83,23 +86,29 @@ TestSuiteSetup | ||
| 83 | Звірити поле | 86 | Звірити поле |
| 84 | [Arguments] ${username} ${field} ${subject} | 87 | [Arguments] ${username} ${field} ${subject} |
| 85 | ${field_response}= Викликати для учасника ${username} отримати інформацію із тендера ${field} | 88 | ${field_response}= Викликати для учасника ${username} отримати інформацію із тендера ${field} |
| 89 | + Should Not Be Equal ${field_response} ${None} | ||
| 86 | Should Be Equal ${subject} ${field_response} Майданчик ${USERS.users['${username}'].broker} | 90 | Should Be Equal ${subject} ${field_response} Майданчик ${USERS.users['${username}'].broker} |
| 87 | 91 | ||
| 88 | Звірити поле створеного тендера | 92 | Звірити поле створеного тендера |
| 89 | [Arguments] ${initial} ${tender_data} ${field} | 93 | [Arguments] ${initial} ${tender_data} ${field} |
| 90 | ${field_value}= Get_From_Object ${initial} ${field} | 94 | ${field_value}= Get_From_Object ${initial} ${field} |
| 91 | ${field_response}= Get_From_Object ${tender_data} ${field} | 95 | ${field_response}= Get_From_Object ${tender_data} ${field} |
| 96 | + Should Not Be Equal ${field_response} ${None} | ||
| 97 | + Should Not Be Equal ${field_value} ${None} | ||
| 92 | Should Be Equal ${field_value} ${field_response} | 98 | Should Be Equal ${field_value} ${field_response} |
| 93 | 99 | ||
| 94 | Звірити дату тендера | 100 | Звірити дату тендера |
| 95 | [Arguments] ${username} ${field} | 101 | [Arguments] ${username} ${field} |
| 96 | ${isodate}= Get_From_Object ${INITIAL_TENDER_DATA.data} ${field} | 102 | ${isodate}= Get_From_Object ${INITIAL_TENDER_DATA.data} ${field} |
| 103 | + Should Not Be Equal ${isodate} ${None} | ||
| 97 | Звірити дату ${username} ${field} ${isodate} | 104 | Звірити дату ${username} ${field} ${isodate} |
| 98 | 105 | ||
| 99 | Звірити дату | 106 | Звірити дату |
| 100 | [Arguments] ${username} ${field} ${subject} | 107 | [Arguments] ${username} ${field} ${subject} |
| 101 | ${field_date}= Викликати для учасника ${username} отримати інформацію із тендера ${field} | 108 | ${field_date}= Викликати для учасника ${username} отримати інформацію із тендера ${field} |
| 102 | ${returned}= compare_date ${subject} ${field_date} | 109 | ${returned}= compare_date ${subject} ${field_date} |
| 110 | + Should Not Be Equal ${field_date} ${None} | ||
| 111 | + Should Not Be Equal ${returned} ${None} | ||
| 103 | Should Be True '${returned}' == 'True' | 112 | Should Be True '${returned}' == 'True' |
| 104 | 113 | ||
| 105 | Звірити поля предметів закупівлі багатопредметного тендера | 114 | Звірити поля предметів закупівлі багатопредметного тендера |
Please
register
or
login
to post a comment