Add number of items (#200)

As variable to complaints, openProcedure and aboveThreshold test suites
And to all necessary keywords

@@ -8,6 +8,7 @@ Suite Teardown  Test Suite Teardown
 ${mode}         openeu
 ${mode}         openeu
 @{used_roles}   tender_owner  provider  provider1  viewer
 @{used_roles}   tender_owner  provider  provider1  viewer
 
 
+${number_of_items} ${1}
 ${number_of_lots}  ${0}
 ${number_of_lots}  ${0}
 ${meat}            ${0}
 ${meat}            ${0}
 
 

@@ -8,8 +8,9 @@ Resource           resource.robot
 *** Keywords ***
 *** Keywords ***
 Можливість оголосити тендер
 Можливість оголосити тендер
   ${number_of_lots}=  Convert To Integer  ${number_of_lots}
   ${number_of_lots}=  Convert To Integer  ${number_of_lots}
+  ${number_of_items}=  Convert To Integer  ${number_of_items}
   ${meat}=  Convert To Integer  ${meat}
   ${meat}=  Convert To Integer  ${meat}
-  ${tender_data}=  Підготувати дані для створення тендера  ${number_of_lots}  ${meat}
+  ${tender_data}=  Підготувати дані для створення тендера  ${number_of_items}  ${number_of_lots}  ${meat}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_owner}  ${tender_data}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_owner}  ${tender_data}
   ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}
   ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}

@@ -47,7 +47,7 @@ def create_fake_doc():
     return tf.name
     return tf.name
 
 
 
 
-def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_lots=0, meat=False):
+def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_items=1, number_of_lots=0, meat=False):
     now = get_now()
     now = get_now()
     value_amount = round(random.uniform(3000, 99999999999.99), 2)  # max value equals to budget of Ukraine in hryvnias
     value_amount = round(random.uniform(3000, 99999999999.99), 2)  # max value equals to budget of Ukraine in hryvnias
     data = {
     data = {
@@ -93,7 +93,7 @@ def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_lots=0,
             new_lot = test_lot_data(data['value']['amount'])
             new_lot = test_lot_data(data['value']['amount'])
             data['lots'].append(new_lot)
             data['lots'].append(new_lot)
             data['lots'][lot_number]['id'] = lot_id
             data['lots'][lot_number]['id'] = lot_id
-            for i in range(fake.random_int(min=1, max=5)):
+            for i in range(number_of_items):
                 new_item = test_item_data(cpv_group)
                 new_item = test_item_data(cpv_group)
                 data['items'].append(new_item)
                 data['items'].append(new_item)
                 data['items'][lot_number]['relatedLot'] = lot_id
                 data['items'][lot_number]['relatedLot'] = lot_id
@@ -102,7 +102,7 @@ def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_lots=0,
         data['value']['amount'] = value_amount
         data['value']['amount'] = value_amount
         data['minimalStep']['amount'] = minimalStep
         data['minimalStep']['amount'] = minimalStep
     else:
     else:
-        for i in range(fake.random_int(min=1, max=5)):
+        for i in range(number_of_items):
             new_item = test_item_data(cpv_group)
             new_item = test_item_data(cpv_group)
             data['items'].append(new_item)
             data['items'].append(new_item)
     if meat:
     if meat:
@@ -341,7 +341,7 @@ def test_lot_complaint_data(complaint, lot_id):
     return munchify(complaint)
     return munchify(complaint)
 
 
 
 
-def test_tender_data_openua(intervals, number_of_lots, meat):
+def test_tender_data_openua(intervals, number_of_items, number_of_lots, meat):
     accelerator = intervals['accelerator']
     accelerator = intervals['accelerator']
     # Since `accelerator` field is not really a list containing timings
     # Since `accelerator` field is not really a list containing timings
     # for a period called `acceleratorPeriod`, let's remove it :)
     # for a period called `acceleratorPeriod`, let's remove it :)
@@ -349,7 +349,7 @@ def test_tender_data_openua(intervals, number_of_lots, meat):
     # We should not provide any values for `enquiryPeriod` when creating
     # We should not provide any values for `enquiryPeriod` when creating
     # an openUA or openEU procedure. That field should not be present at all.
     # an openUA or openEU procedure. That field should not be present at all.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
-    data = test_tender_data(intervals, periods=('tender',), number_of_lots=number_of_lots, meat=meat)
+    data = test_tender_data(intervals, ('tender',), number_of_items, number_of_lots, meat)
     data['procurementMethodType'] = 'aboveThresholdUA'
     data['procurementMethodType'] = 'aboveThresholdUA'
     data['procurementMethodDetails'] = 'quick, ' \
     data['procurementMethodDetails'] = 'quick, ' \
         'accelerator={}'.format(accelerator)
         'accelerator={}'.format(accelerator)
@@ -365,7 +365,7 @@ def test_tender_data_openeu(intervals, number_of_lots, meat):
     # We should not provide any values for `enquiryPeriod` when creating
     # We should not provide any values for `enquiryPeriod` when creating
     # an openUA or openEU procedure. That field should not be present at all.
     # an openUA or openEU procedure. That field should not be present at all.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
-    data = test_tender_data(intervals, periods=('tender',), number_of_lots=number_of_lots, meat=meat)
+    data = test_tender_data(intervals, ('tender',), number_of_items, number_of_lots, meat)
     data['procurementMethodType'] = 'aboveThresholdEU'
     data['procurementMethodType'] = 'aboveThresholdEU'
     data['procurementMethodDetails'] = 'quick, ' \
     data['procurementMethodDetails'] = 'quick, ' \
         'accelerator={}'.format(accelerator)
         'accelerator={}'.format(accelerator)

@@ -191,9 +191,9 @@ Get Broker Property By Username
 
 
 
 
 Підготувати дані для створення тендера
 Підготувати дані для створення тендера
-  [Arguments]  ${number_of_lots}=0  ${meat}=${False}
+  [Arguments]  ${number_of_items}=1  ${number_of_lots}=0  ${meat}=${False}
   ${period_intervals}=  compute_intrs  ${BROKERS}  ${used_brokers}
   ${period_intervals}=  compute_intrs  ${BROKERS}  ${used_brokers}
-  ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${mode}  ${number_of_lots}  ${meat}
+  ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${mode}  ${number_of_items}  ${number_of_lots}  ${meat}
   ${TENDER}=  Create Dictionary
   ${TENDER}=  Create Dictionary
   Set Global Variable  ${TENDER}
   Set Global Variable  ${TENDER}
   Log  ${tender_data}
   Log  ${tender_data}

@@ -5,11 +5,12 @@ Suite Teardown  Test Suite Teardown
 
 
 
 
 *** Variables ***
 *** Variables ***
-${mode}            belowThreshold
-@{used_roles}      tender_owner  provider  provider1  viewer
+${mode}             belowThreshold
+@{used_roles}       tender_owner  provider  provider1  viewer
 
 
-${number_of_lots}  ${1}
-${meat}            ${1}
+${number_of_items}  ${1}
+${number_of_lots}   ${1}
+${meat}             ${1}
 
 
 
 
 *** Test Cases ***
 *** Test Cases ***

@@ -258,7 +258,7 @@ def compute_intrs(brokers_data, used_brokers):
     return result
     return result
 
 
 
 
-def prepare_test_tender_data(procedure_intervals, mode, number_of_lots=0, meat=False):
+def prepare_test_tender_data(procedure_intervals, mode, number_of_items=1, number_of_lots=0, meat=False):
     # Get actual intervals by mode name
     # Get actual intervals by mode name
     if mode in procedure_intervals:
     if mode in procedure_intervals:
         intervals = procedure_intervals[mode]
         intervals = procedure_intervals[mode]
@@ -281,13 +281,13 @@ def prepare_test_tender_data(procedure_intervals, mode, number_of_lots=0, meat=F
     elif mode == 'negotiation.quick':
     elif mode == 'negotiation.quick':
         return munchify({'data': test_tender_data_limited(intervals, 'negotiation.quick')})
         return munchify({'data': test_tender_data_limited(intervals, 'negotiation.quick')})
     elif mode == 'openeu':
     elif mode == 'openeu':
-        return munchify({'data': test_tender_data_openeu(intervals, number_of_lots=number_of_lots, meat=meat)})
+        return munchify({'data': test_tender_data_openeu(intervals, number_of_items, number_of_lots, meat)})
     elif mode == 'openua':
     elif mode == 'openua':
-        return munchify({'data': test_tender_data_openua(intervals, number_of_lots=number_of_lots, meat=meat)})
+        return munchify({'data': test_tender_data_openua(intervals, number_of_items, number_of_lots, meat)})
     elif mode == 'reporting':
     elif mode == 'reporting':
         return munchify({'data': test_tender_data_limited(intervals, 'reporting')})
         return munchify({'data': test_tender_data_limited(intervals, 'reporting')})
     elif mode == 'belowThreshold':
     elif mode == 'belowThreshold':
-        return munchify({'data': test_tender_data(intervals, number_of_lots=number_of_lots, meat=meat)})
+        return munchify({'data': test_tender_data(intervals, number_of_items=number_of_items, number_of_lots=number_of_lots, meat=meat)})
     raise ValueError("Invalid mode for prepare_test_tender_data")
     raise ValueError("Invalid mode for prepare_test_tender_data")
 
 
 
 

@@ -7,6 +7,7 @@ Suite Teardown  Test Suite Teardown
 ${mode}         belowThreshold
 ${mode}         belowThreshold
 @{used_roles}   tender_owner  provider  provider1  viewer
 @{used_roles}   tender_owner  provider  provider1  viewer
 
 
+${number_of_items} ${1}
 ${number_of_lots}  ${1}
 ${number_of_lots}  ${1}
 ${meat}            ${1}
 ${meat}            ${1}