Commit f3f70b9f23e6f86fdf640958146f7fac407d476f
1 parent
f6ce2dab
add simple defense procedure tendere data generation
Showing
1 changed file
with
21 additions
and
11 deletions
@@ -24,7 +24,7 @@ fake = fake_uk | @@ -24,7 +24,7 @@ fake = fake_uk | ||
24 | used_identifier_id = [] | 24 | used_identifier_id = [] |
25 | mode_open = ["belowThreshold", "aboveThresholdUA", "aboveThresholdEU", | 25 | mode_open = ["belowThreshold", "aboveThresholdUA", "aboveThresholdEU", |
26 | "aboveThresholdUA.defense", "competitiveDialogueUA", "competitiveDialogueEU", "esco", | 26 | "aboveThresholdUA.defense", "competitiveDialogueUA", "competitiveDialogueEU", "esco", |
27 | - "closeFrameworkAgreementUA"] | 27 | + "closeFrameworkAgreementUA", "simple.defense"] |
28 | mode_limited = ["reporting", "negotiation.quick", "negotiation"] | 28 | mode_limited = ["reporting", "negotiation.quick", "negotiation"] |
29 | mode_selective = ["priceQuotation"] | 29 | mode_selective = ["priceQuotation"] |
30 | violationType = ["corruptionDescription", "corruptionProcurementMethodType", "corruptionChanges", | 30 | violationType = ["corruptionDescription", "corruptionProcurementMethodType", "corruptionChanges", |
@@ -332,7 +332,7 @@ def test_tender_data_planning(params): | @@ -332,7 +332,7 @@ def test_tender_data_planning(params): | ||
332 | "buyers": [] | 332 | "buyers": [] |
333 | } | 333 | } |
334 | data["procuringEntity"]["name"] = data["procuringEntity"]["identifier"]["legalName"] | 334 | data["procuringEntity"]["name"] = data["procuringEntity"]["identifier"]["legalName"] |
335 | - if params.get("mode") == "aboveThresholdUA.defense": | 335 | + if params.get("mode") in ["aboveThresholdUA.defense", "simple.defense"]: |
336 | data["procuringEntity"]["kind"] = "defense" | 336 | data["procuringEntity"]["kind"] = "defense" |
337 | elif params.get("mode") in ["belowThreshold", "reporting"]: | 337 | elif params.get("mode") in ["belowThreshold", "reporting"]: |
338 | data["procuringEntity"]["kind"] = "other" | 338 | data["procuringEntity"]["kind"] = "other" |
@@ -849,9 +849,9 @@ def test_change_document_data(document, change_id): | @@ -849,9 +849,9 @@ def test_change_document_data(document, change_id): | ||
849 | 849 | ||
850 | 850 | ||
851 | def test_tender_data_openua(params, submissionMethodDetails, plan_data): | 851 | def test_tender_data_openua(params, submissionMethodDetails, plan_data): |
852 | - # We should not provide any values for `enquiryPeriod` when creating | ||
853 | - # an openUA or openEU procedure. That field should not be present at all. | ||
854 | - # Therefore, we pass a nondefault list of periods to `test_tender_data()`. | 852 | + """We should not provide any values for `enquiryPeriod` when creating |
853 | + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all. | ||
854 | + Therefore, we pass a nondefault list of periods to `test_tender_data()`.""" | ||
855 | data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) | 855 | data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) |
856 | data['procurementMethodType'] = 'aboveThresholdUA' | 856 | data['procurementMethodType'] = 'aboveThresholdUA' |
857 | data['procuringEntity']['kind'] = 'general' | 857 | data['procuringEntity']['kind'] = 'general' |
@@ -869,9 +869,9 @@ def test_tender_data_openua_defense(params, submissionMethodDetails, plan_data): | @@ -869,9 +869,9 @@ def test_tender_data_openua_defense(params, submissionMethodDetails, plan_data): | ||
869 | 869 | ||
870 | 870 | ||
871 | def test_tender_data_openeu(params, submissionMethodDetails, plan_data): | 871 | def test_tender_data_openeu(params, submissionMethodDetails, plan_data): |
872 | - # We should not provide any values for `enquiryPeriod` when creating | ||
873 | - # an openUA or openEU procedure. That field should not be present at all. | ||
874 | - # Therefore, we pass a nondefault list of periods to `test_tender_data()`. | 872 | + """We should not provide any values for `enquiryPeriod` when creating |
873 | + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all. | ||
874 | + Therefore, we pass a nondefault list of periods to `test_tender_data()`.""" | ||
875 | data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) | 875 | data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) |
876 | data['procurementMethodType'] = 'aboveThresholdEU' | 876 | data['procurementMethodType'] = 'aboveThresholdEU' |
877 | data['title_en'] = "[TESTING]" | 877 | data['title_en'] = "[TESTING]" |
@@ -899,9 +899,9 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails, plan_d | @@ -899,9 +899,9 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails, plan_d | ||
899 | 899 | ||
900 | 900 | ||
901 | def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_data): | 901 | def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_data): |
902 | - # We should not provide any values for `enquiryPeriod` when creating | ||
903 | - # an openUA or openEU procedure. That field should not be present at all. | ||
904 | - # Therefore, we pass a nondefault list of periods to `test_tender_data()`. | 902 | + """We should not provide any values for `enquiryPeriod` when creating |
903 | + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all. | ||
904 | + Therefore, we pass a nondefault list of periods to `test_tender_data()`.""" | ||
905 | data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) | 905 | data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) |
906 | if params.get('dialogue_type') == 'UA': | 906 | if params.get('dialogue_type') == 'UA': |
907 | data['procurementMethodType'] = 'competitiveDialogueUA' | 907 | data['procurementMethodType'] = 'competitiveDialogueUA' |
@@ -934,6 +934,16 @@ def test_tender_data_selection(procedure_intervals, params, submissionMethodDeta | @@ -934,6 +934,16 @@ def test_tender_data_selection(procedure_intervals, params, submissionMethodDeta | ||
934 | return munchify({'data': data}) | 934 | return munchify({'data': data}) |
935 | 935 | ||
936 | 936 | ||
937 | +def test_tender_data_simple_defense(params, submissionMethodDetails, plan_data): | ||
938 | + """We should not provide any values for `enquiryPeriod` when creating | ||
939 | + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all. | ||
940 | + Therefore, we pass a nondefault list of periods to `test_tender_data()`.""" | ||
941 | + data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) | ||
942 | + data['procurementMethodType'] = 'simple.defense' | ||
943 | + data['procuringEntity']['kind'] = 'defense' | ||
944 | + return data | ||
945 | + | ||
946 | + | ||
937 | def test_change_data(): | 947 | def test_change_data(): |
938 | return munchify( | 948 | return munchify( |
939 | { | 949 | { |
Please
register
or
login
to post a comment