Commit 97690ed570709f9f1424ad136dce8203e87c1a1d

Authored by Andrew Leitsius
Committed by mykhaly
1 parent 34fdd305

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
8 8 ${mode} openeu
9 9 @{used_roles} tender_owner provider provider1 viewer
10 10
  11 +${number_of_items} ${1}
11 12 ${number_of_lots} ${0}
12 13 ${meat} ${0}
13 14
... ...
... ... @@ -8,8 +8,9 @@ Resource resource.robot
8 8 *** Keywords ***
9 9 Можливість оголосити тендер
10 10 ${number_of_lots}= Convert To Integer ${number_of_lots}
  11 + ${number_of_items}= Convert To Integer ${number_of_items}
11 12 ${meat}= Convert To Integer ${meat}
12   - ${tender_data}= Підготувати дані для створення тендера ${number_of_lots} ${meat}
  13 + ${tender_data}= Підготувати дані для створення тендера ${number_of_items} ${number_of_lots} ${meat}
13 14 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_owner} ${tender_data}
14 15 ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data}
15 16 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data}
... ...
... ... @@ -47,7 +47,7 @@ def create_fake_doc():
47 47 return tf.name
48 48
49 49
50   -def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_lots=0, meat=False):
  50 +def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_items=1, number_of_lots=0, meat=False):
51 51 now = get_now()
52 52 value_amount = round(random.uniform(3000, 99999999999.99), 2) # max value equals to budget of Ukraine in hryvnias
53 53 data = {
... ... @@ -93,7 +93,7 @@ def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_lots=0,
93 93 new_lot = test_lot_data(data['value']['amount'])
94 94 data['lots'].append(new_lot)
95 95 data['lots'][lot_number]['id'] = lot_id
96   - for i in range(fake.random_int(min=1, max=5)):
  96 + for i in range(number_of_items):
97 97 new_item = test_item_data(cpv_group)
98 98 data['items'].append(new_item)
99 99 data['items'][lot_number]['relatedLot'] = lot_id
... ... @@ -102,7 +102,7 @@ def test_tender_data(intervals, periods=("enquiry", "tender"), number_of_lots=0,
102 102 data['value']['amount'] = value_amount
103 103 data['minimalStep']['amount'] = minimalStep
104 104 else:
105   - for i in range(fake.random_int(min=1, max=5)):
  105 + for i in range(number_of_items):
106 106 new_item = test_item_data(cpv_group)
107 107 data['items'].append(new_item)
108 108 if meat:
... ... @@ -341,7 +341,7 @@ def test_lot_complaint_data(complaint, lot_id):
341 341 return munchify(complaint)
342 342
343 343
344   -def test_tender_data_openua(intervals, number_of_lots, meat):
  344 +def test_tender_data_openua(intervals, number_of_items, number_of_lots, meat):
345 345 accelerator = intervals['accelerator']
346 346 # Since `accelerator` field is not really a list containing timings
347 347 # for a period called `acceleratorPeriod`, let's remove it :)
... ... @@ -349,7 +349,7 @@ def test_tender_data_openua(intervals, number_of_lots, meat):
349 349 # We should not provide any values for `enquiryPeriod` when creating
350 350 # an openUA or openEU procedure. That field should not be present at all.
351 351 # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
352   - data = test_tender_data(intervals, periods=('tender',), number_of_lots=number_of_lots, meat=meat)
  352 + data = test_tender_data(intervals, ('tender',), number_of_items, number_of_lots, meat)
353 353 data['procurementMethodType'] = 'aboveThresholdUA'
354 354 data['procurementMethodDetails'] = 'quick, ' \
355 355 'accelerator={}'.format(accelerator)
... ... @@ -365,7 +365,7 @@ def test_tender_data_openeu(intervals, number_of_lots, meat):
365 365 # We should not provide any values for `enquiryPeriod` when creating
366 366 # an openUA or openEU procedure. That field should not be present at all.
367 367 # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
368   - data = test_tender_data(intervals, periods=('tender',), number_of_lots=number_of_lots, meat=meat)
  368 + data = test_tender_data(intervals, ('tender',), number_of_items, number_of_lots, meat)
369 369 data['procurementMethodType'] = 'aboveThresholdEU'
370 370 data['procurementMethodDetails'] = 'quick, ' \
371 371 'accelerator={}'.format(accelerator)
... ...
... ... @@ -191,9 +191,9 @@ Get Broker Property By Username
191 191
192 192
193 193 Підготувати дані для створення тендера
194   - [Arguments] ${number_of_lots}=0 ${meat}=${False}
  194 + [Arguments] ${number_of_items}=1 ${number_of_lots}=0 ${meat}=${False}
195 195 ${period_intervals}= compute_intrs ${BROKERS} ${used_brokers}
196   - ${tender_data}= prepare_test_tender_data ${period_intervals} ${mode} ${number_of_lots} ${meat}
  196 + ${tender_data}= prepare_test_tender_data ${period_intervals} ${mode} ${number_of_items} ${number_of_lots} ${meat}
197 197 ${TENDER}= Create Dictionary
198 198 Set Global Variable ${TENDER}
199 199 Log ${tender_data}
... ...
... ... @@ -5,11 +5,12 @@ Suite Teardown Test Suite Teardown
5 5
6 6
7 7 *** Variables ***
8   -${mode} belowThreshold
9   -@{used_roles} tender_owner provider provider1 viewer
  8 +${mode} belowThreshold
  9 +@{used_roles} tender_owner provider provider1 viewer
10 10
11   -${number_of_lots} ${1}
12   -${meat} ${1}
  11 +${number_of_items} ${1}
  12 +${number_of_lots} ${1}
  13 +${meat} ${1}
13 14
14 15
15 16 *** Test Cases ***
... ...
... ... @@ -258,7 +258,7 @@ def compute_intrs(brokers_data, used_brokers):
258 258 return result
259 259
260 260
261   -def prepare_test_tender_data(procedure_intervals, mode, number_of_lots=0, meat=False):
  261 +def prepare_test_tender_data(procedure_intervals, mode, number_of_items=1, number_of_lots=0, meat=False):
262 262 # Get actual intervals by mode name
263 263 if mode in procedure_intervals:
264 264 intervals = procedure_intervals[mode]
... ... @@ -281,13 +281,13 @@ def prepare_test_tender_data(procedure_intervals, mode, number_of_lots=0, meat=F
281 281 elif mode == 'negotiation.quick':
282 282 return munchify({'data': test_tender_data_limited(intervals, 'negotiation.quick')})
283 283 elif mode == 'openeu':
284   - return munchify({'data': test_tender_data_openeu(intervals, number_of_lots=number_of_lots, meat=meat)})
  284 + return munchify({'data': test_tender_data_openeu(intervals, number_of_items, number_of_lots, meat)})
285 285 elif mode == 'openua':
286   - return munchify({'data': test_tender_data_openua(intervals, number_of_lots=number_of_lots, meat=meat)})
  286 + return munchify({'data': test_tender_data_openua(intervals, number_of_items, number_of_lots, meat)})
287 287 elif mode == 'reporting':
288 288 return munchify({'data': test_tender_data_limited(intervals, 'reporting')})
289 289 elif mode == 'belowThreshold':
290   - return munchify({'data': test_tender_data(intervals, number_of_lots=number_of_lots, meat=meat)})
  290 + return munchify({'data': test_tender_data(intervals, number_of_items=number_of_items, number_of_lots=number_of_lots, meat=meat)})
291 291 raise ValueError("Invalid mode for prepare_test_tender_data")
292 292
293 293
... ...
... ... @@ -7,6 +7,7 @@ Suite Teardown Test Suite Teardown
7 7 ${mode} belowThreshold
8 8 @{used_roles} tender_owner provider provider1 viewer
9 9
  10 +${number_of_items} ${1}
10 11 ${number_of_lots} ${1}
11 12 ${meat} ${1}
12 13
... ...
Please register or login to post a comment