Merge pull request #109 from mykhaly/update_mods

Remake tender creation and update modes

Merge pull request #109 from mykhaly/update_mods
Remake tender creation and update modes
selurvedu
2 parents caae4495 d3285968
Showing 5 changed files with 29 additions and 25 deletions
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/meatTender.robot
op_robot_tests/tests_files/multiItemTender.robot
op_robot_tests/tests_files/multiLotTender.robot
op_robot_tests/tests_files/service_keywords.py
--- a/op_robot_tests/tests_files/initial_data.py
View file @e7ab7e5
+++ b/op_robot_tests/tests_files/initial_data.py
View file @e7ab7e5
@@ -194,26 +194,28 @@ def test_tender_data_multiple_items(intervals):
     return t_data
-def test_tender_data_multiple_lots(t_data):
+def test_tender_data_multiple_lots(intervals):
+    tender = test_tender_data_multiple_items(intervals)
     first_lot_id = "3c8f387879de4c38957402dbdb8b31af"
     second_lot_id = "bcac8d2ceb5f4227b841a2211f5cb646"
-    for item in t_data['data']['items'][:-1]:
+    for item in tender['items'][:-1]:
         item['relatedLot'] = first_lot_id
-    t_data['data']['items'][-1]['relatedLot'] = second_lot_id
-    t_data['data']['lots'] = []
+    tender['items'][-1]['relatedLot'] = second_lot_id
+    tender['lots'] = []
     for _ in range(2):
         new_lot = test_lot_data()
-        t_data['data']['lots'].append(new_lot)
-    t_data['data']['lots'][0]['id'] = first_lot_id
-    t_data['data']['lots'][1]['id'] = second_lot_id
-    return t_data
+        tender['lots'].append(new_lot)
+    tender['lots'][0]['id'] = first_lot_id
+    tender['lots'][1]['id'] = second_lot_id
+    return tender
-def test_meat_tender_data(tender):
+def test_tender_data_meat(intervals):
+    tender = munchify(test_tender_data(intervals))
     item_id = "edd0032574bf4402877ad5f362df225a"
-    tender.data['items'][0].id = item_id
-    tender.data.features = [
+    tender['items'][0].id = item_id
+    tender.features = [
         {
             "code": "ee3e24bc17234a41bd3e3a04cc28e9c6",
             "featureOf": "tenderer",
--- a/op_robot_tests/tests_files/meatTender.robot
View file @e7ab7e5
+++ b/op_robot_tests/tests_files/meatTender.robot
View file @e7ab7e5
@@ -10,7 +10,7 @@ Suite Setup     Test Suite Setup
 Suite Teardown  Test Suite Teardown
 *** Variables ***
-${mode}         single
+${mode}         meat
 @{used_roles}   tender_owner  provider  provider1  viewer
@@ -22,8 +22,7 @@ ${mode}         single
   ...      minimal
   [Documentation]   Створення закупівлі замовником, обовязково має повертати UAID закупівлі (номер тендера),
   [Teardown]  Оновити LAST_MODIFICATION_DATE
-  ${base_tender_data}=  Підготовка даних для створення тендера
-  ${tender_data}=  test_meat_tender_data  ${base_tender_data}
+  ${tender_data}=  Підготовка даних для створення тендера
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_owner}  ${tender_data}
   ${TENDER_UAID}=  Викликати для учасника  ${tender_owner}  Створити тендер  ${adapted_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
--- a/op_robot_tests/tests_files/multiItemTender.robot
View file @e7ab7e5
+++ b/op_robot_tests/tests_files/multiItemTender.robot
View file @e7ab7e5
@@ -10,7 +10,7 @@ Suite Setup     Test Suite Setup
 Suite Teardown  Test Suite Teardown
 *** Variables ***
-${mode}         multi
+${mode}         multiItem
 @{used_roles}   tender_owner  provider  provider1  viewer
--- a/op_robot_tests/tests_files/multiLotTender.robot
View file @e7ab7e5
+++ b/op_robot_tests/tests_files/multiLotTender.robot
View file @e7ab7e5
@@ -10,7 +10,7 @@ Suite Setup     Test Suite Setup
 Suite Teardown  Test Suite Teardown
 *** Variables ***
-${mode}         multi
+${mode}         multiLot
 @{used_roles}   tender_owner  provider  provider1  viewer
 ${complaint_id}  1
@@ -23,7 +23,6 @@ ${complaint_id}  1
   ...      minimal
   [Teardown]  Оновити LAST_MODIFICATION_DATE
   ${tender_data}=  Підготовка даних для створення тендера
-  ${tender_data}=  test_tender_data_multiple_lots  ${tender_data}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_owner}  ${tender_data}
   ${TENDER_UAID}=  Викликати для учасника  ${tender_owner}  Створити тендер  ${adapted_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
--- a/op_robot_tests/tests_files/service_keywords.py
View file @e7ab7e5
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @e7ab7e5
@@ -41,13 +41,13 @@ from .initial_data import (
     test_lot_document_data,
     test_lot_question_data,
     test_lots_bid_data,
-    test_meat_tender_data,
     test_question_answer_data,
     test_question_data,
     test_submit_claim_data,
     test_supplier_data,
     test_tender_data,
     test_tender_data_limited,
+    test_tender_data_meat,
     test_tender_data_multiple_items,
     test_tender_data_multiple_lots,
     test_tender_data_openeu,
@@ -222,20 +222,24 @@ def prepare_test_tender_data(procedure_intervals, mode):
         assert 'accelerator' not in intervals.keys(), \
                "Accelerator is not available for mode '{0}'".format(mode)
-    if mode == 'single':
-        return munchify({'data': test_tender_data(intervals)})
-    elif mode == 'multi':
+    if mode == 'meat':
+        return munchify({'data': test_tender_data_meat(intervals)})
+    elif mode == 'multiItem':
         return munchify({'data': test_tender_data_multiple_items(intervals)})
-    elif mode == 'reporting':
-        return munchify({'data': test_tender_data_limited(intervals, 'reporting')})
+    elif mode == 'multiLot':
+        return munchify({'data': test_tender_data_multiple_lots(intervals)})
     elif mode == 'negotiation':
         return munchify({'data': test_tender_data_limited(intervals, 'negotiation')})
     elif mode == 'negotiation.quick':
         return munchify({'data': test_tender_data_limited(intervals, 'negotiation.quick')})
-    elif mode == 'openua':
-        return munchify({'data': test_tender_data_openua(intervals)})
     elif mode == 'openeu':
         return munchify({'data': test_tender_data_openeu(intervals)})
+    elif mode == 'openua':
+        return munchify({'data': test_tender_data_openua(intervals)})
+    elif mode == 'reporting':
+        return munchify({'data': test_tender_data_limited(intervals, 'reporting')})
+    elif mode == 'single':
+        return munchify({'data': test_tender_data(intervals)})
     raise ValueError("Invalid mode for prepare_test_tender_data")