Commit 34fdd30567e9126ef1efc52c4ddd2afc661a8ada

Authored by Andrew Leitsius
Committed by mykhaly
1 parent 9c712cb9

Update work with ids (#199)

... ... @@ -369,7 +369,7 @@ Get Broker Property By Username
369 369
370 370
371 371 Звірити поле тендера із значенням
372   - [Arguments] ${username} ${tender_uaid} ${left} ${field} ${object_id}=${None}
  372 + [Arguments] ${username} ${tender_uaid} ${left} ${field} ${object_id}=${Empty}
373 373 ${right}= Отримати дані із тендера ${username} ${tender_uaid} ${field} ${object_id}
374 374 Порівняти об'єкти ${left} ${right}
375 375
... ... @@ -390,7 +390,7 @@ Get Broker Property By Username
390 390
391 391
392 392 Звірити дату тендера із значенням
393   - [Arguments] ${username} ${tender_uaid} ${left} ${field} ${object_id}=${None} ${accuracy}=60 ${absolute_delta}=${False}
  393 + [Arguments] ${username} ${tender_uaid} ${left} ${field} ${object_id}=${Empty} ${accuracy}=60 ${absolute_delta}=${False}
394 394 ${right}= Отримати дані із тендера ${username} ${tender_uaid} ${field} ${object_id}
395 395 Порівняти дати ${left} ${right} accuracy=${accuracy} absolute_delta=${absolute_delta}
396 396
... ... @@ -413,7 +413,7 @@ Get Broker Property By Username
413 413
414 414
415 415 Звірити координати доставки тендера
416   - [Arguments] ${username} ${tender_uaid} ${tender_data} ${field} ${object_id}=${None}
  416 + [Arguments] ${username} ${tender_uaid} ${tender_data} ${field} ${object_id}=${Empty}
417 417 ${left_lat}= Get_From_Object ${tender_data.data} ${field}.deliveryLocation.latitude
418 418 ${left_lon}= Get_From_Object ${tender_data.data} ${field}.deliveryLocation.longitude
419 419 ${right_lat}= Отримати дані із тендера ${username} ${tender_uaid} ${field}.deliveryLocation.latitude ${object_id}
... ... @@ -461,9 +461,9 @@ Get Broker Property By Username
461 461
462 462
463 463 Отримати дані із тендера
464   - [Arguments] ${username} ${tender_uaid} ${field_name} ${object_id}=${None}
465   - ${field}= Run Keyword If '${object_id}'=='${None}' Set Variable ${field_name}
466   - ... ELSE Отримати шлях до поля об’єкта ${username} ${field_name} ${object_id}
  464 + [Arguments] ${username} ${tender_uaid} ${field_name} ${object_id}=${Empty}
  465 + ${field}= Run Keyword If '${object_id}' Отримати шлях до поля об’єкта ${username} ${field_name} ${object_id}
  466 + ... ELSE Set Variable ${field_name}
467 467 ${status} ${field_value}= Run keyword and ignore error
468 468 ... Get from object
469 469 ... ${USERS.users['${username}'].tender_data.data}
... ... @@ -471,8 +471,8 @@ Get Broker Property By Username
471 471 # If field in cache, return its value
472 472 Run Keyword if '${status}' == 'PASS' Return from keyword ${field_value}
473 473 # Else call broker to find field
474   - ${field_value}= Run Keyword IF '${object_id}'=='${None}' Run As ${username} Отримати інформацію із тендера ${tender_uaid} ${field}
475   - ... ELSE Отримати дані із об’єкта тендера ${username} ${tender_uaid} ${object_id} ${field_name}
  474 + ${field_value}= Run Keyword IF '${object_id}' Отримати дані із об’єкта тендера ${username} ${tender_uaid} ${object_id} ${field_name}
  475 + ... ELSE Run As ${username} Отримати інформацію із тендера ${tender_uaid} ${field}
476 476 # And caching its value before return
477 477 Set_To_Object ${USERS.users['${username}'].tender_data.data} ${field} ${field_value}
478 478 [return] ${field_value}
... ...
Please register or login to post a comment