From f7c785821e14fff3a0cdbc24bb018f2bf6143549 Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Fri, 16 Dec 2016 15:58:01 +0100 Subject: [PATCH 01/24] add NO translation --- .../resources/i18n/messages_no.properties | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/espd-web/src/main/resources/i18n/messages_no.properties b/espd-web/src/main/resources/i18n/messages_no.properties index 1d9d0ed63..d94d37ea1 100644 --- a/espd-web/src/main/resources/i18n/messages_no.properties +++ b/espd-web/src/main/resources/i18n/messages_no.properties @@ -314,16 +314,16 @@ createcaexcl_header=Del III: Avvisningsgrunner createcaexcl_insolvency_conflicts=Opplysninger som gjelder mulig insolvens, interessekonflikt eller alvorlige feil i yrkesutøvelsen createcafinish_concl_statements=Del VI: Avsluttende erklæringer createcafinish_concl_statements_signature=Dato, sted og, hvor det er påkrevd eller nødvendig, underskrift(er): -createcafinish_concl_statements_text=Undertegnede erklærer at opplysningene angitt i del II-IV ovenfor er nøyaktige og korrekte, og at de har blitt avgitt i fullt kjennskap til konsekvensene av å oppgi uriktige opplysninger.

Undertegnede bekrefte å kunne fremlegge attester og andre former for dokumentasjon som det henvises til, straks og på anmodning unntatt når:

a) oppdragsgiver har mulighet til å innhente de relevante støttedokumentene kostnadsfritt i en database i en EØS-stat, hvis denne stilles gratis til rådighet , eller

b) oppdragsgiver allerede senest den 18. april 2018 er i besittelse av de aktuelle dokumentene.

Undertegnede gir [vennligst angi oppdragsgiveren angitt i del I, avsnitt A] adgang til dokumentasjon til støtte for de opplysninger som har blitt avgitt i [vennligst angi den relevante del, det relevante avsnitt, det eller de relevante punkter] i dette europeiske egenerklæringsskjemaet med sikte på [angi konkurransen: (kort beskrivelse, henvisning til Den Europæiske Unions Tidende, referanseenummer)].

-createcafinish_export=Last ned -createcafinish_export_content=Klikk 'Last ned' for å lagre ESPD-forespørselen. Som oppdragsgiver må du sikre at denne ESPDfilen gjøres tilgjenglig for leverandøren sammen med øvrige anskaffelsesdokumenter. +createcafinish_concl_statements_text=Undertegnede erklærer at opplysningene angitt i del II-IV ovenfor er nøyaktige og korrekte, og at de har blitt avgitt i fullt kjennskap til konsekvensene av å oppgi uriktige opplysninger.

Undertegnede bekrefte å kunne fremlegge attester og andre former for dokumentasjon som det henvises til, straks og på anmodning unntatt når:

a) oppdragsgiver har mulighet til å innhente de relevante støttedokumentene kostnadsfritt i en database i en EØS-stat, hvis denne stilles gratis til rådighet, eller

b) oppdragsgiver allerede senest den 18. april 2018 er i besittelse av de aktuelle dokumentene.

Undertegnede gir [vennligst angi oppdragsgiveren angitt i del I, avsnitt A] adgang til dokumentasjon til støtte for de opplysninger som har blitt avgitt i [vennligst angi den relevante del, det relevante avsnitt, det eller de relevante punkter] i dette europeiske egenerklæringsskjemaet med sikte på [angi konkurransen: (kort beskrivelse, henvisning til Den Europæiske Unions Tidende, referanseenummer)].

+createcafinish_export=Last ned og lagre +createcafinish_export_content=Klikk 'Lag fil' for å hente ned og lagre filen du har laget. createcafinish_header=Avslutt createcafinish_reduction=Del V: Utvelgelse av antallet av kvalifiserte leverandører createcafinish_reduction_question=Leverandøren erklærer at: createcafinish_text_eo_declares_that=Hvis noen av disse attestene eller andre former for dokumentasjon er tilgjengelige i elektronisk form , angis dette for hver enkelt: createcafinish_title_eo_declares_that=Denne oppfyller de objektive og ikke-diskriminerende kriterier eller regler som skal anvendes for å velge ut antallet av leverandører på følgende måte:

Hvis det anmodes om visse attester eller andre former for dokumentasjon, angis for hver enkelt om leverandøren er i besittelse av dokumentene som etterspørres:

createcafinish_toptext=Leverandør skal bare gi opplysninger hvis oppdragsgiver har angitt hvilke objektive og ikke-diskriminerende kriterier eller regler som skal anvendes for å velge ut antallet leverandører som vil bli invitert å levere tilbud eller til dialog. Disse opplysningene, som kan ledsages av krav om hvilke (typer) attester eller hvilke former for dokumentasjon - om noen - som skal fremlegges, er fastsatt i kunngjøringen eller i anskaffelsesdokumentene.

Kun ved begrensede anbudskonkurranser, konkurranse med forhandling, konkurransepreget dialog og innovasjonspartnerskap:

-createcasel_alert=Oppdragsgiver må indikere hvilke kvalifikasjonskrav som gjelder i konkurransen ved å huke av i check-boxen foran det aktuelle kravet. +createcasel_alert=Oppdragsgiver angir hvilke kvalifikasjonskrav som gjelder i konkurransen ved å huke av foran de aktuelle kravene (A-D). createcasel_economic_and_financial_standing=B: ØKONOMISK OG FINANSIELLE KAPASITET createcasel_header=Del IV: Kvalifikasjonskrav createcasel_quality_assurance=D: KVALITETSSIKRINGS- OG MILJØLEDELSESSTANDARDER @@ -394,7 +394,7 @@ crit_eu_main_title_grounds_criminal_conv_eo=I artikkel 57 (1) i direktiv 2014/24 crit_eu_main_title_payment_taxes=I artikkel 57 (2) i direktiv 2014/24/EU fastsettes følgende avvisningsgrunner: crit_eu_main_title_payment_taxes_eo=I artikkel 57 (2) i direktiv 2014/24/EU fastsettes følgende avvisningsgrunner: crit_eu_text_agreement_economic=Har leverandør inngått avtale(r) med andre leverandører med hensikt å vri konkurransen? -crit_eu_text_arrangement_creditors=Er leverandøren i en hvor han har fått tvungen gjeldsordning? Angi hvorfor man under nevnte omstendigheter likevel er i stand til å utføre kontrakten, tatt i betraktning gjeldende nasjonale bestemmelser og tiltak vedrørende fortsettelse av forretningsaktivitetene? Det er ikke nødvendig å angi disse opplysningene hvis avvisning av leverandørerer gjort obligatorisk i henhold til gjeldende nasjonal rett uten mulighet for unntak. +crit_eu_text_arrangement_creditors=Er leverandøren i en situasjon hvor han har fått tvungen gjeldsordning? Angi hvorfor man under nevnte omstendigheter likevel er i stand til å utføre kontrakten, tatt i betraktning gjeldende nasjonale bestemmelser og tiltak vedrørende fortsettelse av forretningsaktivitetene? Det er ikke nødvendig å angi disse opplysningene hvis avvisning av leverandørerer gjort obligatorisk i henhold til gjeldende nasjonal rett uten mulighet for unntak. crit_eu_text_bankrupt=Er leverandøren i en konkurssituasjon? Angi hvorfor man under nevnte omstendigheter likevel er i stand til å utføre kontrakten, tatt i betraktning gjeldende nasjonale bestemmelser og tiltak vedrørende fortsettelse av forretningsaktivitetene? Det er ikke nødvendig å angi disse opplysningene hvis avvisning av leverandørerer gjort obligatorisk i henhold til gjeldende nasjonal rett uten mulighet for unntak. crit_eu_text_breaching_obligations_environmental=Er leverandøren kjent med å ha begått brudd på bestemmelser om miljø slik som de fremgår av nasjonal rett, den relevante kunngjøringen eller anskaffelsesdokumentene eller artikkel 18 (2) i direktiv 2014/24/EU. crit_eu_text_breaching_obligations_labour=Er leverandøren kjent med å ha begått brudd på bestemmelser om arbeidsforhold slik som de fremgår av nasjonal rett, den relevante kunngjøringen eller anskaffelsesdokumentene eller artikkel 18 (2) i direktiv 2014/24/EU. @@ -412,9 +412,9 @@ crit_eu_text_involvement=Har leverandør eller en virksomhet tilknyttet leverand crit_eu_text_liquidator=Angi hvorfor man under nevnte omstendigheter likevel er i stand til å utføre kontrakten, tatt i betraktning gjeldende nasjonale bestemmelser og tiltak vedrørende fortsettelse av forretningsaktivitetene? Det er ikke nødvendig å angi disse opplysningene hvis avvisning av leverandørerer gjort obligatorisk i henhold til gjeldende nasjonal rett uten mulighet for unntak. crit_eu_text_money_laundering=Er leverandøren selv eller en person, som er medlem av leverandørens administrasjons-, ledelses- eller kontrollorgan eller har kompetanse til å representere eller kontrollere eller treffe beslutninger i slike organer, ved rettskraftig dom blitt dømt for hvitvasking av penger eller finansiering av terrorisme ved en dom avsagt for ikke mer enn fem år siden, eller en avvisningsperiode fastsatt direkte i dommen som fortsatt gjelder?

Hvitvasking av penger eller finansiering av terrorismeSom definert i artikkel 1 i Europaparlamentets og Rådets direktiv 2005/60/EF av 26. oktober 2005 om forebyggende tiltak mot bruk av det finansielle system til hvitvasking av penger og finansiering av terrorisme (EUT L 309 av 25.11.2005, s. 15).

crit_eu_text_national_bankruptcy=Er leverandøren i en situasjon hvor han har fått tvungen gjeldsordning? Angi hvorfor man under nevnte omstendigheter likevel er i stand til å utføre kontrakten, tatt i betraktning gjeldende nasjonale bestemmelser og tiltak vedrørende fortsettelse av forretningsaktivitetene? Det er ikke nødvendig å angi disse opplysningene hvis avvisning av leverandørerer gjort obligatorisk i henhold til gjeldende nasjonal rett uten mulighet for unntak. -crit_eu_text_payment_social_security=Har leverandør oppfylt alle sine forpliktelser til å betale trygdeavgifter både i det land han er etablert i, og i oppdragsgivers medlemsstat, hvis dette er et annet land enn det han er etablert i? -crit_eu_text_payment_taxes=Har leverandør oppfylt alle sine forpliktelser til å betale skatter og avgifter både i det land han er etablert i, og i oppdragsgivers medlemsstat, hvis dette er et annet land enn det han er etablert i? -crit_eu_text_purely_national=Andre avvisningsgrunner som måtte være fastsatt i oppdragsgviers nasjonale lovgivning. rdregivende myndighets eller den ordregivende enhets medlemsstats lovgivning. Får de rent nasjonale avvisningsgrunnene, som er angitt i den relevante kunngjøringen eller i anskaffelsesdokumentene, anvendelse? +crit_eu_text_payment_social_security=Har leverandør unnlatt å oppfylle alle sine forpliktelser til å betale trygdeavgifter både i det land han er etablert i, og i oppdragsgivers medlemsstat, hvis dette er et annet land enn det han er etablert i? +crit_eu_text_payment_taxes=Har leverandøren unnlatt å oppfylle sine forpliktelser til å betale skatter og avgifter i det land han er etablert i, og i oppdragsgivers medlemsstat, hvis dette er et annet land enn det han er etablert i? +crit_eu_text_purely_national=Huk av dersom det er angitt nasjonale avvisningsgrunner i kunngjøringen eller i anskaffelsesdokumentene. crit_eu_text_suspended_business=Angi hvorfor man under nevnte omstendigheter likevel er i stand til å utføre kontrakten, tatt i betraktning gjeldende nasjonale bestemmelser og tiltak vedrørende fortsettelse av forretningsaktivitetene? Det er ikke nødvendig å angi disse opplysningene hvis avvisning av leverandørerer gjort obligatorisk i henhold til gjeldende nasjonal rett uten mulighet for unntak. crit_eu_text_terrorist=Er leverandøren selv eller en person, som er medlem av leverandørens administrasjons-, ledelses- eller kontrollorgan eller har kompetanse til å representere eller kontrollere eller treffe beslutninger i slike organer, ved rettskraftig dom blitt dømt for terrorhandlinger eller straffbare handlinger med forbindelse til terroraktivitetved en dom avsagt for ikke mer enn fem år siden, eller en avvisningsperiode fastsatt direkte i dommen som fortsatt gjelder?

Terrorhandlinger eller straffbare handlinger med forbindelse til terroraktivitet som definert i artikkel 1 og 3 i Rådets rammeavgjørelse 2002/475/RIA av 13. juni 2002 om bekjempelse av terrorisme (EFT L 164 af 22.6.2002, s. 3). Denne avvisningsgrunnen omfatter også oppfordring til, medvirkning til eller forsøk på å begå slike handlinger som omhandlet i artikkel 4 i nevnte rammeavgjørelse.

crit_eu_title_agreement_economic=Avtale(r) med andre leverandører med hensikt å vri konkurransen @@ -436,11 +436,11 @@ crit_eu_title_guilty_misconduct=Alvorlige feil i yrkesutøvelsen crit_eu_title_guilty_misconduct_eo=Har leverandøren begått alvorlige feil i yreksutøvelsenr? crit_eu_title_guilty_misinterpretation=Grovt uriktige opplysninger, unnlatt å gi opplysninger, ute av stand til å fremlegge etterspurte støttedokumenterog misvisende opplysninger som kan få innfytelse på konkurransen crit_eu_title_insolvency=Insolvens -crit_eu_title_involvement=Har leverandøren vært involvert iplanleggingenav konkurransen? +crit_eu_title_involvement=Har leverandøren vært involvert i planleggingen av konkurransen? crit_eu_title_involvement_eo=Har leverandør eller en virksomhet tilknyttet leverandøren gitt råd til oppdragsgiver eller på annen måte vært involvert i planleggingen av konkurransen? crit_eu_title_liquidator=Er leverandøren i en situasjon hvor han har sine aktiva forvaltet av en konkursforvalter eller av retten? crit_eu_title_money_laundering=Hvitvasking av penger eller finansiering av terrorisme -crit_eu_title_national_bankruptcy=Er leverandøren iI en lignende situasjon i henhold til en tilsvarende prosedyre som er fastsatt i nasjonal rett? Se nasjonal rett, den relevante kunngjøring eller anskaffelsesdokumentene. +crit_eu_title_national_bankruptcy=Er leverandøren i en lignende situasjon i henhold til en tilsvarende prosedyre som er fastsatt i nasjonal rett? Se nasjonal rett, den relevante kunngjøring eller anskaffelsesdokumentene. crit_eu_title_payment_social_security= Betaling av trygdeavgifter crit_eu_title_payment_taxes=Betaling av skatter og avgifter crit_eu_title_purely_national=Rent nasjonale avvisningsgrunner @@ -450,11 +450,11 @@ crit_eu_tooltip_guilty_misconduct_eo=Hvis det er relevant ta i betraktning gjeld crit_explain_certificates_independent_environmental_description=Hvis ikke, vennligst forklar hvorfor og angi hvilke andre former for bevis vedrørende miljøledelsessystemer eller -standarder som kan fremlegges: crit_explain_certificates_independent_quality_description=Hvis ikke, vennligst forklar hvorfor, og angi hvilke andre former for bevis vedrørende kvalitetssikringsstandarder som kan fremlegges: crit_explain_supply_contracts_quality_description=Hvis ikke, forklar hvorfor, og angi, hvilke andre former for bevis som kan leveres: -crit_information_available_electronically=Er disse oplysninger tilgjengelige i elektronisk form? +crit_information_available_electronically=Er disse opplysningene tilgjengelige i elektronisk form? crit_length_period_exclusion=I den grad det er uttrykkelig fastsat i dommen: Avvisningsperiodens varighet crit_number=Nummer crit_other_than_judicial_or_administrative_decision=Har den manglende oppfyllelsen av forpliktelsene blitt konstantert på andre måter enn ved en rettslig eller administrativ avgjørelse? -crit_please_describe_them=Vennligst beskriv de gjennomførte tiltakene +crit_please_describe_them=Vennligst beskriv crit_please_specify=Vennligst spesifiser crit_ratio=Nøkkeltall crit_reason=Grunn(er) for domfellelse @@ -462,7 +462,7 @@ crit_reasons_nevertheless_contract=Angi hvorfor man under nevnte omstendigheter crit_recipients=Mottakere crit_selection_ca_declares_that=Når det gjelder kvalifikasjonskravene erklærer oppdragsgiver crit_selection_ca_economic_article=I artikkel 58 (3) i direktiv 2014/24/EU fastsettes følgende kvalifikasjonskrav: -crit_selection_declares_that_tooltip=Leverandøren skal bare fylle ut dette feltet hvis oppdragsgiver har angitt i kunngjøringen eller i anskaffelsesdokumentene referert til i kunngjøringen at leverandørene kan nøye seg med å fylle ut avsnitt a i del IV og ikke behøver å fylle ut andre avsnitt i del IV: +crit_selection_declares_that_tooltip=Leverandøren skal bare fylle ut dette feltet hvis oppdragsgiver har angitt i kunngjøringen, eller i anskaffelsesdokumentene referert til i kunngjøringen, at leverandørene kan nøye seg med å fylle ut avsnitt a i del IV og ikke behøver å fylle ut andre avsnitt i del IV (A-D). crit_selection_economic_average_yearly_turnover_description=Leverandørens gjennomsnittlige årsomsetning for det antall år som det anmodes om i kunngjøringen eller i anskaffelsesdokumentene er som følger: crit_selection_economic_average_yearly_turnover_main=Gjennomsnittlig årsomsetning crit_selection_economic_financial_ratio_description=Når det gjelder finansielle nøkkeltall som er angitt i kunngjøringen eller i anskaffelsesdokumentene erklærer leverandøren at den eller de faktiske verdien(e) for det eller de nøkkeltall(ene) som det anmodes om er som følger: @@ -503,7 +503,7 @@ crit_selection_quality_certificate_independent_bodies_quality_description=Kan le crit_selection_quality_certificate_independent_bodies_quality_main=Attester utstedt av uavhengige organer for kvalitetssikringsstandarder crit_selection_satisfies_all_criteria=Leverandøren oppfyller de angitte kvalifikasjonskravene: crit_selection_suitability_article=I artikkel 58 (2) i direktiv 2014/24/EU fastsettes følgende kvalifikasjonskrav: -crit_selection_suitability_article_tooltip=Leverandøren skal bare fylle ut dette feltet hvis oppdragsgiver har angitt i kunngjøringen eller i anskaffelsesdokumentene referert til i kunngjøringen at leverandørene kan nøye seg med å fylle ut avsnitt a i del IV og ikke behøver å fylle ut andre avsnitt i del IV: +crit_selection_suitability_article_tooltip=Leverandøren skal bareangi opplysningene hvis oppdragsgiver i kunngjøringen, eller i anskaffelsesdokumentene referert til i kunngjøringen, har opplyst at disse kvalifikasjonskravene kreves oppfylt. crit_selection_suitability_enrolment_professional_register_description=Leverandør er registrert i et faglig register i medlemsstaten som leverandøren er etablert i. Som beskrevet i bilag XI til direktiv 2014/24/EU; leverandører fra visse medlemsstater kan være nødt til å oppfylle andre krav i nevnte bilag. crit_selection_suitability_enrolment_professional_register_main=Registrert i faglig register crit_selection_suitability_enrolment_trade_register_description=Leverandør er registrert i et foretaksregister eller et handelsregister i medlemsstaten som leverandøren er etablert i. Som beskrevet i bilag XI til direktiv 2014/24/EU; leverandører fra visse medlemsstater kan være nødt til å oppfylle andre krav i nevnte bilag. @@ -528,7 +528,7 @@ crit_selection_technical_service_contracts_performance_services_description=Bare crit_selection_technical_service_contracts_performance_services_main=Bare for tjenester crit_selection_technical_study_research_facilities_description=Leverandørens undersøkelses- og forskningsfasiliter er som følger: crit_selection_technical_study_research_facilities_main=Undersøkelses- og forskningsfasiliteter -crit_selection_technical_subcontracting_proportion_description=Leverandør vurdere å sette bort følgende del (i prosent) av kontrakten til underleverandører. Legg merke til at hvis leverandøren har besluttet å sette bort en del av kontrakten til underleverandører og støtter seg på underleverandørenes kapasitet til å utføre denne del, utfylles et særskilt ESPD for slike underleverandører, se del II, avsnitt C, ovenfor. +crit_selection_technical_subcontracting_proportion_description=Leverandør vurderer å sette bort følgende del (i prosent) av kontrakten til underleverandører. Legg merke til at hvis leverandøren har besluttet å sette bort en del av kontrakten til underleverandører og støtter seg på underleverandørenes kapasitet til å utføre denne del, utfylles et særskilt ESPD for slike underleverandører, se del II, avsnitt C, ovenfor. crit_selection_technical_subcontracting_proportion_main=Andel av kontrakt til underleverandør crit_selection_technical_supply_chain_management_description=Leverandøren vil være i stand til å anvende følgende styring av leveringskjeden og sporingssystemer ved gjennomføring av kontrakten: crit_selection_technical_supply_chain_management_main=Styring og sporing av leveransekjeden @@ -538,8 +538,8 @@ crit_selection_technical_supply_contracts_performance_deliveries_description=Bar crit_selection_technical_supply_contracts_performance_deliveries_main=Bare for offentlige vareleveranser crit_selection_technical_supply_contracts_with_ca_description=Ved anskaffelse av varer: Hvis det etterspørres, erklærer leverandøren videre at denne vil levere de etterspurte attestene for at de er ekte. crit_selection_technical_supply_contracts_with_ca_main=Ved anskaffelser av varer: Etterspurte prøver, beskrivelser eller fotografier med attester . -crit_selection_technical_supply_contracts_without_ca_description=Ved anskaffelser av varer: Leverandøren fremlegger for de varer som skal leveres, etterspurte prøver, beskrivelser eller fotografier, som ikke behøver å være ledsaget av attester for at de er ekte. -crit_selection_technical_supply_contracts_without_ca_main=Ved anskaffelser av varer: Etterspurte prøver, beskrivelser eller fotografier, som ikke behøver å være ledsaget av attester for at de er ekte. +crit_selection_technical_supply_contracts_without_ca_description=Ved anskaffelser av varer: Leverandøren fremlegger for de varer som skal leveres, etterspurte prøver, beskrivelser eller fotografier, som ikke behøver å være ledsaget av attester for at de er ekte +crit_selection_technical_supply_contracts_without_ca_main=Ved anskaffelser av varer: Etterspurte prøver, beskrivelser eller fotografier, som ikke behøver å være ledsaget av attester for at de er ekte crit_selection_technical_technical_facilities_measures_description=Leverandøren anvender følgende tekniske fasiliteter og kvalitetssikringstiltak, og leverandørens undersøkelses- og forskningsfasiliter er som følger: crit_selection_technical_technical_facilities_measures_main=tekniske fasiliteter og kvalitetssikringstiltak crit_selection_technical_technicians_technical_bodies_description=Leverandør kan råde over følgende tekniske personell eller tekniske enheter , særlig dem som er ansvarlige for kvalitetskontrollen: For teknisk personell eller tekniske enheter som ikke direkte hører til leverandørens virksomhet, men hvis kapasitet leverandøren støtter seg på, jf. del II, avsnitt C, skal det utfylles særskilte ESPD-formularer. @@ -551,7 +551,7 @@ crit_selection_technical_work_contracts_performance_works_main=Bare for bygg- og crit_selection_technical_work_contracts_technicians_description=I forbindelse med offentlige bygge- og anleggsarbeider kan leverandøren råde over følgende tekniske personell eller tekniske enheter til å utføre kontrakten: crit_selection_technical_work_contracts_technicians_main=For offentlige bygge- og anleggsarbeider, teknisk personell eller enheter som skal utføre arbeidet crit_taken_self_cleaning_measures=Har leverandør gjennomført tiltak som viser at han likevel har den nødvendige integritet som kontraktspart ("selvrehabilitering")? -crit_taxes_eo_fulfilled_obligations=Har leverandøren oppfylt sine forpliktelser ved å betale eller inngå en bindende betalingsavtale for å betale skyldige skatter, avgifter eller trygdeavgifter, inkludert eventuelle renter og bøter. +crit_taxes_eo_fulfilled_obligations=Har leverandøren misligholdt sine forpliktelser ved å betale eller inngå en bindende betalingsavtale for å betale skyldige skatter, avgifter eller trygdeavgifter, inkludert eventuelle renter og bøter. crit_taxes_length_period_of_exclusion= I tilfelle av en dom, dersom det uttrykkelig er fastsatt i denne, varigheten på avvisningsperioden crit_taxes_means_description=Vennligst beskriv på hvilke måter crit_top_title_grounds_criminal_conv=A: AVVISNINGSGRUNNER SOM GJELDER STRAFFEDOMMER @@ -578,16 +578,16 @@ faq_leaflet=Ofte stilte spørsmål faq_text_answers=Hvis du ønsker å se svar på de oftest stilte spørsmål om ESPD, vennligst gå til filter_alert=

Det europeiske egenerklæringsskjemaet (ESPD) er leverandørens egenerklæring om sin virksomhets økonomiske og finansielle kapasitet, tekniske og faglige kvalifikasjoner og egnethet for den kunngjorte konkurransen.

Skjemaet er tilgjengelig på alle EØS-språk og brukes som en foreløpig dokumentasjon for at leverandøren oppfyller kvalifikasjonskravene, at det ikke foreligger grunner for avvisning og at han oppfyller aktuelle utvelgelseskriterier.

ESPD-skjemaet er en forenkling for leverandørene, da de ikke lenger trenger å levere dokumentasjonsbevis sammen med tilbudet eller forespørselen om deltakelse i konkurransen. Bestemmelsene om elektronisk ESPD trer 1. januar 2017.

Denne ESPD-tjenesten er gratis å bruke. Skjemaet fylles ut elektronisk. Skjemaet kan enten sendes oppdragsgiver elektronisk eller skrives ut og sendes som en PDF sammen med tilbudet/forespørselen om deltakelse i konkurransen. Tidligere innleverte ESPD-skjemaer kan gjenbrukes så lenge all informasjon fortsatt er gyldig og korrekt.

Leverandøren kan bli avvist fra konkurransen, eller bli rettsforfulgt dersom avgitt informasjon er alvorlig misledende, tilbakeholdt eller ikke kan dokumenteres.

filter_create_espd=Opprette en ny ESPD-forespørsel -filter_create_response=Fyll ut ESPD-skjema +filter_create_response=Lag en generisk ESPD-erklæring filter_header=Velkommen til den elektroniske ESPD-tjenesten filter_i_am_ca=Jeg er offentlig oppdragsgiver filter_i_am_eop=Jeg er leverandør -filter_import_espd=Importere ESPD-forespørsel for denne konkurransen -filter_merge_espds=Flett ESPD-forespørsel med et eksisterende ESPD-skjema. +filter_import_espd=Importere ESPD-forespørsel for den aktuelle konkurransen +filter_merge_espds=Flett ESPD-forespørsel med en eksisterende ESPD-erklæring filter_reuse_espd=Gjenbruke en tidligere ESPD-forespørsel -filter_review_espd=Vis ESPD-skjema fra leverandør +filter_review_espd=Vise ESPD-erklæring fra leverandør filter_select_country=Velg land -filter_ted_reception_id_placeholder=Oppgi TED referansenummer +filter_ted_reception_id_placeholder=Ikke i bruk for norske kunngjøringer filter_upload_document=Last opp fil filter_upload_documents=Last opp filer filter_upload_request=Last opp oppdragsgivers ESPD-forespørsel @@ -623,12 +623,12 @@ tooltip_ca_ref_buyer=Jeg har rollen som offentlig oppdragsgiver i denne konkurra tooltip_eo_can_reuse_espd=Leverandøren kan gjenbruke opplysninger fra et tidligere brukt ESPD-skjema. ESPD-tjenesten vil slå sammen det "gamle" skjemaet med den ESPD-forespørselen fra oppdragsgiver i denne konkurransen. tooltip_eo_ref_suppl=Jeg har rollen som leverandør i denne konkurransen tooltip_espd_used_both_ca_eo=Denne tjenesten kan brukes av både oppdragsgiver og leverandører. Velg alternativet som tilsvarer din rolle i denne anskaffelsen. -tooltip_filter_create_response=Opprett nytt ESPD-skjema -tooltip_filter_eo_can_import_espd=Her laster du opp denne konkurransens ESPD-forespørsel. Dette valget må kombineres med valget "Fyll ut ESPD-skjema". -tooltip_filter_eo_merge_espds=Tjenesten fletter denne konkurransens ESPD-forespørsel med et tidligere utfylt ESPD-skjema. Begge disse lastes opp under. +tooltip_filter_create_response=Her kan du bygge opp en generisk ESPD-erklæring som du kan gjenbruke i de fleste konkurranser. +tooltip_filter_eo_can_import_espd=Her laster du opp denne konkurransens ESPD-forespørsel. Du kan se ESPD-forespørselen fra oppdragsgiver, og eventuelt også besvare den direkte. +tooltip_filter_eo_merge_espds=Her fletter du den aktuelle konkurransens ESPD-forespørsel med en tidligere utfylt ESPD-erklæring. Last opp filene i feltene nederst på siden. tooltip_overview_received_espds=Denne funksjonen gir en oversikt over innleverte ESPD-skjema i en nærmere angitt konkurranse tooltip_review_espd=Oppdragsgiver kan laste opp for å lese/kontrollere innlevert ESPD-skjema. -tooltip_ted_reception_id= Oppdragsgiver mottar en e-post fra TED med et referansenummer som kan benyttes for å legge inn opplysninger om den aktuelle anskaffelsen og oppdragsgivers virksomhet. +tooltip_ted_reception_id=Feltet refererer til et nummer som norske oppdragsgivere per i dag ikke har tilgang til, og feltet skal inntil videre ikke brukes. validator_accept=Vennligst skriv inn en gyldig verdi med gyldig utløpsdato validator_creditcard=Vennligst skriv inn ett gyldig kredittkortnummer validator_date=Vennligst skriv inn en gyldig dato From e8533adc6d60d095e1fb88d240ada327c73b554c Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Thu, 19 Jan 2017 15:08:00 +0100 Subject: [PATCH 02/24] #121 prefill parameters for start page --- .../grow/espd/controller/EspdController.java | 14 +++-- .../controller/EspdPrefillParameters.java | 63 +++++++++++++++++++ .../ec/grow/espd/domain/EspdDocument.java | 2 + .../resources/WEB-INF/views/filter.jsp | 27 ++++---- 4 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdPrefillParameters.java diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java index ec0cfec96..1dd431c32 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java @@ -101,9 +101,15 @@ public String index() { return WELCOME_PAGE; } - @RequestMapping("/{page:filter|contact}") - public String getPage(@PathVariable String page) { - return page; + @GetMapping("/contact") + public String viewContactPage() { + return "contact"; + } + + @GetMapping("/filter") + public String viewFilterPage(@ModelAttribute("espdPrefill") EspdPrefillParameters prefillParameters) { + + return "filter"; } @RequestMapping(value = "/welcome") @@ -218,7 +224,7 @@ public String importEspdAsEo( return redirectToPage(RESPONSE_EO_PROCEDURE_PAGE); } } catch (TedNoticeException e) { - result.rejectValue("attachments", "error_ted_notice_not_supported"); + result.rejectValue("attachments", "error_ted_notice_not_supported"); return "filter"; } diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdPrefillParameters.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdPrefillParameters.java new file mode 100644 index 000000000..ca78c4f59 --- /dev/null +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdPrefillParameters.java @@ -0,0 +1,63 @@ +/* + * + * Copyright 2016 EUROPEAN COMMISSION + * + * Licensed under the EUPL, Version 1.1 or – as soon they + * will be approved by the European Commission - subsequent + * versions of the EUPL (the "Licence"); + * + * You may not use this work except in compliance with the Licence. + * + * You may obtain a copy of the Licence at: + * + * https://joinup.ec.europa.eu/community/eupl/og_page/eupl + * + * Unless required by applicable law or agreed to in + * writing, software distributed under the Licence is + * distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the Licence for the specific language governing + * permissions and limitations under the Licence. + * + */ + +package eu.europa.ec.grow.espd.controller; + +import eu.europa.ec.grow.espd.domain.EconomicOperatorImpl; +import eu.europa.ec.grow.espd.domain.PartyImpl; +import eu.europa.ec.grow.espd.domain.enums.other.Country; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; + +/** + * Created by ratoico on 1/19/17. + */ +@Data +class EspdPrefillParameters { + + private String agent; + + private String action; + + private Country country; + + private String whoAreYou; + + private String tedReceptionId; + + private PartyImpl authority; + + private EconomicOperatorImpl economicOperator; + + //trick to use List of MultipartFile as @RequestParam + public void setAttachments(List attachments) throws IOException { + } + + public List getAttachments() { + return null; + } +} diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java index 1df1c2bb0..87a59f974 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java @@ -155,6 +155,8 @@ public List getAttachments() { return null; } + private String agent; + public final boolean atLeastOneSelectionCriterionWasSelected() { boolean atLeastOnePresent = false; for (SelectionCriterion ccvCriterion : diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp index ba7bdced8..b2ba901f1 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp @@ -65,7 +65,7 @@ $(function() { - +
@@ -112,24 +112,24 @@ $(function() { -
- +
+
-
- +
+
- +
-
+

${span18n['filter_what_you_do']}

- +
@@ -138,18 +138,17 @@ $(function() {
- <%--
 
--%>
- +
- +
 
@@ -159,17 +158,17 @@ $(function() {

- +
- +
- +
From 2300b10b34c960dc587781c1c3fa4d75b0d2ea7f Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Fri, 20 Jan 2017 15:45:11 +0100 Subject: [PATCH 03/24] #141 added 240 min timeout --- espd-web/src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espd-web/src/main/webapp/WEB-INF/web.xml b/espd-web/src/main/webapp/WEB-INF/web.xml index c52d747f6..ca334f221 100644 --- a/espd-web/src/main/webapp/WEB-INF/web.xml +++ b/espd-web/src/main/webapp/WEB-INF/web.xml @@ -7,6 +7,6 @@ /WEB-INF/views/500.jsp - 120 + 240 \ No newline at end of file From 4696bd82125e6d98dfd4f60b1630c1389e4d194a Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Fri, 20 Jan 2017 15:46:07 +0100 Subject: [PATCH 04/24] #126 Added condition to use espd.economicOperator.country for EO or espd.authority.country for CA --- .../resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp index 872a2d89d..60c829293 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp @@ -47,7 +47,7 @@ $("input:radio[data-target-hide]").change(dataHide); sortDropdowns(); - var ecertisHandler = EcertisHandler("${ecertisCriterionURL}", "${espd.authority.country.iso2Code}") + var ecertisHandler = EcertisHandler("${ecertisCriterionURL}", "${agent == 'eo' ? espd.economicOperator.country.iso2Code : espd.authority.country.iso2Code}") $('.ecertis-link-header').click(ecertisHandler); }); From 66778ae2bf9ef6965c38336aa19593139222128c Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Fri, 20 Jan 2017 15:14:20 +0100 Subject: [PATCH 05/24] #122 generate xml, pdf and zip files on the overview page --- .../grow/espd/controller/EspdController.java | 120 +++++++----- .../tenderned/exception/ZipException.java | 35 ++++ .../ec/grow/espd/util/EspdExporter.java | 112 +++++++++++ .../ec/grow/espd/xml/EspdXmlExporter.java | 122 ++++++++++++ .../ec/grow/espd/xml/EspdXmlImporter.java | 183 ++++++++++++++++++ .../common/footerButtons.jsp | 78 ++++++-- .../resources/WEB-INF/views/print.jsp | 3 +- .../resources/WEB-INF/views/wizard/finish.jsp | 45 ++--- .../main/resources/i18n/messages.properties | 3 + espd-web/src/main/resources/tiles.xml | 10 +- .../src/main/resources/zipInstructions.txt | 1 + 11 files changed, 618 insertions(+), 94 deletions(-) create mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/tenderned/exception/ZipException.java create mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java create mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlExporter.java create mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlImporter.java create mode 100644 espd-web/src/main/resources/zipInstructions.txt diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java index ec0cfec96..169062590 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java @@ -34,18 +34,17 @@ import eu.europa.ec.grow.espd.ted.TedRequest; import eu.europa.ec.grow.espd.ted.TedResponse; import eu.europa.ec.grow.espd.ted.TedService; -import eu.europa.ec.grow.espd.tenderned.HtmlToPdfTransformer; import eu.europa.ec.grow.espd.tenderned.UnescapeHtml4; import eu.europa.ec.grow.espd.tenderned.exception.PdfRenderingException; import eu.europa.ec.grow.espd.tenderned.exception.TedNoticeException; -import eu.europa.ec.grow.espd.xml.EspdExchangeMarshaller; +import eu.europa.ec.grow.espd.util.EspdExporter; +import eu.europa.ec.grow.espd.xml.EspdXmlImporter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.beans.propertyeditors.CustomNumberEditor; import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; @@ -76,19 +75,18 @@ class EspdController { private static final String WELCOME_PAGE = "welcome"; private static final String REQUEST_CA_PROCEDURE_PAGE = "request/ca/procedure"; private static final String RESPONSE_EO_PROCEDURE_PAGE = "response/eo/procedure"; - private static final String PRINT_PAGE = "response/eo/print"; + private static final String OVERVIEW_PAGE = "response/eo/overview"; private static final String SESSION_EXPIRED_PAGE = "sessionExpired"; - private final EspdExchangeMarshaller exchangeMarshaller; + private final EspdXmlImporter xmlImporter; + private final EspdExporter espdExporter; private final TedService tedService; - private final HtmlToPdfTransformer pdfTransformer; @Autowired - EspdController(EspdExchangeMarshaller exchangeMarshaller, TedService tedService, - HtmlToPdfTransformer pdfTransformer) { - this.exchangeMarshaller = exchangeMarshaller; + EspdController(EspdXmlImporter xmlImporter, EspdExporter espdExporter, TedService tedService) { + this.xmlImporter = xmlImporter; + this.espdExporter = espdExporter; this.tedService = tedService; - this.pdfTransformer = pdfTransformer; } @ModelAttribute("espd") @@ -159,7 +157,7 @@ public String reuseRequestAsCA( Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { - Optional espd = exchangeMarshaller.importEspdRequest(is); + Optional espd = xmlImporter.importEspdRequest(is); if (espd.isPresent()) { EspdDocument espdGot = espd.get(); espdGot.setExtendCe("ce".equals(agent)); @@ -180,12 +178,12 @@ public String reviewResponseAsCA( Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { - Optional espd = exchangeMarshaller.importEspdResponse(is); + Optional espd = xmlImporter.importEspdResponse(is); if (espd.isPresent()) { EspdDocument espdGot = espd.get(); espdGot.setExtendCe("ce".equals(agent)); model.addAttribute("espd", espdGot); - return redirectToPage(PRINT_PAGE); + return redirectToPage(OVERVIEW_PAGE); } } @@ -201,7 +199,7 @@ public String importEspdAsEo( Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { - Optional wrappedEspd = exchangeMarshaller.importAmbiguousEspdFile(is); + Optional wrappedEspd = xmlImporter.importAmbiguousEspdFile(is); // how can wrappedEspd be null??? if (wrappedEspd != null && wrappedEspd.isPresent()) { @@ -218,7 +216,7 @@ public String importEspdAsEo( return redirectToPage(RESPONSE_EO_PROCEDURE_PAGE); } } catch (TedNoticeException e) { - result.rejectValue("attachments", "error_ted_notice_not_supported"); + result.rejectValue("attachments", "error_ted_notice_not_supported"); return "filter"; } @@ -238,7 +236,7 @@ public String mergeTwoEspds( BindingResult result) throws IOException { try (InputStream reqIs = attachments.get(1).getInputStream(); InputStream respIs = attachments.get(2).getInputStream()) { - Optional wrappedEspd = exchangeMarshaller.mergeEspdRequestAndResponse(reqIs, respIs); + Optional wrappedEspd = xmlImporter.mergeEspdRequestAndResponse(reqIs, respIs); if (wrappedEspd.isPresent()) { model.addAttribute("espd", wrappedEspd.get()); return redirectToPage(RESPONSE_EO_PROCEDURE_PAGE); @@ -264,7 +262,7 @@ public String createNewResponseAsEO( return redirectToPage(RESPONSE_EO_PROCEDURE_PAGE); } - @GetMapping("/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish|print}") + @GetMapping("/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish|overview}") public String view( @PathVariable String flow, @PathVariable String agent, @@ -273,7 +271,7 @@ public String view( return flow + "_" + agent + "_" + step; } - @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish|print}", params = "prev") + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish|overview}", params = "prev") public String previous( @PathVariable String flow, @PathVariable String agent, @@ -285,16 +283,15 @@ public String previous( flow + "_" + agent + "_" + step : redirectToPage(flow + "/" + agent + "/" + prev); } - @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish}", params = "print") - public String print( + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:finish}", params = "overview") + public String overview( @PathVariable String flow, @PathVariable String agent, @PathVariable String step, - @RequestParam String print, @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { return bindingResult.hasErrors() ? - flow + "_" + agent + "_" + step : redirectToPage(flow + "/" + agent + "/print"); + flow + "_" + agent + "_" + step : redirectToPage(flow + "/" + agent + "/overview"); } @PostMapping(value = "/{flow:request|response}/eo/procedure", params = "add") @@ -398,7 +395,7 @@ private String removeMultipleReference(UnboundedRequirementGroup espdCriterion, return redirectToPage(flow + "/eo/selection" + referenceHash + referencePosition); } - @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish|generate}", + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish}", params = "next") public String next( @PathVariable String flow, @@ -416,17 +413,48 @@ public String next( return flow + "_" + agent + "_" + step; } - if (!"generate".equals(next)) { - return redirectToPage(flow + "/" + agent + "/" + next); + return redirectToPage(flow + "/" + agent + "/" + next); + } + + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:overview}", params = "download=xml") + public String downloadXmlFile( + @PathVariable String flow, + @PathVariable String agent, + @PathVariable String step, + @ModelAttribute("espd") EspdDocument espd, + HttpServletResponse response) throws IOException { + response.setContentType(APPLICATION_XML_VALUE); + ByteArrayOutputStream out = espdExporter.exportAsXml(espd, agent); + serveFileForDownload(out, agent, "xml", response); + + return null; + } + + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:overview}", params = "download=pdf") + public String downloadPdf( + @PathVariable String flow, + @PathVariable String agent, + @PathVariable String step, + @ModelAttribute("espd") EspdDocument espd, + HttpServletResponse response, + BindingResult bindingResult, + Model model) throws PdfRenderingException, IOException { + + if (bindingResult.hasErrors()) { + return flow + "_" + agent + "_" + step; } - downloadEspdFile(agent, espd, response); + espd.setHtml(addHtmlHeader(espd.getHtml())); + + ByteArrayOutputStream pdfOutput = espdExporter.exportAsPdf(espd, agent); + + serveFileForDownload(pdfOutput, agent, "pdf", response); return null; } - @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:print}", params = "next=savePrintHtml") - public String printPDF( + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:overview}", params = "download=zip") + public String downloadZip( @PathVariable String flow, @PathVariable String agent, @PathVariable String step, @@ -441,17 +469,23 @@ public String printPDF( espd.setHtml(addHtmlHeader(espd.getHtml())); - ByteArrayOutputStream pdfOutput = pdfTransformer.convertToPDF(espd.getHtml(), agent); + ByteArrayOutputStream zipOutputStream = espdExporter.exportAsZip(espd, agent); - String pdfFileName = "ca".equals(agent) ? "espd-request.pdf" : "espd-response.pdf"; - response.setContentType(MediaType.APPLICATION_PDF_VALUE); - response.setContentLength(pdfOutput.size()); - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, format("attachment; filename=\"%s\"", pdfFileName)); + serveFileForDownload(zipOutputStream, agent, "zip", response); + + return null; + } + + private void serveFileForDownload(ByteArrayOutputStream fileStream, String agent, String fileType, + HttpServletResponse response) throws IOException { + String fileName = "ca".equalsIgnoreCase(agent) ? "espd-request2." + fileType : "espd-response." + fileType; + response.setContentType("application/" + fileType); + response.setContentLength(fileStream.size()); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, format("attachment; filename=\"%s\"", fileName)); // Send content to Browser - response.getOutputStream().write(pdfOutput.toByteArray()); + response.getOutputStream().write(fileStream.toByteArray()); response.getOutputStream().flush(); - return null; } /** @@ -471,22 +505,6 @@ private static String redirectToPage(String pageName) { return "redirect:/" + pageName; } - private void downloadEspdFile(@PathVariable String agent, @ModelAttribute("espd") EspdDocument espd, - HttpServletResponse response) throws IOException { - response.setContentType(APPLICATION_XML_VALUE); - ByteArrayOutputStream out; - if ("eo".equals(agent)) { - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"espd-response.xml\""); - out = exchangeMarshaller.generateEspdResponse(espd); - } else { - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"espd-request.xml\""); - out = exchangeMarshaller.generateEspdRequest(espd); - } - response.setContentLength(out.size()); - response.getOutputStream().write(out.toByteArray()); - response.getOutputStream().flush(); - } - @InitBinder private void dateBinder(WebDataBinder binder) { SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/tenderned/exception/ZipException.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/tenderned/exception/ZipException.java new file mode 100644 index 000000000..8e701d4a5 --- /dev/null +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/tenderned/exception/ZipException.java @@ -0,0 +1,35 @@ +/* + * + * Copyright 2016 EUROPEAN COMMISSION + * + * Licensed under the EUPL, Version 1.1 or – as soon they + * will be approved by the European Commission - subsequent + * versions of the EUPL (the "Licence"); + * + * You may not use this work except in compliance with the Licence. + * + * You may obtain a copy of the Licence at: + * + * https://joinup.ec.europa.eu/community/eupl/og_page/eupl + * + * Unless required by applicable law or agreed to in + * writing, software distributed under the Licence is + * distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the Licence for the specific language governing + * permissions and limitations under the Licence. + * + */ + +package eu.europa.ec.grow.espd.tenderned.exception; + +/** + * Created by ratoico on 1/19/17. + */ +public final class ZipException extends RuntimeException { + + public ZipException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java new file mode 100644 index 000000000..0b5a6e41c --- /dev/null +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java @@ -0,0 +1,112 @@ +/* + * + * Copyright 2016 EUROPEAN COMMISSION + * + * Licensed under the EUPL, Version 1.1 or – as soon they + * will be approved by the European Commission - subsequent + * versions of the EUPL (the "Licence"); + * + * You may not use this work except in compliance with the Licence. + * + * You may obtain a copy of the Licence at: + * + * https://joinup.ec.europa.eu/community/eupl/og_page/eupl + * + * Unless required by applicable law or agreed to in + * writing, software distributed under the Licence is + * distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the Licence for the specific language governing + * permissions and limitations under the Licence. + * + */ + +package eu.europa.ec.grow.espd.util; + +import eu.europa.ec.grow.espd.domain.EspdDocument; +import eu.europa.ec.grow.espd.tenderned.HtmlToPdfTransformer; +import eu.europa.ec.grow.espd.tenderned.exception.PdfRenderingException; +import eu.europa.ec.grow.espd.tenderned.exception.ZipException; +import eu.europa.ec.grow.espd.xml.EspdXmlExporter; +import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ResourceLoader; +import org.springframework.stereotype.Component; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * Created by ratoico on 1/23/17. + */ +@Component +public class EspdExporter { + + private final EspdXmlExporter xmlExporter; + + private final HtmlToPdfTransformer pdfExporter; + + private final ResourceLoader resourceLoader; + + @Autowired + EspdExporter(EspdXmlExporter xmlExporter, HtmlToPdfTransformer pdfExporter, ResourceLoader resourceLoader) { + this.xmlExporter = xmlExporter; + this.pdfExporter = pdfExporter; + this.resourceLoader = resourceLoader; + } + + public ByteArrayOutputStream exportAsXml(EspdDocument espdDocument, String agent) { + if ("eo".equals(agent)) { + return xmlExporter.generateEspdResponse(espdDocument); + } else { + return xmlExporter.generateEspdRequest(espdDocument); + } + } + + public ByteArrayOutputStream exportAsPdf(EspdDocument espdDocument, String agent) throws PdfRenderingException { + return pdfExporter.convertToPDF(espdDocument.getHtml(), agent); + } + + public ByteArrayOutputStream exportAsZip(EspdDocument espdDocument, String agent) + throws PdfRenderingException, IOException { + try (ByteArrayOutputStream pdfOutput = pdfExporter.convertToPDF(espdDocument.getHtml(), agent); + ByteArrayOutputStream xmlOutput = exportAsXml(espdDocument, agent); + InputStream readMeStream = resourceLoader.getResource("classpath:zipInstructions.txt") + .getInputStream()) { + return zip(xmlOutput, pdfOutput, readMeStream); + } + } + + private ByteArrayOutputStream zip(ByteArrayOutputStream xmlOut, ByteArrayOutputStream pdfOut, + InputStream readmeStream) { + try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ZipOutputStream zipStream = new ZipOutputStream(baos)) { + addOutputStreamToZipFile(xmlOut, "espd.xml", zipStream); + addOutputStreamToZipFile(pdfOut, "espd.pdf", zipStream); + addInputStreamToZipFile(readmeStream, "README.txt", zipStream); + return baos; + } catch (IOException e) { + throw new ZipException("Error creating the ESPD archive.", e); + } + } + + private void addOutputStreamToZipFile(ByteArrayOutputStream out, String fileName, ZipOutputStream zipStream) + throws IOException { + ZipEntry zipEntry = new ZipEntry(fileName); + zipStream.putNextEntry(zipEntry); + out.writeTo(zipStream); + zipStream.closeEntry(); + } + + private void addInputStreamToZipFile(InputStream inputStream, String fileName, ZipOutputStream zipStream) + throws IOException { + ZipEntry zipEntry = new ZipEntry(fileName); + zipStream.putNextEntry(zipEntry); + IOUtils.copy(inputStream, zipStream); + zipStream.closeEntry(); + } +} diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlExporter.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlExporter.java new file mode 100644 index 000000000..ac6948856 --- /dev/null +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlExporter.java @@ -0,0 +1,122 @@ +/* + * + * Copyright 2016 EUROPEAN COMMISSION + * + * Licensed under the EUPL, Version 1.1 or – as soon they + * will be approved by the European Commission - subsequent + * versions of the EUPL (the "Licence"); + * + * You may not use this work except in compliance with the Licence. + * + * You may obtain a copy of the Licence at: + * + * https://joinup.ec.europa.eu/community/eupl/og_page/eupl + * + * Unless required by applicable law or agreed to in + * writing, software distributed under the Licence is + * distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the Licence for the specific language governing + * permissions and limitations under the Licence. + * + */ + +package eu.europa.ec.grow.espd.xml; + +import eu.europa.ec.grow.espd.domain.EspdDocument; +import eu.europa.ec.grow.espd.xml.request.exporting.UblRequestTypeTransformer; +import eu.europa.ec.grow.espd.xml.response.exporting.UblResponseTypeTransformer; +import grow.names.specification.ubl.schema.xsd.espdrequest_1.ESPDRequestType; +import grow.names.specification.ubl.schema.xsd.espdresponse_1.ESPDResponseType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.oxm.jaxb.Jaxb2Marshaller; +import org.springframework.stereotype.Component; + +import javax.xml.transform.stream.StreamResult; +import java.io.ByteArrayOutputStream; +import java.io.StringWriter; + +/** + * Class used to generate XML files containing ESPD Requests or Responses. + * + * Created by ratoico on 1/23/17. + */ +@Component +public class EspdXmlExporter { + + private final Jaxb2Marshaller jaxb2Marshaller; + private final UblRequestTypeTransformer toEspdRequestTransformer; + private final UblResponseTypeTransformer toEspdResponseTransformer; + private final grow.names.specification.ubl.schema.xsd.espdrequest_1.ObjectFactory espdRequestObjectFactory; + private final grow.names.specification.ubl.schema.xsd.espdresponse_1.ObjectFactory espdResponseObjectFactory; + + @Autowired + EspdXmlExporter(Jaxb2Marshaller jaxb2Marshaller, UblRequestTypeTransformer toEspdRequestTransformer, + UblResponseTypeTransformer toEspdResponseTransformer) { + this.jaxb2Marshaller = jaxb2Marshaller; + this.toEspdRequestTransformer = toEspdRequestTransformer; + this.toEspdResponseTransformer = toEspdResponseTransformer; + this.espdRequestObjectFactory = new grow.names.specification.ubl.schema.xsd.espdrequest_1.ObjectFactory(); + this.espdResponseObjectFactory = new grow.names.specification.ubl.schema.xsd.espdresponse_1.ObjectFactory(); + } + + /** + * Create a {@link ESPDRequestType} from the provided {@link EspdDocument} and marshals it + * to the output stream. + * + * @param espdDocument The ESPD document that will be written out + * + * @return The stream where the XML representation will be written out + */ + public ByteArrayOutputStream generateEspdRequest(EspdDocument espdDocument) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ESPDRequestType espdRequestType = toEspdRequestTransformer.buildRequestType(espdDocument); + StreamResult result = new StreamResult(out); + jaxb2Marshaller.marshal(espdRequestObjectFactory.createESPDRequest(espdRequestType), result); + return out; + } + + /** + * Create a {@link ESPDRequestType} from the provided {@link EspdDocument} and marshals it + * as a {@link StringWriter}. + * + * @param espdDocument The ESPD document that will be written out + * @param sw The place where the XML representation will be written out + */ + public void generateEspdRequest(EspdDocument espdDocument, StringWriter sw) { + ESPDRequestType espdRequestType = toEspdRequestTransformer.buildRequestType(espdDocument); + StreamResult result = new StreamResult(sw); + + jaxb2Marshaller.marshal(espdRequestObjectFactory.createESPDRequest(espdRequestType), result); + } + + /** + * Create a {@link ESPDResponseType} from the provided {@link EspdDocument} and marshals it + * to the output stream. + * + * @param espdDocument The ESPD document that will be written out + * + * @return The stream where the XML representation will be written out + */ + public ByteArrayOutputStream generateEspdResponse(EspdDocument espdDocument) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ESPDResponseType espdResponseType = toEspdResponseTransformer.buildResponseType(espdDocument); + StreamResult result = new StreamResult(out); + jaxb2Marshaller.marshal(espdResponseObjectFactory.createESPDResponse(espdResponseType), result); + return out; + } + + /** + * Create a {@link ESPDResponseType} from the provided {@link EspdDocument} and marshals it + * to the output stream. + * + * @param espdDocument The ESPD document that will be written out + * @param sw The place where the XML representation will be written out + */ + public void generateEspdResponse(EspdDocument espdDocument, StringWriter sw) { + ESPDResponseType espdResponseType = toEspdResponseTransformer.buildResponseType(espdDocument); + StreamResult result = new StreamResult(sw); + jaxb2Marshaller.marshal(espdResponseObjectFactory.createESPDResponse(espdResponseType), result); + } +} diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlImporter.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlImporter.java new file mode 100644 index 000000000..a3836a722 --- /dev/null +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdXmlImporter.java @@ -0,0 +1,183 @@ +/* + * + * Copyright 2016 EUROPEAN COMMISSION + * + * Licensed under the EUPL, Version 1.1 or – as soon they + * will be approved by the European Commission - subsequent + * versions of the EUPL (the "Licence"); + * + * You may not use this work except in compliance with the Licence. + * + * You may obtain a copy of the Licence at: + * + * https://joinup.ec.europa.eu/community/eupl/og_page/eupl + * + * Unless required by applicable law or agreed to in + * writing, software distributed under the Licence is + * distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the Licence for the specific language governing + * permissions and limitations under the Licence. + * + */ + +package eu.europa.ec.grow.espd.xml; + +import com.google.common.base.Optional; +import eu.europa.ec.grow.espd.domain.EspdDocument; +import eu.europa.ec.grow.espd.tenderned.exception.TedNoticeException; +import eu.europa.ec.grow.espd.xml.request.importing.UblRequestImporter; +import eu.europa.ec.grow.espd.xml.response.importing.UblRequestResponseMerger; +import eu.europa.ec.grow.espd.xml.response.importing.UblResponseImporter; +import grow.names.specification.ubl.schema.xsd.espdrequest_1.ESPDRequestType; +import grow.names.specification.ubl.schema.xsd.espdresponse_1.ESPDResponseType; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.oxm.jaxb.Jaxb2Marshaller; +import org.springframework.stereotype.Component; + +import javax.xml.bind.JAXBElement; +import javax.xml.transform.stream.StreamSource; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; + +/** + * Class used to import XML files containing ESPD Requests or Responses. + *

+ * Created by ratoico on 1/23/17. + */ +@Slf4j +@Component +public class EspdXmlImporter { + + private final Jaxb2Marshaller jaxb2Marshaller; + private final UblRequestImporter requestToEspdDocumentTransformer; + private final UblResponseImporter responseToEspdDocumentTransformer; + private final UblRequestResponseMerger requestResponseMerger; + + @Autowired + EspdXmlImporter(Jaxb2Marshaller jaxb2Marshaller, UblRequestImporter requestToEspdDocumentTransformer, + UblResponseImporter responseToEspdDocumentTransformer, UblRequestResponseMerger requestResponseMerger) { + this.jaxb2Marshaller = jaxb2Marshaller; + this.requestToEspdDocumentTransformer = requestToEspdDocumentTransformer; + this.responseToEspdDocumentTransformer = responseToEspdDocumentTransformer; + this.requestResponseMerger = requestResponseMerger; + } + + /** + * Convert a {@link ESPDRequestType} coming from an input stream into a {@link EspdDocument} object needed by + * the web application user interface. + * + * @param espdRequestStream An input stream containing the ESPD Request + * + * @return An {@link EspdDocument} object coming out from the stream if it contained a valid ESPD Request + * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. + */ + @SuppressWarnings("unchecked") + public Optional importEspdRequest(InputStream espdRequestStream) { + try { + JAXBElement element = (JAXBElement) jaxb2Marshaller + .unmarshal(new StreamSource(espdRequestStream)); + ESPDRequestType requestType = element.getValue(); + return Optional.of(requestToEspdDocumentTransformer.importRequest(requestType)); + } catch (Exception e) { + log.warn(e.getMessage(), e); + return Optional.absent(); + } + } + + /** + * Convert a {@link ESPDResponseType} coming from an input stream into a {@link EspdDocument} object needed by + * the web application user interface. + * + * @param espdResponseStream An input stream containing the ESPD Response + * + * @return An {@link EspdDocument} object coming out from the stream if it contained a valid ESPD Response + * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. + */ + @SuppressWarnings("unchecked") + public Optional importEspdResponse(InputStream espdResponseStream) { + try { + JAXBElement element = (JAXBElement) jaxb2Marshaller + .unmarshal(new StreamSource(espdResponseStream)); + ESPDResponseType responseType = element.getValue(); + return Optional.of(responseToEspdDocumentTransformer.importResponse(responseType)); + } catch (Exception e) { + log.warn(e.getMessage(), e); + return Optional.absent(); + } + } + + /** + * Read from an input stream that should contain a {@link ESPDRequestType} or {@link ESPDResponseType} + * and convert it into a {@link EspdDocument}. It is not known beforehand if the content + * belongs to a ESPD Request or Response. + * + * @param espdStream An input stream hopefully containing a ESPD Request or Response + * + * @return An {@link EspdDocument} object coming out from the stream if it contained a valid ESPD Request or Response + * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. + * + * @throws IOException in case the file cannot be read due to I/O issues + * @throws TedNoticeException if file contains Ted Notice XML + */ + public Optional importAmbiguousEspdFile(InputStream espdStream) throws IOException, TedNoticeException { + // peek at the first bytes in the file to see if it is a ESPD Request or Response + try (BufferedInputStream bis = new BufferedInputStream(espdStream)) { + int peekReadLimit = 80; + bis.mark(peekReadLimit); + byte[] peek = new byte[peekReadLimit]; + int bytesRead = bis.read(peek, 0, peekReadLimit - 1); + if (bytesRead < 0) { + return Optional.absent(); + } + bis.reset(); // need to read from the beginning afterwards + String firstBytes = new String(peek, "UTF-8"); + + // decide how to read the uploaded file + if (firstBytes.contains("ESPDResponse")) { + return importEspdResponse(bis); + } else if (firstBytes.contains("ESPDRequest")) { + return importEspdRequest(bis); + } else if (firstBytes.contains("ContractNotice") || firstBytes.contains("TED_EXPORT")) { + throw new TedNoticeException(); + } + } + return Optional.absent(); + } + + /** + * Merge the data coming from a ESPD Request with data coming from a ESPD Response. + *

+ * The new file shall include: + *

    + *
  • Information on the EO
    • + *
  • All mandatory Exclusion grounds
    • + *
  • Selection criteria that where asked for in the new ESPD request that were answered in the old ESPD response
    • + *
+ *

+ * + * @param requestStream An input stream hopefully containing a ESPD Request + * @param responseStream An input stream hopefully containing a ESPD Response + * + * @return An {@link EspdDocument} object coming out from the merging of the Request and Response + * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. + */ + @SuppressWarnings("unchecked") + public Optional mergeEspdRequestAndResponse(InputStream requestStream, InputStream responseStream) { + try { + JAXBElement requestElement = (JAXBElement) jaxb2Marshaller + .unmarshal(new StreamSource(requestStream)); + ESPDRequestType requestType = requestElement.getValue(); + JAXBElement responseElement = (JAXBElement) jaxb2Marshaller + .unmarshal(new StreamSource(responseStream)); + ESPDResponseType responseType = responseElement.getValue(); + return Optional.of(requestResponseMerger.mergeRequestAndResponse(requestType, responseType)); + } catch (Exception e) { + log.warn(e.getMessage(), e); + return Optional.absent(); + } + } +} diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp index 74b750724..25254cb9e 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp @@ -31,51 +31,105 @@ - + + + + +
-
+
- - + +
- +
- +
-
- + +
+ +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+ <%--
--%> + <%----%> + <%--
--%> + <%--
--%> + <%----%> + <%--
--%> + <%--
--%> + <%----%> + <%--
--%> + +
- - + +
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp index 050a910c2..ee1fbaba8 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp @@ -472,7 +472,6 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
- ${htmlToPrint} - +
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp index 1195b21ca..4b1dbc1d1 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp @@ -1,6 +1,6 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="s" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> @@ -29,21 +29,19 @@ --%> -
+
- - - + + + - + <%@ include file="/WEB-INF/views/wizard/finishForm.jsp" %> - - - -
-
-

${span18n['createcafinish_export']}

-
+ +
+
+

${span18n['createcafinish_export']}

+
@@ -51,15 +49,14 @@
-
- -
- - - - - - - +
+
+ + + + + + + \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index a8c1b44a6..7842e5bf3 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -212,6 +212,9 @@ crit_end_date=End date crit_number_of_years=Number of years crit_average_turnover=Average turnover crit_issuer=Issuer +download_pdf=Download PDF +download_xml=Download XML +download_zip=Download ZIP faq_text_more_info=For more information on ESPD, please report_security_incident=Report on an Information Security Incident diff --git a/espd-web/src/main/resources/tiles.xml b/espd-web/src/main/resources/tiles.xml index cab63b35d..5ca77f3da 100644 --- a/espd-web/src/main/resources/tiles.xml +++ b/espd-web/src/main/resources/tiles.xml @@ -69,8 +69,8 @@ - - + + @@ -80,8 +80,8 @@ - - + + @@ -252,7 +252,7 @@ - + diff --git a/espd-web/src/main/resources/zipInstructions.txt b/espd-web/src/main/resources/zipInstructions.txt new file mode 100644 index 000000000..2ccf978c0 --- /dev/null +++ b/espd-web/src/main/resources/zipInstructions.txt @@ -0,0 +1 @@ +Instructions on how to use the ESPD \ No newline at end of file From b297d1db4e5f83b5dddefcc25928de8d05ad2576 Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Mon, 23 Jan 2017 16:06:57 +0100 Subject: [PATCH 06/24] #122 split EspdExchangeMarshaller into two classes: EspdXmlExporter and EspdXmlImporter. refactor the tests to reflect this change. --- .../grow/espd/xml/EspdExchangeMarshaller.java | 256 ------------------ .../base/AbstractEspdXmlMarshalling.groovy | 34 ++- .../xml/base/AbstractXmlFileImport.groovy | 17 +- .../request/EspdRequestMarshallingTest.groovy | 32 +-- .../EspdRequestMixedCriteriaTest.groovy | 2 +- ...tingProcurementProcedureRequestTest.groovy | 2 +- ...onomicOperatorRegisteredRequestTest.groovy | 2 +- ...OperatorReliesCapacitiesRequestTest.groovy | 2 +- .../award/MeetsObjectiveRequestTest.groovy | 2 +- .../ProcurementReservedRequestTest.groovy | 2 +- ...ucontractingThirdPartiesRequestTest.groovy | 2 +- .../AgreementsWithEORequestTest.groovy | 2 +- .../AnalogousSituationRequestTest.groovy | 2 +- ...ArrangementWithCreditorsRequestTest.groovy | 2 +- ...AdministeredByLiquidatorRequestTest.groovy | 2 +- .../exclusion/BankruptcyRequestTest.groovy | 2 +- ...ObligationsEnvironmentalRequestTest.groovy | 2 +- ...eachingObligationsLabourRequestTest.groovy | 2 +- ...eachingObligationsSocialRequestTest.groovy | 2 +- ...inessActivitiesSuspendedRequestTest.groovy | 2 +- .../exclusion/ChildLabourRequestTest.groovy | 2 +- ...tionProcurementProcedureRequestTest.groovy | 2 +- .../exclusion/CorruptionRequestTest.groovy | 2 +- ...ntPreparationProcurementRequestTest.groovy | 2 +- .../EarlyTerminationRequestTest.groovy | 2 +- ...estExclusionCriteriaMarshallingTest.groovy | 4 +- .../request/exclusion/FraudRequestTest.groovy | 2 +- ...uiltyOfMisinterpretationRequestTest.groovy | 2 +- ...tyProfessionalMisconductRequestTest.groovy | 2 +- .../exclusion/InsolvencyRequestTest.groovy | 2 +- .../MoneyLaunderingRequestTest.groovy | 2 +- ...NationalExclusionGroundsRequestTest.groovy | 2 +- ...onInCriminalOrganisationRequestTest.groovy | 2 +- .../PaymentOfSocialSecurityRequestTest.groovy | 2 +- .../PaymentOfTaxesRequestTest.groovy | 2 +- .../TerroristOffencesRequestTest.groovy | 2 +- .../EspdRequestAwardCriteriaImportTest.groovy | 8 +- ...dRequestExclusionCriteriaImportTest.groovy | 11 +- ...pdRequestOtherInformationImportTest.groovy | 20 +- ...dRequestSelectionCriteriaImportTest.groovy | 12 +- .../AllCriteriaSatisfiedRequestTest.groovy | 2 +- .../AllowanceOfChecksRequestTest.groovy | 2 +- .../AverageAnnualManpowerRequestTest.groovy | 2 +- .../AverageYearlyTurnoverRequestTest.groovy | 2 +- ...ndentBodiesEnvironmentalRequestTest.groovy | 2 +- ...catesIndependentBodiesQARequestTest.groovy | 2 +- ...ofessionalQualificationsRequestTest.groovy | 2 +- ...mentProfessionalRegisterRequestTest.groovy | 2 +- .../EnrolmentTradeRegisterRequestTest.groovy | 2 +- ...mentalManagementMeasuresRequestTest.groovy | 2 +- ...estSelectionCriteriaMarshallingTest.groovy | 6 +- .../FinancialRatioRequestTest.groovy | 2 +- .../GeneralYearlyTurnoverRequestTest.groovy | 2 +- .../NumberOfManagerialStaffRequestTest.groovy | 2 +- ...micFinancialRequirementsRequestTest.groovy | 2 +- ...rofessionalRiskIndemnityRequestTest.groovy | 2 +- ...ceContractsAuthorisationRequestTest.groovy | 2 +- ...rviceContractsMembershipRequestTest.groovy | 2 +- ...ractsPerformanceServicesRequestTest.groovy | 2 +- .../SetupEconomicOperatorRequestTest.groovy | 2 +- .../SpecificAverageTurnoverRequestTest.groovy | 2 +- .../SpecificYearlyTurnoverRequestTest.groovy | 2 +- .../StudyResearchFacilitiesRequestTest.groovy | 2 +- ...SubcontractingProportionRequestTest.groovy | 2 +- .../SupplyChainManagementRequestTest.groovy | 2 +- ...ontractsCertificatesByQCRequestTest.groovy | 2 +- ...ctsPerformanceDeliveriesRequestTest.groovy | 2 +- ...lyContractsSamplesWithCARequestTest.groovy | 2 +- ...ontractsSamplesWithoutCARequestTest.groovy | 2 +- .../TechnicalFacilitiesRequestTest.groovy | 2 +- ...chniciansTechnicalBodiesRequestTest.groovy | 2 +- .../selection/ToolsPlantRequestTest.groovy | 2 +- ...ontractsPerformanceWorksRequestTest.groovy | 2 +- ...WorkContractsTechniciansRequestTest.groovy | 2 +- .../response/CriterionRequirementsTest.groovy | 20 +- .../response/EspdResponseCriteriaTest.groovy | 8 +- .../EspdResponseMarshallingTest.groovy | 44 +-- ...ingProcurementProcedureResponseTest.groovy | 10 +- ...nomicOperatorRegisteredResponseTest.groovy | 16 +- ...peratorReliesCapacitiesResponseTest.groovy | 4 +- .../award/MeetsObjectiveResponseTest.groovy | 12 +- .../ProcurementReservedResponseTest.groovy | 8 +- ...contractingThirdPartiesResponseTest.groovy | 6 +- .../AgreementsWithEOResponseTest.groovy | 10 +- .../AnalogousSituationResponseTest.groovy | 14 +- ...rrangementWithCreditorsResponseTest.groovy | 14 +- ...dministeredByLiquidatorResponseTest.groovy | 14 +- .../exclusion/BankruptcyResponseTest.groovy | 14 +- ...bligationsEnvironmentalResponseTest.groovy | 10 +- ...achingObligationsLabourResponseTest.groovy | 10 +- ...achingObligationsSocialResponseTest.groovy | 10 +- ...nessActivitiesSuspendedResponseTest.groovy | 14 +- .../exclusion/ChildLabourResponseTest.groovy | 22 +- ...ionProcurementProcedureResponseTest.groovy | 6 +- .../exclusion/CorruptionResponseTest.groovy | 22 +- ...tPreparationProcurementResponseTest.groovy | 6 +- .../EarlyTerminationResponseTest.groovy | 10 +- .../exclusion/FraudResponseTest.groovy | 22 +- ...iltyOfMisinterpretationResponseTest.groovy | 4 +- ...yProfessionalMisconductResponseTest.groovy | 10 +- .../exclusion/InsolvencyResponseTest.groovy | 14 +- .../MixedExclusionCriteriaResponseTest.groovy | 6 +- .../MoneyLaunderingResponseTest.groovy | 22 +- ...ationalExclusionGroundsResponseTest.groovy | 16 +- ...nInCriminalOrganisationResponseTest.groovy | 22 +- ...PaymentOfSocialSecurityResponseTest.groovy | 28 +- .../PaymentOfTaxesResponseTest.groovy | 28 +- .../TerroristOffencesResponseTest.groovy | 22 +- .../EspdRequestResponseMergeTest.groovy | 6 +- ...dResponseOtherInformationImportTest.groovy | 8 +- ...atingProcurementProcedureImportTest.groovy | 9 +- ...conomicOperatorRegisteredImportTest.groovy | 9 +- ...cOperatorReliesCapacitiesImportTest.groovy | 9 +- .../award/MeetsObjectiveImportTest.groovy | 9 +- .../ProcurementReservedImportTest.groovy | 5 +- ...SucontractingThirdPartiesImportTest.groovy | 8 +- .../AgreementsWithEOImportTest.groovy | 11 +- .../exclusion/BankruptcyImportTest.groovy | 7 +- ...fObligationsEnvironmentalImportTest.groovy | 8 +- ...achingOfObligationsLabourImportTest.groovy | 5 +- ...achingOfObligationsSocialImportTest.groovy | 5 +- .../ConflictOfInterestImportTest.groovy | 6 +- .../exclusion/MisconductImportTest.groovy | 6 +- .../NationalExclusionGroundsImportTest.groovy | 7 +- ...ationCriminalOrganisationImportTest.groovy | 6 +- .../exclusion/PaymentOfTaxesImportTest.groovy | 9 +- .../AllowanceOfChecksImportTest.groovy | 7 +- .../AverageYearlyTurnoverImportTest.groovy | 6 +- ...endentBodiesEnvironmentalImportTest.groovy | 7 +- ...sIndependentBodiesQualityImportTest.groovy | 7 +- ...lmentProfessionalRegisterImportTest.groovy | 5 +- .../selection/FinancialRatioImportTest.groovy | 5 +- .../GeneralYearlyTurnoverImportTest.groovy | 12 +- .../NumberOfManagerialStaffImportTest.groovy | 7 +- ...OtherEconomicRequirementsImportTest.groovy | 5 +- ...ProfessionalRiskInsuranceImportTest.groovy | 7 +- .../selection/SatisfiesAllImportTest.groovy | 7 +- ...iceContractsAuthorisationImportTest.groovy | 6 +- .../SubcontractingProprtionImportTest.groovy | 6 +- ...ntractsCertificateQualityImportTest.groovy | 7 +- ...echnicalFacilitiesQualityImportTest.groovy | 7 +- ...echniciansTechnicalBodiesImportTest.groovy | 7 +- ...ntractsPerformanceOfWorksImportTest.groovy | 10 +- .../AllCriteriaSatisfiedResponseTest.groovy | 12 +- .../AllowanceOfChecksResponseTest.groovy | 4 +- .../AverageAnnualManpowerResponseTest.groovy | 14 +- .../AverageYearlyTurnoverResponseTest.groovy | 14 +- ...dentBodiesEnvironmentalResponseTest.groovy | 12 +- ...atesIndependentBodiesQAResponseTest.groovy | 12 +- ...fessionalQualificationsResponseTest.groovy | 10 +- ...entProfessionalRegisterResponseTest.groovy | 10 +- .../EnrolmentTradeRegisterResponseTest.groovy | 10 +- ...entalManagementMeasuresResponseTest.groovy | 10 +- .../FinancialRatioResponseTest.groovy | 12 +- .../GeneralYearlyTurnoverResponseTest.groovy | 16 +- ...NumberOfManagerialStaffResponseTest.groovy | 12 +- ...icFinancialRequirementsResponseTest.groovy | 10 +- ...ofessionalRiskIndemnityResponseTest.groovy | 12 +- ...eContractsAuthorisationResponseTest.groovy | 12 +- ...viceContractsMembershipResponseTest.groovy | 12 +- ...actsPerformanceServicesResponseTest.groovy | 18 +- .../SetupEconomicOperatorResponseTest.groovy | 4 +- ...SpecificAverageTurnoverResponseTest.groovy | 14 +- .../SpecificYearlyTurnoverResponseTest.groovy | 18 +- ...StudyResearchFacilitiesResponseTest.groovy | 10 +- ...ubcontractingProportionResponseTest.groovy | 4 +- .../SupplyChainManagementResponseTest.groovy | 10 +- ...ntractsCertificatesByQCResponseTest.groovy | 12 +- ...tsPerformanceDeliveriesResponseTest.groovy | 20 +- ...yContractsSamplesWithCAResponseTest.groovy | 10 +- ...ntractsSamplesWithoutCAResponseTest.groovy | 10 +- .../TechnicalFacilitiesResponseTest.groovy | 10 +- ...hniciansTechnicalBodiesResponseTest.groovy | 10 +- .../selection/ToolsPlantResponseTest.groovy | 10 +- ...ntractsPerformanceWorksResponseTest.groovy | 20 +- ...orkContractsTechniciansResponseTest.groovy | 10 +- 176 files changed, 621 insertions(+), 1040 deletions(-) delete mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdExchangeMarshaller.java diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdExchangeMarshaller.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdExchangeMarshaller.java deleted file mode 100644 index 1c3abe2e7..000000000 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/EspdExchangeMarshaller.java +++ /dev/null @@ -1,256 +0,0 @@ -/* - * - * Copyright 2016 EUROPEAN COMMISSION - * - * Licensed under the EUPL, Version 1.1 or – as soon they - * will be approved by the European Commission - subsequent - * versions of the EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * - * You may obtain a copy of the Licence at: - * - * https://joinup.ec.europa.eu/community/eupl/og_page/eupl - * - * Unless required by applicable law or agreed to in - * writing, software distributed under the Licence is - * distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the Licence for the specific language governing - * permissions and limitations under the Licence. - * - */ - -package eu.europa.ec.grow.espd.xml; - -import com.google.common.base.Optional; -import eu.europa.ec.grow.espd.domain.EspdDocument; -import eu.europa.ec.grow.espd.tenderned.exception.TedNoticeException; -import eu.europa.ec.grow.espd.xml.request.exporting.UblRequestTypeTransformer; -import eu.europa.ec.grow.espd.xml.request.importing.UblRequestImporter; -import eu.europa.ec.grow.espd.xml.response.exporting.UblResponseTypeTransformer; -import eu.europa.ec.grow.espd.xml.response.importing.UblRequestResponseMerger; -import eu.europa.ec.grow.espd.xml.response.importing.UblResponseImporter; -import grow.names.specification.ubl.schema.xsd.espdrequest_1.ESPDRequestType; -import grow.names.specification.ubl.schema.xsd.espdresponse_1.ESPDResponseType; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.oxm.jaxb.Jaxb2Marshaller; -import org.springframework.stereotype.Component; - -import javax.xml.bind.JAXBElement; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import java.io.*; - -/** - * Class that can perform XML marshalling and unmarshalling from {@link ESPDRequestType} and {@link ESPDResponseType} - * to a {@link EspdDocument}. - *

- * Created by vigi on 11/11/15:3:22 PM. - */ -@Component -@Slf4j -public class EspdExchangeMarshaller { - - private final Jaxb2Marshaller jaxb2Marshaller; - private final UblRequestTypeTransformer toEspdRequestTransformer; - private final UblRequestImporter requestToEspdDocumentTransformer; - private final UblResponseImporter responseToEspdDocumentTransformer; - private final UblResponseTypeTransformer toEspdResponseTransformer; - private final UblRequestResponseMerger requestResponseMerger; - private final grow.names.specification.ubl.schema.xsd.espdrequest_1.ObjectFactory espdRequestObjectFactory; - private final grow.names.specification.ubl.schema.xsd.espdresponse_1.ObjectFactory espdResponseObjectFactory; - - @Autowired - EspdExchangeMarshaller(Jaxb2Marshaller jaxb2Marshaller, - UblRequestTypeTransformer toEspdRequestTransformer, - UblRequestImporter requestToEspdDocumentTransformer, - UblResponseImporter responseToEspdDocumentTransformer, - UblResponseTypeTransformer toEspdResponseTransformer, UblRequestResponseMerger requestResponseMerger) { - this.jaxb2Marshaller = jaxb2Marshaller; - this.toEspdRequestTransformer = toEspdRequestTransformer; - this.requestToEspdDocumentTransformer = requestToEspdDocumentTransformer; - this.responseToEspdDocumentTransformer = responseToEspdDocumentTransformer; - this.toEspdResponseTransformer = toEspdResponseTransformer; - this.requestResponseMerger = requestResponseMerger; - this.espdRequestObjectFactory = new grow.names.specification.ubl.schema.xsd.espdrequest_1.ObjectFactory(); - this.espdResponseObjectFactory = new grow.names.specification.ubl.schema.xsd.espdresponse_1.ObjectFactory(); - } - - /** - * Create a {@link ESPDRequestType} from the provided {@link EspdDocument} and marshals it - * to the output stream. - * - * @param espdDocument The ESPD document that will be written out - * - * @return The stream where the XML representation will be written out - */ - public ByteArrayOutputStream generateEspdRequest(EspdDocument espdDocument) { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ESPDRequestType espdRequestType = toEspdRequestTransformer.buildRequestType(espdDocument); - StreamResult result = new StreamResult(out); - jaxb2Marshaller.marshal(espdRequestObjectFactory.createESPDRequest(espdRequestType), result); - return out; - } - - /** - * Create a {@link ESPDRequestType} from the provided {@link EspdDocument} and marshals it - * as a {@link StringWriter}. - * - * @param espdDocument The ESPD document that will be written out - * @param sw The place where the XML representation will be written out - */ - public void generateEspdRequest(EspdDocument espdDocument, StringWriter sw) { - ESPDRequestType espdRequestType = toEspdRequestTransformer.buildRequestType(espdDocument); - StreamResult result = new StreamResult(sw); - - jaxb2Marshaller.marshal(espdRequestObjectFactory.createESPDRequest(espdRequestType), result); - } - - /** - * Create a {@link ESPDResponseType} from the provided {@link EspdDocument} and marshals it - * to the output stream. - * - * @param espdDocument The ESPD document that will be written out - * - * @return The stream where the XML representation will be written out - */ - public ByteArrayOutputStream generateEspdResponse(EspdDocument espdDocument) { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ESPDResponseType espdResponseType = toEspdResponseTransformer.buildResponseType(espdDocument); - StreamResult result = new StreamResult(out); - jaxb2Marshaller.marshal(espdResponseObjectFactory.createESPDResponse(espdResponseType), result); - return out; - } - - /** - * Create a {@link ESPDResponseType} from the provided {@link EspdDocument} and marshals it - * to the output stream. - * - * @param espdDocument The ESPD document that will be written out - * @param sw The place where the XML representation will be written out - */ - public void generateEspdResponse(EspdDocument espdDocument, StringWriter sw) { - ESPDResponseType espdResponseType = toEspdResponseTransformer.buildResponseType(espdDocument); - StreamResult result = new StreamResult(sw); - jaxb2Marshaller.marshal(espdResponseObjectFactory.createESPDResponse(espdResponseType), result); - } - - /** - * Convert a {@link ESPDRequestType} coming from an input stream into a {@link EspdDocument} object needed by - * the web application user interface. - * - * @param espdRequestStream An input stream containing the ESPD Request - * - * @return An {@link EspdDocument} object coming out from the stream if it contained a valid ESPD Request - * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. - */ - @SuppressWarnings("unchecked") - public Optional importEspdRequest(InputStream espdRequestStream) { - try { - JAXBElement element = (JAXBElement) jaxb2Marshaller - .unmarshal(new StreamSource(espdRequestStream)); - ESPDRequestType requestType = element.getValue(); - return Optional.of(requestToEspdDocumentTransformer.importRequest(requestType)); - } catch (Exception e) { - log.warn(e.getMessage(), e); - return Optional.absent(); - } - } - - /** - * Convert a {@link ESPDResponseType} coming from an input stream into a {@link EspdDocument} object needed by - * the web application user interface. - * - * @param espdResponseStream An input stream containing the ESPD Response - * - * @return An {@link EspdDocument} object coming out from the stream if it contained a valid ESPD Response - * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. - */ - @SuppressWarnings("unchecked") - public Optional importEspdResponse(InputStream espdResponseStream) { - try { - JAXBElement element = (JAXBElement) jaxb2Marshaller - .unmarshal(new StreamSource(espdResponseStream)); - ESPDResponseType responseType = element.getValue(); - return Optional.of(responseToEspdDocumentTransformer.importResponse(responseType)); - } catch (Exception e) { - log.warn(e.getMessage(), e); - return Optional.absent(); - } - } - - /** - * Read from an input stream that should contain a {@link ESPDRequestType} or {@link ESPDResponseType} - * and convert it into a {@link EspdDocument}. It is not known beforehand if the content - * belongs to a ESPD Request or Response. - * - * @param is An input stream hopefully containing a ESPD Request or Response - * - * @return An {@link EspdDocument} object coming out from the stream if it contained a valid ESPD Request or Response - * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. - * - * @throws IOException - * @throws TedNoticeException if file contains Ted Notice XML - */ - public Optional importAmbiguousEspdFile(InputStream is) throws IOException, TedNoticeException { - // peek at the first bytes in the file to see if it is a ESPD Request or Response - try (BufferedInputStream bis = new BufferedInputStream(is)) { - int peekReadLimit = 80; - bis.mark(peekReadLimit); - byte[] peek = new byte[peekReadLimit]; - int bytesRead = bis.read(peek, 0, peekReadLimit - 1); - if (bytesRead < 0) { - return null; - } - bis.reset(); // need to read from the beginning afterwards - String firstBytes = new String(peek, "UTF-8"); - - // decide how to read the uploaded file - if (firstBytes.contains("ESPDResponse")) { - return importEspdResponse(bis); - } else if (firstBytes.contains("ESPDRequest")) { - return importEspdRequest(bis); - } - else if(firstBytes.contains("ContractNotice") || firstBytes.contains("TED_EXPORT")) { - throw new TedNoticeException(); - } - } - return Optional.absent(); - } - - /** - * Merge the data coming from a ESPD Request with data coming from a ESPD Response. - *

- * The new file shall include: - *

    - *
  • Information on the EO
    • - *
  • All mandatory Exclusion grounds
    • - *
  • Selection criteria that where asked for in the new ESPD request that were answered in the old ESPD response
    • - *
- *

- * - * @param requestStream An input stream hopefully containing a ESPD Request - * @param responseStream An input stream hopefully containing a ESPD Response - * - * @return An {@link EspdDocument} object coming out from the merging of the Request and Response - * wrapped in an {@link Optional} or an empty {@link Optional} if the import was unsuccessful. - */ - @SuppressWarnings("unchecked") - public Optional mergeEspdRequestAndResponse(InputStream requestStream, InputStream responseStream) { - try { - JAXBElement requestElement = (JAXBElement) jaxb2Marshaller - .unmarshal(new StreamSource(requestStream)); - ESPDRequestType requestType = requestElement.getValue(); - JAXBElement responseElement = (JAXBElement) jaxb2Marshaller - .unmarshal(new StreamSource(responseStream)); - ESPDResponseType responseType = responseElement.getValue(); - return Optional.of(requestResponseMerger.mergeRequestAndResponse(requestType, responseType)); - } catch (Exception e) { - log.warn(e.getMessage(), e); - return Optional.absent(); - } - } -} diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractEspdXmlMarshalling.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractEspdXmlMarshalling.groovy index 032c9b63e..af5858b11 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractEspdXmlMarshalling.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractEspdXmlMarshalling.groovy @@ -27,7 +27,8 @@ package eu.europa.ec.grow.espd.xml.base import eu.europa.ec.grow.espd.config.JaxbConfiguration import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.util.EspdConfiguration -import eu.europa.ec.grow.espd.xml.EspdExchangeMarshaller +import eu.europa.ec.grow.espd.xml.EspdXmlExporter +import eu.europa.ec.grow.espd.xml.EspdXmlImporter import eu.europa.ec.grow.espd.xml.common.exporting.UblContractingPartyTypeTransformer import eu.europa.ec.grow.espd.xml.common.exporting.UblEconomicOperatorPartyTypeTransformer import eu.europa.ec.grow.espd.xml.common.importing.CriteriaToEspdDocumentPopulator @@ -54,11 +55,14 @@ abstract class AbstractEspdXmlMarshalling extends Specification { static { // init the marshaller only once because it's expensive to create - initEspdMarshaller(jaxb2Marshaller) + initEspdMarshallers(jaxb2Marshaller) } @Shared - protected static EspdExchangeMarshaller marshaller + protected static EspdXmlExporter xmlExporter + + @Shared + protected static EspdXmlImporter xmlImporter protected StringWriter xmlOutput @@ -66,7 +70,7 @@ abstract class AbstractEspdXmlMarshalling extends Specification { // init objects run before the first feature method } - private static void initEspdMarshaller(Jaxb2Marshaller jaxb2Marshaller) { + private static void initEspdMarshallers(Jaxb2Marshaller jaxb2Marshaller) { def ublContractingPartyTypeTransformer = new UblContractingPartyTypeTransformer() def economicOperatorPartyTypeTransformer = new UblEconomicOperatorPartyTypeTransformer() def espdConfig = new EspdConfiguration(null) @@ -79,8 +83,8 @@ abstract class AbstractEspdXmlMarshalling extends Specification { def ublResponseImporter = new UblResponseImporter(partyImplTransformer, economicOperatorImplTransformer, criteriaToEspdDocumentPopulator) def ublResponseTypeTransformer = new UblResponseTypeTransformer(ublContractingPartyTypeTransformer, economicOperatorPartyTypeTransformer, new UblResponseCriteriaTransformer(), espdConfig) def requestResponseMerger = new UblRequestResponseMerger(partyImplTransformer, economicOperatorImplTransformer, criteriaToEspdDocumentPopulator) - marshaller = new EspdExchangeMarshaller(jaxb2Marshaller, ublRequestTypeTransformer, ublRequestImporter, - ublResponseImporter, ublResponseTypeTransformer, requestResponseMerger) + xmlExporter = new EspdXmlExporter(jaxb2Marshaller, ublRequestTypeTransformer, ublResponseTypeTransformer) + xmlImporter = new EspdXmlImporter(jaxb2Marshaller, ublRequestImporter, ublResponseImporter, requestResponseMerger) } void cleanupSpec() { @@ -95,21 +99,21 @@ abstract class AbstractEspdXmlMarshalling extends Specification { xmlOutput = null } - protected GPathResult parseRequestXml() { - parseRequestXml(new EspdDocument()) + protected GPathResult generateRequestXml() { + generateRequestXml(new EspdDocument()) } - protected GPathResult parseRequestXml(EspdDocument espdDocument) { - marshaller.generateEspdRequest(espdDocument, xmlOutput) + protected GPathResult generateRequestXml(EspdDocument espdDocument) { + xmlExporter.generateEspdRequest(espdDocument, xmlOutput) new XmlSlurper().parseText(xmlOutput.toString()) } - protected GPathResult parseResponseXml() { - parseResponseXml(new EspdDocument()) + protected GPathResult generateResponseXml() { + generateResponseXml(new EspdDocument()) } - protected GPathResult parseResponseXml(EspdDocument espdDocument) { - marshaller.generateEspdResponse(espdDocument, xmlOutput) + protected GPathResult generateResponseXml(EspdDocument espdDocument) { + xmlExporter.generateEspdResponse(espdDocument, xmlOutput) new XmlSlurper().parseText(xmlOutput.toString()) } @@ -118,7 +122,7 @@ abstract class AbstractEspdXmlMarshalling extends Specification { } protected void saveEspdAsXmlResponse(EspdDocument espd, String filePath) { - parseResponseXml(espd) + generateResponseXml(espd) def file = new File(filePath) file.text = xmlOutput println("--------------- created ESPD Response at ${file.absolutePath}") diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractXmlFileImport.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractXmlFileImport.groovy index 5c9e6429a..e413ee275 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractXmlFileImport.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/base/AbstractXmlFileImport.groovy @@ -32,17 +32,20 @@ import org.apache.commons.io.IOUtils */ abstract class AbstractXmlFileImport extends AbstractEspdXmlMarshalling { - protected String importXmlRequestFile(String fileName) { - return new File("./src/test/groovy/eu/europa/ec/grow/espd/xml/samples/request/${fileName}").getText('UTF-8') + protected EspdDocument parseXmlRequestFile(String filePath) { + def espdRequestXml = new File("./src/test/groovy/eu/europa/ec/grow/espd/xml/samples/request/${filePath}").getText('UTF-8') + return xmlImporter.importEspdRequest(IOUtils.toInputStream(espdRequestXml)).get() } - protected String importXmlResponseFile(String fileName) { - return new File("./src/test/groovy/eu/europa/ec/grow/espd/xml/samples/response/${fileName}").getText('UTF-8') + protected EspdDocument parseXmlResponseFile(String filePath) { + def espdResponseXml = new File("./src/test/groovy/eu/europa/ec/grow/espd/xml/samples/response/${filePath}").getText('UTF-8') + return xmlImporter.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() } - protected EspdDocument parseXmlResponseFile(String fileName) { - def espdResponseXml = importXmlResponseFile(fileName) - return marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + protected EspdDocument parseXmlMergeFile(String requestFilePath, String responseFilePath) { + def espdRequestXml = new File("./src/test/groovy/eu/europa/ec/grow/espd/xml/samples/request/${requestFilePath}").getText('UTF-8') + def espdResponseXml = new File("./src/test/groovy/eu/europa/ec/grow/espd/xml/samples/response/${responseFilePath}").getText('UTF-8') + return xmlImporter.mergeEspdRequestAndResponse(IOUtils.toInputStream(espdRequestXml), IOUtils.toInputStream(espdResponseXml)).get() } } \ No newline at end of file diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMarshallingTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMarshallingTest.groovy index dbef4b732..4bcaab55a 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMarshallingTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMarshallingTest.groovy @@ -37,7 +37,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should make sure that we use the correct XML namespaces"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: result.lookupNamespace('espd-req') == 'urn:grow:names:specification:ubl:schema:xsd:ESPDRequest-1' @@ -53,7 +53,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain UBLVersionID element information"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: result.UBLVersionID.text() == "2.1" @@ -62,7 +62,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain CustomizationID element information"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: result.CustomizationID.text() == "urn:www.cenbii.eu:transaction:biitrns070:ver3.0" @@ -73,7 +73,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain ID element information"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: "id is an UUID" result.ID.text().length() == 36 @@ -87,7 +87,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain CopyIndicator element information"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: result.CopyIndicator.size() == 1 @@ -96,7 +96,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain VersionID element information"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: result.VersionID.text() == "2016.4" @@ -105,7 +105,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain IssueDate element information"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: "issue date must match the date format YYYY-MM-dd" result.IssueDate.text() ==~ "\\d{4}-\\d{2}-\\d{2}" @@ -113,7 +113,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain IssueTime element information"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: "issue time must match the time format HH:mm:ss" result.IssueTime.text() ==~ "\\d{2}:\\d{2}:\\d{2}" @@ -124,7 +124,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def espd = new EspdDocument(fileRefByCA: "HODOR refd by CA") when: - def result = parseRequestXml(espd) + def result = generateRequestXml(espd) then: result.ContractFolderID.text() == "HODOR refd by CA" @@ -141,7 +141,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { ) when: - def result = parseRequestXml(espd) + def result = generateRequestXml(espd) then: result.AdditionalDocumentReference[0].ID.text() == "S206|2015-10-23|PN33|2015/S 206-373035" @@ -171,7 +171,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { tedUrl: "http://ted.europa.eu/udl?uri=TED:NOTICE:002226-2016:TEXT:ES:HTML") when: - def result = parseRequestXml(espd) + def result = generateRequestXml(espd) then: result.AdditionalDocumentReference.size() == 1 @@ -202,7 +202,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { ) when: - def result = parseRequestXml(espd) + def result = generateRequestXml(espd) then: result.AdditionalDocumentReference[0].Attachment.ExternalReference.Description[0].text() == "-" @@ -218,7 +218,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def espd = new EspdDocument(authority: authority) when: - def result = parseRequestXml(espd) + def result = generateRequestXml(espd) then: "all values should be trimmed" result.ContractingParty.Party.PartyName.Name.text() == "Hodor authority" @@ -244,7 +244,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain ProcurementProjectLot element information when there are no lots"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: "In a Procurement Project with no Lots one ProcurementProjectLot element, and only one, MUST be included in the XML instance" result.ProcurementProjectLot.size() == 1 @@ -258,7 +258,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def espd = new EspdDocument(lotConcerned: "hodor lot") when: - def result = parseRequestXml(espd) + def result = generateRequestXml(espd) then: "In a Procurement Project with no Lots one ProcurementProjectLot element, and only one, MUST be included in the XML instance" result.ProcurementProjectLot.size() == 1 @@ -269,7 +269,7 @@ class EspdRequestMarshallingTest extends AbstractCriteriaFixture { def "should contain mandatory Criterion elements information when none of them is selected from ESPD"() { when: - def result = parseRequestXml() + def result = generateRequestXml() then: "mandatory exclusion plus all selection plus the award criteria (eo criteria)" result.Criterion.size() == getMandatoryExclusionCriteriaSize() + SelectionCriterion.values().length + OtherCriterion.values().length diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMixedCriteriaTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMixedCriteriaTest.groovy index eb9970216..6c3f8921f 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMixedCriteriaTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/EspdRequestMixedCriteriaTest.groovy @@ -99,7 +99,7 @@ class EspdRequestMixedCriteriaTest extends AbstractCriteriaFixture { ) when: - def result = parseRequestXml(espd) + def result = generateRequestXml(espd) then: "all exclusion and selection criteria (minus satisfies all), plus all economic operator criteria" result.Criterion.size() == ExclusionCriterion.values().length + SelectionCriterion.values().length - 1 + OtherCriterion.values().length diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorParticipatingProcurementProcedureRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorParticipatingProcurementProcedureRequestTest.groovy index 696ea71ab..15f685dc1 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorParticipatingProcurementProcedureRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorParticipatingProcurementProcedureRequestTest.groovy @@ -38,7 +38,7 @@ class EconomicOperatorParticipatingProcurementProcedureRequestTest extends Abstr def espd = new EspdDocument(eoParticipatingProcurementProcedure: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_PARTICIPATING_PROCUREMENT_PROCEDURE) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorRegisteredRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorRegisteredRequestTest.groovy index 977da2e83..3fc1966b0 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorRegisteredRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorRegisteredRequestTest.groovy @@ -38,7 +38,7 @@ class EconomicOperatorRegisteredRequestTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorReliesCapacitiesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorReliesCapacitiesRequestTest.groovy index c5130253d..4fc6c5457 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorReliesCapacitiesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/EconomicOperatorReliesCapacitiesRequestTest.groovy @@ -38,7 +38,7 @@ class EconomicOperatorReliesCapacitiesRequestTest extends AbstractCriteriaFixtur def espd = new EspdDocument(eoReliesCapacities: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_RELIES_CAPACITIES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/MeetsObjectiveRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/MeetsObjectiveRequestTest.groovy index 4adf91b47..3eb570fd6 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/MeetsObjectiveRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/MeetsObjectiveRequestTest.groovy @@ -37,7 +37,7 @@ class MeetsObjectiveRequestTest extends AbstractCriteriaFixture { def espd = new EspdDocument(meetsObjective: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/ProcurementReservedRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/ProcurementReservedRequestTest.groovy index 7382da894..f487935db 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/ProcurementReservedRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/ProcurementReservedRequestTest.groovy @@ -38,7 +38,7 @@ class ProcurementReservedRequestTest extends AbstractCriteriaFixture { def espd = new EspdDocument(procurementReserved: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.PROCUREMENT_RESERVED) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/SucontractingThirdPartiesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/SucontractingThirdPartiesRequestTest.groovy index 5760f5e82..312533db0 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/SucontractingThirdPartiesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/award/SucontractingThirdPartiesRequestTest.groovy @@ -38,7 +38,7 @@ class SucontractingThirdPartiesRequestTest extends AbstractCriteriaFixture { def espd = new EspdDocument(subcontractingThirdParties: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getEoCriterionIndex(OtherCriterion.SUBCONTRACTING_THIRD_PARTIES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AgreementsWithEORequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AgreementsWithEORequestTest.groovy index b3f730c0f..3ecc92d32 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AgreementsWithEORequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AgreementsWithEORequestTest.groovy @@ -37,7 +37,7 @@ class AgreementsWithEORequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(agreementsWithOtherEO: new MisconductDistortionCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.AGREEMENTS_WITH_OTHER_EO) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AnalogousSituationRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AnalogousSituationRequestTest.groovy index bf6c40d33..912f31f23 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AnalogousSituationRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AnalogousSituationRequestTest.groovy @@ -38,7 +38,7 @@ class AnalogousSituationRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(analogousSituation: new BankruptcyCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ArrangementWithCreditorsRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ArrangementWithCreditorsRequestTest.groovy index 68d716d87..e14e13d5e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ArrangementWithCreditorsRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ArrangementWithCreditorsRequestTest.groovy @@ -38,7 +38,7 @@ class ArrangementWithCreditorsRequestTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(arrangementWithCreditors: new BankruptcyCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AssetsAdministeredByLiquidatorRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AssetsAdministeredByLiquidatorRequestTest.groovy index 8263c167d..e350d893b 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AssetsAdministeredByLiquidatorRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/AssetsAdministeredByLiquidatorRequestTest.groovy @@ -38,7 +38,7 @@ class AssetsAdministeredByLiquidatorRequestTest extends AbstractExclusionCriteri def espd = new EspdDocument(assetsAdministeredByLiquidator: new BankruptcyCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BankruptcyRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BankruptcyRequestTest.groovy index 5c5afb5bb..adedc793f 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BankruptcyRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BankruptcyRequestTest.groovy @@ -38,7 +38,7 @@ class BankruptcyRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(bankruptcy: new BankruptcyCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.BANKRUPTCY) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsEnvironmentalRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsEnvironmentalRequestTest.groovy index 61622d07e..1fbe450f2 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsEnvironmentalRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsEnvironmentalRequestTest.groovy @@ -39,7 +39,7 @@ class BreachingObligationsEnvironmentalRequestTest extends AbstractExclusionCrit def espd = new EspdDocument(breachingObligationsEnvironmental: new LawCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_ENVIRONMENTAL) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsLabourRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsLabourRequestTest.groovy index 56a1bce49..2db840e9e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsLabourRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsLabourRequestTest.groovy @@ -38,7 +38,7 @@ class BreachingObligationsLabourRequestTest extends AbstractExclusionCriteriaFix def espd = new EspdDocument(breachingObligationsLabour: new LawCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_LABOUR) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsSocialRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsSocialRequestTest.groovy index 9f554b832..2469a74ac 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsSocialRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BreachingObligationsSocialRequestTest.groovy @@ -38,7 +38,7 @@ class BreachingObligationsSocialRequestTest extends AbstractExclusionCriteriaFix def espd = new EspdDocument(breachingObligationsSocial: new LawCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_SOCIAL) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BusinessActivitiesSuspendedRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BusinessActivitiesSuspendedRequestTest.groovy index d8796983a..a661378a7 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BusinessActivitiesSuspendedRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/BusinessActivitiesSuspendedRequestTest.groovy @@ -38,7 +38,7 @@ class BusinessActivitiesSuspendedRequestTest extends AbstractExclusionCriteriaFi def espd = new EspdDocument(businessActivitiesSuspended: new BankruptcyCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ChildLabourRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ChildLabourRequestTest.groovy index 7c8039756..189fde904 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ChildLabourRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ChildLabourRequestTest.groovy @@ -38,7 +38,7 @@ class ChildLabourRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ConflictOfInterestParticipationProcurementProcedureRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ConflictOfInterestParticipationProcurementProcedureRequestTest.groovy index b762b1718..68dc1f7a7 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ConflictOfInterestParticipationProcurementProcedureRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ConflictOfInterestParticipationProcurementProcedureRequestTest.groovy @@ -38,7 +38,7 @@ class ConflictOfInterestParticipationProcurementProcedureRequestTest extends Abs def espd = new EspdDocument(conflictInterest: new ConflictInterestCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.CONFLICT_OF_INTEREST_EO_PROCUREMENT_PROCEDURE) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/CorruptionRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/CorruptionRequestTest.groovy index 41bc6e375..b306f8abc 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/CorruptionRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/CorruptionRequestTest.groovy @@ -39,7 +39,7 @@ class CorruptionRequestTest extends AbstractExclusionCriteriaFixture { def idx = getRequestCriterionIndex(ExclusionCriterion.CORRUPTION) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) then: "CriterionID element" checkCriterionId(request, idx, "c27b7c4e-c837-4529-b867-ed55ce639db5") diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/DirectInvolvementPreparationProcurementRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/DirectInvolvementPreparationProcurementRequestTest.groovy index a1eb0cb43..e677664eb 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/DirectInvolvementPreparationProcurementRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/DirectInvolvementPreparationProcurementRequestTest.groovy @@ -38,7 +38,7 @@ class DirectInvolvementPreparationProcurementRequestTest extends AbstractExclusi def espd = new EspdDocument(involvementPreparationProcurement: new ConflictInterestCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.DIRECT_INVOLVEMENT_PROCUREMENT_PROCEDURE) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EarlyTerminationRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EarlyTerminationRequestTest.groovy index c95947c4b..037654dc9 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EarlyTerminationRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EarlyTerminationRequestTest.groovy @@ -38,7 +38,7 @@ class EarlyTerminationRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(earlyTermination: new ConflictInterestCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.EARLY_TERMINATION) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EspdRequestExclusionCriteriaMarshallingTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EspdRequestExclusionCriteriaMarshallingTest.groovy index 97172bd42..7afd7c5b0 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EspdRequestExclusionCriteriaMarshallingTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/EspdRequestExclusionCriteriaMarshallingTest.groovy @@ -63,7 +63,7 @@ class EspdRequestExclusionCriteriaMarshallingTest extends AbstractExclusionCrite purelyNationalGrounds: null) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = 0 then: "we should see the mandatory exclusion criteria (all of them minus 'purely national') plus all the selection criteria (since none of them are selected) plus the eo criteria" @@ -102,7 +102,7 @@ class EspdRequestExclusionCriteriaMarshallingTest extends AbstractExclusionCrite purelyNationalGrounds: new PurelyNationalGrounds(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = 0 then: "we should see all exclusion criteria ('purely national' is selected) plus all the selection criteria (since none of them are selected) plus the only award criterion" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/FraudRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/FraudRequestTest.groovy index 7c758241d..5c7e6ac64 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/FraudRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/FraudRequestTest.groovy @@ -39,7 +39,7 @@ class FraudRequestTest extends AbstractExclusionCriteriaFixture { def idx = getRequestCriterionIndex(ExclusionCriterion.FRAUD) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) then: "CriterionID element" checkCriterionId(request, idx, "297d2323-3ede-424e-94bc-a91561e6f320") diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyOfMisinterpretationRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyOfMisinterpretationRequestTest.groovy index 7022219cd..6edc9246e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyOfMisinterpretationRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyOfMisinterpretationRequestTest.groovy @@ -38,7 +38,7 @@ class GuiltyOfMisinterpretationRequestTest extends AbstractExclusionCriteriaFixt def espd = new EspdDocument(guiltyMisinterpretation: new ConflictInterestCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.GUILTY_OF_MISINTERPRETATION) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyProfessionalMisconductRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyProfessionalMisconductRequestTest.groovy index eeeebc618..4e83628a8 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyProfessionalMisconductRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/GuiltyProfessionalMisconductRequestTest.groovy @@ -38,7 +38,7 @@ class GuiltyProfessionalMisconductRequestTest extends AbstractExclusionCriteriaF def espd = new EspdDocument(guiltyGrave: new MisconductDistortionCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.GUILTY_OF_PROFESSIONAL_MISCONDUCT) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/InsolvencyRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/InsolvencyRequestTest.groovy index 29e2aa54f..cab36c6e9 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/InsolvencyRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/InsolvencyRequestTest.groovy @@ -38,7 +38,7 @@ class InsolvencyRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(insolvency: new BankruptcyCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.INSOLVENCY) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/MoneyLaunderingRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/MoneyLaunderingRequestTest.groovy index 302b114f3..02b22a2a7 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/MoneyLaunderingRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/MoneyLaunderingRequestTest.groovy @@ -39,7 +39,7 @@ class MoneyLaunderingRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(moneyLaundering: new CriminalConvictionsCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/NationalExclusionGroundsRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/NationalExclusionGroundsRequestTest.groovy index 5c29c64c3..078df9788 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/NationalExclusionGroundsRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/NationalExclusionGroundsRequestTest.groovy @@ -38,7 +38,7 @@ class NationalExclusionGroundsRequestTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(purelyNationalGrounds: new PurelyNationalGrounds(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ParticipationInCriminalOrganisationRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ParticipationInCriminalOrganisationRequestTest.groovy index b32f3eb00..88bb65487 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ParticipationInCriminalOrganisationRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/ParticipationInCriminalOrganisationRequestTest.groovy @@ -39,7 +39,7 @@ class ParticipationInCriminalOrganisationRequestTest extends AbstractExclusionCr def idx = getRequestCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) then: "CriterionID element" checkCriterionId(request, idx, "005eb9ed-1347-4ca3-bb29-9bc0db64e1ab") diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfSocialSecurityRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfSocialSecurityRequestTest.groovy index 2685b0164..25d01e2a4 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfSocialSecurityRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfSocialSecurityRequestTest.groovy @@ -39,7 +39,7 @@ class PaymentOfSocialSecurityRequestTest extends AbstractExclusionCriteriaFixtur def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfTaxesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfTaxesRequestTest.groovy index 1829ff6c0..da460d0d5 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfTaxesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/PaymentOfTaxesRequestTest.groovy @@ -39,7 +39,7 @@ class PaymentOfTaxesRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/TerroristOffencesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/TerroristOffencesRequestTest.groovy index 6109562e6..ff0234998 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/TerroristOffencesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/exclusion/TerroristOffencesRequestTest.groovy @@ -38,7 +38,7 @@ class TerroristOffencesRequestTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(terroristOffences: new CriminalConvictionsCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestAwardCriteriaImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestAwardCriteriaImportTest.groovy index 487b51486..321f3630d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestAwardCriteriaImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestAwardCriteriaImportTest.groovy @@ -23,20 +23,16 @@ */ package eu.europa.ec.grow.espd.xml.request.importing -import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils +import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport /** * Created by ratoico on 1/20/16 at 2:39 PM. */ class EspdRequestAwardCriteriaImportTest extends AbstractXmlFileImport { def "all award criteria should be selected for a ESPD request"() { - given: - def espdRequestXml = importXmlRequestFile("all_award_criteria_selected.xml") - when: - def espd = marshaller.importEspdRequest(IOUtils.toInputStream(espdRequestXml)).get() + def espd = parseXmlRequestFile("all_award_criteria_selected.xml") then: "should have all award criteria" espd.meetsObjective.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestExclusionCriteriaImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestExclusionCriteriaImportTest.groovy index 9de34995e..8d847b895 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestExclusionCriteriaImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestExclusionCriteriaImportTest.groovy @@ -25,18 +25,14 @@ package eu.europa.ec.grow.espd.xml.request.importing import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 11/25/15. */ class EspdRequestExclusionCriteriaImportTest extends AbstractXmlFileImport { def "all exclusion criteria should be selected"() { - given: - def espdRequestXml = importXmlRequestFile("all_exclusion_criteria_selected.xml") - when: - def espd = marshaller.importEspdRequest(IOUtils.toInputStream(espdRequestXml)).get() + def espd = parseXmlRequestFile("all_exclusion_criteria_selected.xml") then: "should have all criminal convictions and their default answers should be false" espd.criminalConvictions.exists == true @@ -98,11 +94,8 @@ class EspdRequestExclusionCriteriaImportTest extends AbstractXmlFileImport { } def "no exclusion criteria should appear as selected"() { - given: - def espdRequestXml = importXmlRequestFile("no_exclusion_criteria_selected.xml") - when: - def espd = marshaller.importEspdRequest(IOUtils.toInputStream(espdRequestXml)).get() + def espd = parseXmlRequestFile("no_exclusion_criteria_selected.xml") then: "criminal convictions" espd.criminalConvictions == null diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestOtherInformationImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestOtherInformationImportTest.groovy index eb4cf7832..71ddacbdb 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestOtherInformationImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestOtherInformationImportTest.groovy @@ -24,26 +24,19 @@ package eu.europa.ec.grow.espd.xml.request.importing -import eu.europa.ec.grow.espd.domain.enums.other.Country import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.enums.other.Country import eu.europa.ec.grow.espd.xml.LocalDateAdapter import eu.europa.ec.grow.espd.xml.LocalTimeAdapter import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils import org.joda.time.LocalDate import org.joda.time.LocalTime import spock.lang.Shared - /** * Created by ratoico on 1/18/16 at 2:56 PM. */ class EspdRequestOtherInformationImportTest extends AbstractXmlFileImport { - @Shared - static def espdRequestFullXml - @Shared - static def espdRequestMinimalXml - @Shared static EspdDocument espdFull @Shared @@ -51,15 +44,11 @@ class EspdRequestOtherInformationImportTest extends AbstractXmlFileImport { void setupSpec() { // init objects run before the first feature method - espdRequestFullXml = importXmlRequestFile("request_other_information_full_import.xml") - espdRequestMinimalXml = importXmlRequestFile("request_other_information_minimal_import.xml") - espdFull = marshaller.importEspdRequest(IOUtils.toInputStream(espdRequestFullXml)).get() - espdMinimal = marshaller.importEspdRequest(IOUtils.toInputStream(espdRequestMinimalXml)).get() + espdFull = parseXmlRequestFile("request_other_information_full_import.xml") + espdMinimal = parseXmlRequestFile("request_other_information_minimal_import.xml") } void cleanupSpec() { - espdRequestFullXml = null - espdRequestMinimalXml = null espdFull = null espdMinimal = null } @@ -106,8 +95,7 @@ class EspdRequestOtherInformationImportTest extends AbstractXmlFileImport { def "we should not load the ojs number if it is marked as a temporary one"() { given: - def espdXml = importXmlRequestFile("request_temporary_ojs_number_import.xml") - EspdDocument espd = marshaller.importEspdRequest(IOUtils.toInputStream(espdXml)).get() + EspdDocument espd = parseXmlRequestFile("request_temporary_ojs_number_import.xml") expect: espd.fileRefByCA == "SMART 2016/0069" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestSelectionCriteriaImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestSelectionCriteriaImportTest.groovy index 6e9721e19..0592b36b4 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestSelectionCriteriaImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/importing/EspdRequestSelectionCriteriaImportTest.groovy @@ -23,20 +23,17 @@ */ package eu.europa.ec.grow.espd.xml.request.importing + import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/6/16 at 3:15 PM. */ class EspdRequestSelectionCriteriaImportTest extends AbstractXmlFileImport { def "all exclusion criteria should be selected"() { - given: - def espdRequestXml = importXmlRequestFile("all_selection_criteria_selected.xml") - when: - EspdDocument espd = marshaller.importEspdRequest(IOUtils.toInputStream(espdRequestXml)).get() + EspdDocument espd = parseXmlRequestFile("all_selection_criteria_selected.xml") then: "all criteria satisfied has no default answer value" espd.selectionSatisfiesAll == null @@ -111,11 +108,8 @@ class EspdRequestSelectionCriteriaImportTest extends AbstractXmlFileImport { } def "no exclusion criteria should appear as selected"() { - given: - def espdRequestXml = importXmlRequestFile("no_selection_criteria_selected.xml") - when: - EspdDocument espd = marshaller.importEspdRequest(IOUtils.toInputStream(espdRequestXml)).get() + EspdDocument espd = parseXmlRequestFile("no_selection_criteria_selected.xml") then: "all criteria satisfied" espd.selectionSatisfiesAll == null diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllCriteriaSatisfiedRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllCriteriaSatisfiedRequestTest.groovy index dbd385eed..c65054afe 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllCriteriaSatisfiedRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllCriteriaSatisfiedRequestTest.groovy @@ -39,7 +39,7 @@ class AllCriteriaSatisfiedRequestTest extends AbstractSelectionCriteriaFixture { def idx = getRequestCriterionIndex(SelectionCriterion.ALL_SELECTION_CRITERIA_SATISFIED) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) then: "CriterionID element" checkCriterionId(request, idx, "7e7db838-eeac-46d9-ab39-42927486f22d") diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllowanceOfChecksRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllowanceOfChecksRequestTest.groovy index 193bb704d..bbecd40b5 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllowanceOfChecksRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AllowanceOfChecksRequestTest.groovy @@ -38,7 +38,7 @@ class AllowanceOfChecksRequestTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(allowanceOfChecks: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.ALLOWANCE_OF_CHECKS) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageAnnualManpowerRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageAnnualManpowerRequestTest.groovy index 3f1d1e182..60a26756d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageAnnualManpowerRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageAnnualManpowerRequestTest.groovy @@ -38,7 +38,7 @@ class AverageAnnualManpowerRequestTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(averageAnnualManpower: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageYearlyTurnoverRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageYearlyTurnoverRequestTest.groovy index 4336d5883..f84f14c0a 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageYearlyTurnoverRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/AverageYearlyTurnoverRequestTest.groovy @@ -38,7 +38,7 @@ class AverageYearlyTurnoverRequestTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(averageYearlyTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.AVERAGE_YEARLY_TURNOVER) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesEnvironmentalRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesEnvironmentalRequestTest.groovy index 169c5e1f0..38efa4d89 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesEnvironmentalRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesEnvironmentalRequestTest.groovy @@ -37,7 +37,7 @@ class CertificatesIndependentBodiesEnvironmentalRequestTest extends AbstractSele def espd = new EspdDocument(certificateIndependentBodiesAboutEnvironmental: new QualityAssuranceCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_ENVIRONMENTAL) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesQARequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesQARequestTest.groovy index 9756158b6..1f94ac0c3 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesQARequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/CertificatesIndependentBodiesQARequestTest.groovy @@ -37,7 +37,7 @@ class CertificatesIndependentBodiesQARequestTest extends AbstractSelectionCriter def espd = new EspdDocument(certificateIndependentBodiesAboutQa: new QualityAssuranceCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_QA) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EducationalProfessionalQualificationsRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EducationalProfessionalQualificationsRequestTest.groovy index 487654a6e..a2594c247 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EducationalProfessionalQualificationsRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EducationalProfessionalQualificationsRequestTest.groovy @@ -38,7 +38,7 @@ class EducationalProfessionalQualificationsRequestTest extends AbstractSelection def espd = new EspdDocument(educationalProfessionalQualifications: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.EDUCATIONAL_AND_PROFESSIONAL_QUALIFICATIONS) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentProfessionalRegisterRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentProfessionalRegisterRequestTest.groovy index 1f107b18b..ae7c86e05 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentProfessionalRegisterRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentProfessionalRegisterRequestTest.groovy @@ -38,7 +38,7 @@ class EnrolmentProfessionalRegisterRequestTest extends AbstractSelectionCriteria def espd = new EspdDocument(enrolmentProfessionalRegister: new SuitabilityCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.ENROLMENT_PROFESSIONAL_REGISTER) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentTradeRegisterRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentTradeRegisterRequestTest.groovy index 70b4ce19e..c4f96a6cd 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentTradeRegisterRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnrolmentTradeRegisterRequestTest.groovy @@ -38,7 +38,7 @@ class EnrolmentTradeRegisterRequestTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(enrolmentTradeRegister: new SuitabilityCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.ENROLMENT_TRADE_REGISTER) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnvironmentalManagementMeasuresRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnvironmentalManagementMeasuresRequestTest.groovy index 78ae8de05..3498e5f7e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnvironmentalManagementMeasuresRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EnvironmentalManagementMeasuresRequestTest.groovy @@ -38,7 +38,7 @@ class EnvironmentalManagementMeasuresRequestTest extends AbstractSelectionCriter def espd = new EspdDocument(environmentalManagementFeatures: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.ENVIRONMENTAL_MANAGEMENT_FEATURES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EspdRequestSelectionCriteriaMarshallingTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EspdRequestSelectionCriteriaMarshallingTest.groovy index 2b70e52e1..063dba2fc 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EspdRequestSelectionCriteriaMarshallingTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/EspdRequestSelectionCriteriaMarshallingTest.groovy @@ -44,7 +44,7 @@ class EspdRequestSelectionCriteriaMarshallingTest extends AbstractSelectionCrite def idx = getRequestCriterionIndex(SelectionCriterion.ALL_SELECTION_CRITERIA_SATISFIED) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) then: "all mandatory exclusion criteria (minus 'purely national') plus 'satisifes all' plus the eo criteria" request.Criterion.size() == getMandatoryExclusionCriteriaSize() + 1 + OtherCriterion.values().length @@ -77,7 +77,7 @@ class EspdRequestSelectionCriteriaMarshallingTest extends AbstractSelectionCrite workContractsPerformanceOfWorks: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) then: "only selected selection criteria are present plus mandatory exclusion plus the award criterion" request.Criterion.size() == getMandatoryExclusionCriteriaSize() + 3 + OtherCriterion.values().length @@ -128,7 +128,7 @@ class EspdRequestSelectionCriteriaMarshallingTest extends AbstractSelectionCrite certificateIndependentBodiesAboutEnvironmental: null) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) then: "all mandatory exclusion plus all selection plus the only award criterion" request.Criterion.size() == getMandatoryExclusionCriteriaSize() + SelectionCriterion.values().length + OtherCriterion.values().length diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/FinancialRatioRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/FinancialRatioRequestTest.groovy index 7cb340758..5d77bc4f7 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/FinancialRatioRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/FinancialRatioRequestTest.groovy @@ -38,7 +38,7 @@ class FinancialRatioRequestTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(financialRatio: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.FINANCIAL_RATIO) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/GeneralYearlyTurnoverRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/GeneralYearlyTurnoverRequestTest.groovy index 71821ee9b..daec8fcef 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/GeneralYearlyTurnoverRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/GeneralYearlyTurnoverRequestTest.groovy @@ -38,7 +38,7 @@ class GeneralYearlyTurnoverRequestTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(generalYearlyTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/NumberOfManagerialStaffRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/NumberOfManagerialStaffRequestTest.groovy index 4ef075c94..7cca43c88 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/NumberOfManagerialStaffRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/NumberOfManagerialStaffRequestTest.groovy @@ -38,7 +38,7 @@ class NumberOfManagerialStaffRequestTest extends AbstractSelectionCriteriaFixtur def espd = new EspdDocument(numberManagerialStaff: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/OtherEconomicFinancialRequirementsRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/OtherEconomicFinancialRequirementsRequestTest.groovy index 2e83322f2..717853b2c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/OtherEconomicFinancialRequirementsRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/OtherEconomicFinancialRequirementsRequestTest.groovy @@ -38,7 +38,7 @@ class OtherEconomicFinancialRequirementsRequestTest extends AbstractSelectionCri def espd = new EspdDocument(otherEconomicFinancialRequirements: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.OTHER_ECONOMIC_OR_FINANCIAL_REQUIREMENTS) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ProfessionalRiskIndemnityRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ProfessionalRiskIndemnityRequestTest.groovy index 1db0cf03f..e365f7fd4 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ProfessionalRiskIndemnityRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ProfessionalRiskIndemnityRequestTest.groovy @@ -38,7 +38,7 @@ class ProfessionalRiskIndemnityRequestTest extends AbstractSelectionCriteriaFixt def espd = new EspdDocument(professionalRiskInsurance: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.PROFESSIONAL_RISK_INSURANCE) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsAuthorisationRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsAuthorisationRequestTest.groovy index ccb428531..b7d7d128d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsAuthorisationRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsAuthorisationRequestTest.groovy @@ -38,7 +38,7 @@ class ServiceContractsAuthorisationRequestTest extends AbstractSelectionCriteria def espd = new EspdDocument(serviceContractsAuthorisation: new SuitabilityCriterion(exists: true)) when: - def response = parseRequestXml(espd) + def response = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsMembershipRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsMembershipRequestTest.groovy index 01d90b484..eeeb033dc 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsMembershipRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsMembershipRequestTest.groovy @@ -38,7 +38,7 @@ class ServiceContractsMembershipRequestTest extends AbstractSelectionCriteriaFix def espd = new EspdDocument(serviceContractsMembership: new SuitabilityCriterion(exists: true)) when: - def response = parseRequestXml(espd) + def response = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_MEMBERSHIP) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsPerformanceServicesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsPerformanceServicesRequestTest.groovy index c20e863bb..067e013fb 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsPerformanceServicesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ServiceContractsPerformanceServicesRequestTest.groovy @@ -38,7 +38,7 @@ class ServiceContractsPerformanceServicesRequestTest extends AbstractSelectionCr def espd = new EspdDocument(serviceContractsPerformanceServices: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SetupEconomicOperatorRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SetupEconomicOperatorRequestTest.groovy index 523fe5178..0ea349712 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SetupEconomicOperatorRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SetupEconomicOperatorRequestTest.groovy @@ -38,7 +38,7 @@ class SetupEconomicOperatorRequestTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(setupEconomicOperator: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SETUP_ECONOMIC_OPERATOR) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificAverageTurnoverRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificAverageTurnoverRequestTest.groovy index abc85236d..103bb28a4 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificAverageTurnoverRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificAverageTurnoverRequestTest.groovy @@ -38,7 +38,7 @@ class SpecificAverageTurnoverRequestTest extends AbstractSelectionCriteriaFixtur def espd = new EspdDocument(specificAverageTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SPECIFIC_AVERAGE_TURNOVER) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificYearlyTurnoverRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificYearlyTurnoverRequestTest.groovy index 156892b6e..cf6a1cb6f 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificYearlyTurnoverRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SpecificYearlyTurnoverRequestTest.groovy @@ -38,7 +38,7 @@ class SpecificYearlyTurnoverRequestTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(specificYearlyTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SPECIFIC_YEARLY_TURNOVER) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/StudyResearchFacilitiesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/StudyResearchFacilitiesRequestTest.groovy index b1b43094b..f3a2ec328 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/StudyResearchFacilitiesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/StudyResearchFacilitiesRequestTest.groovy @@ -38,7 +38,7 @@ class StudyResearchFacilitiesRequestTest extends AbstractSelectionCriteriaFixtur def espd = new EspdDocument(studyResearchFacilities: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.STUDY_AND_RESEARCH_FACILITIES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SubcontractingProportionRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SubcontractingProportionRequestTest.groovy index a23ae9c04..5b74948de 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SubcontractingProportionRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SubcontractingProportionRequestTest.groovy @@ -38,7 +38,7 @@ class SubcontractingProportionRequestTest extends AbstractSelectionCriteriaFixtu def espd = new EspdDocument(subcontractingProportion: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SUBCONTRACTING_PROPORTION) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyChainManagementRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyChainManagementRequestTest.groovy index 7108db132..d294418f7 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyChainManagementRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyChainManagementRequestTest.groovy @@ -38,7 +38,7 @@ class SupplyChainManagementRequestTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(supplyChainManagement: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SUPPLY_CHAIN_MANAGEMENT) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsCertificatesByQCRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsCertificatesByQCRequestTest.groovy index 5c4629b0a..40d0a8b56 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsCertificatesByQCRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsCertificatesByQCRequestTest.groovy @@ -38,7 +38,7 @@ class SupplyContractsCertificatesByQCRequestTest extends AbstractSelectionCriter def espd = new EspdDocument(supplyContractsCertificatesQc: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_CERTIFICATES_QC) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsPerformanceDeliveriesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsPerformanceDeliveriesRequestTest.groovy index f405d17b3..61c183640 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsPerformanceDeliveriesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsPerformanceDeliveriesRequestTest.groovy @@ -38,7 +38,7 @@ class SupplyContractsPerformanceDeliveriesRequestTest extends AbstractSelectionC def espd = new EspdDocument(supplyContractsPerformanceDeliveries: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithCARequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithCARequestTest.groovy index 98bc64cb8..b74663b65 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithCARequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithCARequestTest.groovy @@ -38,7 +38,7 @@ class SupplyContractsSamplesWithCARequestTest extends AbstractSelectionCriteriaF def espd = new EspdDocument(supplyContractsSamplesDescriptionsWithCa: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITH_CA) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithoutCARequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithoutCARequestTest.groovy index 60451a095..196dc86a1 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithoutCARequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/SupplyContractsSamplesWithoutCARequestTest.groovy @@ -38,7 +38,7 @@ class SupplyContractsSamplesWithoutCARequestTest extends AbstractSelectionCriter def espd = new EspdDocument(supplyContractsSamplesDescriptionsWithoutCa: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITHOUT_CA) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechnicalFacilitiesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechnicalFacilitiesRequestTest.groovy index 2d3e53c14..6b806e9e3 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechnicalFacilitiesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechnicalFacilitiesRequestTest.groovy @@ -38,7 +38,7 @@ class TechnicalFacilitiesRequestTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(technicalFacilitiesMeasures: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.TECHNICAL_FACILITIES_AND_MEASURES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechniciansTechnicalBodiesRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechniciansTechnicalBodiesRequestTest.groovy index 8ab5b9890..a4af728f7 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechniciansTechnicalBodiesRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/TechniciansTechnicalBodiesRequestTest.groovy @@ -38,7 +38,7 @@ class TechniciansTechnicalBodiesRequestTest extends AbstractSelectionCriteriaFix def espd = new EspdDocument(techniciansTechnicalBodies: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseRequestXml(espd) + def response = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.TECHNICIANS_OR_TECHNICAL_BODIES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ToolsPlantRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ToolsPlantRequestTest.groovy index 3df82b2c2..9638386bd 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ToolsPlantRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/ToolsPlantRequestTest.groovy @@ -38,7 +38,7 @@ class ToolsPlantRequestTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(toolsPlantTechnicalEquipment: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.TOOLS_PLANT_TECHNICAL_EQUIPMENT) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsPerformanceWorksRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsPerformanceWorksRequestTest.groovy index ed1d41975..23987cd4c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsPerformanceWorksRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsPerformanceWorksRequestTest.groovy @@ -38,7 +38,7 @@ class WorkContractsPerformanceWorksRequestTest extends AbstractSelectionCriteria def espd = new EspdDocument(workContractsPerformanceOfWorks: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseRequestXml(espd) + def request = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsTechniciansRequestTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsTechniciansRequestTest.groovy index 5376c6277..bcda34533 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsTechniciansRequestTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/request/selection/WorkContractsTechniciansRequestTest.groovy @@ -38,7 +38,7 @@ class WorkContractsTechniciansRequestTest extends AbstractSelectionCriteriaFixtu def espd = new EspdDocument(workContractsTechnicians: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseRequestXml(espd) + def response = generateRequestXml(espd) def idx = getRequestCriterionIndex(SelectionCriterion.WORK_CONTRACTS_TECHNICIANS_OR_TECHNICAL_BODIES) then: "CriterionID element" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/CriterionRequirementsTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/CriterionRequirementsTest.groovy index 0fafbc30a..c1eb6ef77 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/CriterionRequirementsTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/CriterionRequirementsTest.groovy @@ -42,7 +42,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { description: " ")) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: @@ -58,7 +58,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false, url: null, code: " "))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) def subGroup = request.Criterion[idx].RequirementGroup[1] @@ -81,7 +81,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true, periodLength: " ")) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -96,7 +96,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true, dateOfConviction: null)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -111,7 +111,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, country: null)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -125,7 +125,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, amount: null, currency: null)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -140,7 +140,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { unboundedGroups: [new DynamicRequirementGroup("year": null)])) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.SelectionCriterion.GENERAL_YEARLY_TURNOVER) then: @@ -156,7 +156,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { unboundedGroups: [new DynamicRequirementGroup("number": null)])) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: "First number" @@ -172,7 +172,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { unboundedGroups: [new DynamicRequirementGroup("ratio": null)])) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.SelectionCriterion.FINANCIAL_RATIO) then: @@ -188,7 +188,7 @@ class CriterionRequirementsTest extends AbstractCriteriaFixture { doubleValue1: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.PROCUREMENT_RESERVED) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseCriteriaTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseCriteriaTest.groovy index bd62e6cd6..bf62b8977 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseCriteriaTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseCriteriaTest.groovy @@ -41,7 +41,7 @@ class EspdResponseCriteriaTest extends AbstractCriteriaFixture { def idx = 0 when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) then: "there are no mandatory exclusion criteria anymore" response.Criterion.size() == getMandatoryExclusionCriteriaSize() + SelectionCriterion.values().length + OtherCriterion.values().length @@ -62,7 +62,7 @@ class EspdResponseCriteriaTest extends AbstractCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -79,7 +79,7 @@ class EspdResponseCriteriaTest extends AbstractCriteriaFixture { def espd = new EspdDocument(enrolmentProfessionalRegister: new SuitabilityCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_PROFESSIONAL_REGISTER) then: @@ -96,7 +96,7 @@ class EspdResponseCriteriaTest extends AbstractCriteriaFixture { def espd = new EspdDocument(meetsObjective: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseMarshallingTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseMarshallingTest.groovy index 0cdf2c2df..5394bb354 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseMarshallingTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/EspdResponseMarshallingTest.groovy @@ -39,7 +39,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should make sure that we use the correct XML namespaces"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: result.lookupNamespace('espd-req') == 'urn:grow:names:specification:ubl:schema:xsd:ESPDRequest-1' @@ -55,7 +55,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain UBLVersionID element information"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: result.UBLVersionID.text() == "2.1" @@ -64,7 +64,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain CustomizationID element information"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: result.CustomizationID.text() == "urn:www.cenbii.eu:transaction:biitrns092:ver3.0" @@ -75,7 +75,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain ID element information"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: "id is an UUID" result.ID.text().length() == 36 @@ -89,7 +89,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain CopyIndicator element information"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: result.CopyIndicator.size() == 1 @@ -98,7 +98,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain VersionID element information"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: result.VersionID.text() == "2016.4" @@ -107,7 +107,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain IssueDate element information with default document date"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: "issue date must match the date format YYYY-MM-dd" result.IssueDate.text() ==~ "\\d{4}-\\d{2}-\\d{2}" @@ -119,7 +119,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(documentDate: documentDate) when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: "issue date must match the date format YYYY-MM-dd" result.IssueDate.text() == LocalDateAdapter.marshal(new LocalDate(documentDate)) @@ -130,7 +130,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(location: "Eastwatch by the Sea") when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: "issue date must match the date format YYYY-MM-dd" result.Signature[0].text().length() == 56 @@ -139,7 +139,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain IssueTime element information"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: "issue time must match the time format HH:mm:ss" result.IssueTime.text() ==~ "\\d{2}:\\d{2}:\\d{2}" @@ -154,7 +154,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(authority: authority) when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: "all values should be trimmed" result.ContractingParty.Party.PartyName.Name.text() == "Hodor authority" @@ -187,7 +187,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(economicOperator: economicOperator) when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: "all values should be trimmed" result.EconomicOperatorParty.Party.PartyName.Name.text() == "ACME Corp." @@ -235,7 +235,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(economicOperator: economicOperator) when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.EconomicOperatorParty.RepresentativeNaturalPerson.size() == 2 @@ -269,7 +269,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def "should contain ProcurementProjectLot element information when there are no lots"() { when: - def result = parseResponseXml() + def result = generateResponseXml() then: "In a Procurement Project with no Lots one ProcurementProjectLot element, and only one, MUST be included in the XML instance" result.ProcurementProjectLot.size() == 1 @@ -283,7 +283,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(lotConcerned: "hodor lot") when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.ProcurementProjectLot.size() == 1 @@ -300,7 +300,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { tedUrl: "http://ted.europa.eu/udl?uri=TED:NOTICE:002226-2016:TEXT:ES:HTML") when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.AdditionalDocumentReference[0].ID.text() == "S206|2015-10-23|PN33|2015/S 206-373035" @@ -329,7 +329,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { tedUrl: "http://ted.europa.eu/udl?uri=TED:NOTICE:002226-2016:TEXT:ES:HTML") when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.AdditionalDocumentReference.size() == 1 @@ -358,7 +358,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(fileRefByCA: "HODOR refd by CA") when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.ContractFolderID.text() == "HODOR refd by CA" @@ -372,7 +372,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { issueDate: now, description: "ESPDRequest SMART 2015/0065", url: "http://europa.ec.eu/espd/request/4a1a633c-25fa-4c4d-abd8-89c623f9e9ec")) when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.AdditionalDocumentReference[0].ID.text() == "4a1a633c-25fa-4c4d-abd8-89c623f9e9ec" @@ -406,7 +406,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { issueDate: now, description: "ESPDRequest SMART 2015/0065", url: "http://europa.ec.eu/espd/request/4a1a633c-25fa-4c4d-abd8-89c623f9e9ec")) when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.AdditionalDocumentReference.size() == 1 @@ -421,7 +421,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { issueDate: null)) when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.AdditionalDocumentReference[0].IssueDate.size() == 0 @@ -433,7 +433,7 @@ class EspdResponseMarshallingTest extends AbstractEspdXmlMarshalling { def espd = new EspdDocument(consortiumName: "Lannister Inc.") when: - def result = parseResponseXml(espd) + def result = generateResponseXml(espd) then: result.EconomicOperatorGroupName.text() == "Lannister Inc." diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorParticipatingProcurementProcedureResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorParticipatingProcurementProcedureResponseTest.groovy index 851f8ad83..a16641f3f 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorParticipatingProcurementProcedureResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorParticipatingProcurementProcedureResponseTest.groovy @@ -39,7 +39,7 @@ class EconomicOperatorParticipatingProcurementProcedureResponseTest extends Abst def espd = new EspdDocument(eoParticipatingProcurementProcedure: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_PARTICIPATING_PROCUREMENT_PROCEDURE) then: "CriterionID element" @@ -83,7 +83,7 @@ class EconomicOperatorParticipatingProcurementProcedureResponseTest extends Abst def espd = new EspdDocument(eoParticipatingProcurementProcedure: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_PARTICIPATING_PROCUREMENT_PROCEDURE) then: @@ -98,7 +98,7 @@ class EconomicOperatorParticipatingProcurementProcedureResponseTest extends Abst def espd = new EspdDocument(eoParticipatingProcurementProcedure: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description1: "descr 1")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_PARTICIPATING_PROCUREMENT_PROCEDURE) then: @@ -114,7 +114,7 @@ class EconomicOperatorParticipatingProcurementProcedureResponseTest extends Abst def espd = new EspdDocument(eoParticipatingProcurementProcedure: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description2: "descr 2")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_PARTICIPATING_PROCUREMENT_PROCEDURE) then: @@ -131,7 +131,7 @@ class EconomicOperatorParticipatingProcurementProcedureResponseTest extends Abst def espd = new EspdDocument(eoParticipatingProcurementProcedure: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description3: "descr 3")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_PARTICIPATING_PROCUREMENT_PROCEDURE) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorRegisteredResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorRegisteredResponseTest.groovy index a1899dffc..1334594b3 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorRegisteredResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorRegisteredResponseTest.groovy @@ -39,7 +39,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: "CriterionID element" @@ -109,7 +109,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: @@ -124,7 +124,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description1: "descr 1")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: @@ -140,7 +140,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description2: "descr 2")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: @@ -157,7 +157,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description3: "descr 3")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: @@ -174,7 +174,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, booleanValue1: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: @@ -191,7 +191,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, booleanValue3: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: @@ -209,7 +209,7 @@ class EconomicOperatorRegisteredResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(eoRegistered: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description5: "descr 5")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_REGISTERED) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorReliesCapacitiesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorReliesCapacitiesResponseTest.groovy index f5814a626..7fe17eb36 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorReliesCapacitiesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/EconomicOperatorReliesCapacitiesResponseTest.groovy @@ -38,7 +38,7 @@ class EconomicOperatorReliesCapacitiesResponseTest extends AbstractCriteriaFixtu def espd = new EspdDocument(eoReliesCapacities: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_RELIES_CAPACITIES) then: "CriterionID element" @@ -70,7 +70,7 @@ class EconomicOperatorReliesCapacitiesResponseTest extends AbstractCriteriaFixtu def espd = new EspdDocument(eoReliesCapacities: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.EO_RELIES_CAPACITIES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/MeetsObjectiveResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/MeetsObjectiveResponseTest.groovy index 668ad688b..9c19b2fec 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/MeetsObjectiveResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/MeetsObjectiveResponseTest.groovy @@ -38,7 +38,7 @@ class MeetsObjectiveResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(meetsObjective: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: "CriterionID element" @@ -97,7 +97,7 @@ class MeetsObjectiveResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(meetsObjective: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: @@ -112,7 +112,7 @@ class MeetsObjectiveResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(meetsObjective: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description1: "descr 1")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: @@ -129,7 +129,7 @@ class MeetsObjectiveResponseTest extends AbstractCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: @@ -145,7 +145,7 @@ class MeetsObjectiveResponseTest extends AbstractCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_07.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: @@ -161,7 +161,7 @@ class MeetsObjectiveResponseTest extends AbstractCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_05"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.MEETS_OBJECTIVE) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/ProcurementReservedResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/ProcurementReservedResponseTest.groovy index dc3db6bc4..ac95269b7 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/ProcurementReservedResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/ProcurementReservedResponseTest.groovy @@ -38,7 +38,7 @@ class ProcurementReservedResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(procurementReserved: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.PROCUREMENT_RESERVED) then: "CriterionID element" @@ -80,7 +80,7 @@ class ProcurementReservedResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(procurementReserved: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.PROCUREMENT_RESERVED) then: @@ -96,7 +96,7 @@ class ProcurementReservedResponseTest extends AbstractCriteriaFixture { doubleValue1: 33.11)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.PROCUREMENT_RESERVED) then: @@ -114,7 +114,7 @@ class ProcurementReservedResponseTest extends AbstractCriteriaFixture { description1: "Here are some additional details")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.PROCUREMENT_RESERVED) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/SucontractingThirdPartiesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/SucontractingThirdPartiesResponseTest.groovy index 3a4477521..f51310bb2 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/SucontractingThirdPartiesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/award/SucontractingThirdPartiesResponseTest.groovy @@ -38,7 +38,7 @@ class SucontractingThirdPartiesResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(subcontractingThirdParties: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.SUBCONTRACTING_THIRD_PARTIES) then: "CriterionID element" @@ -78,7 +78,7 @@ class SucontractingThirdPartiesResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(subcontractingThirdParties: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.SUBCONTRACTING_THIRD_PARTIES) then: @@ -93,7 +93,7 @@ class SucontractingThirdPartiesResponseTest extends AbstractCriteriaFixture { def espd = new EspdDocument(subcontractingThirdParties: new eu.europa.ec.grow.espd.domain.OtherCriterion(exists: true, description1: "descr 1")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getEoCriterionIndex(OtherCriterion.SUBCONTRACTING_THIRD_PARTIES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AgreementsWithEOResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AgreementsWithEOResponseTest.groovy index ec06251dc..02d20e910 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AgreementsWithEOResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AgreementsWithEOResponseTest.groovy @@ -39,7 +39,7 @@ class AgreementsWithEOResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(agreementsWithOtherEO: new MisconductDistortionCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.AGREEMENTS_WITH_OTHER_EO) then: "CriterionID element" @@ -86,7 +86,7 @@ class AgreementsWithEOResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(agreementsWithOtherEO: new MisconductDistortionCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.AGREEMENTS_WITH_OTHER_EO) then: @@ -102,7 +102,7 @@ class AgreementsWithEOResponseTest extends AbstractExclusionCriteriaFixture { description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.AGREEMENTS_WITH_OTHER_EO) then: @@ -119,7 +119,7 @@ class AgreementsWithEOResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.AGREEMENTS_WITH_OTHER_EO) then: @@ -136,7 +136,7 @@ class AgreementsWithEOResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(description: "Hodor_19 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.AGREEMENTS_WITH_OTHER_EO) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AnalogousSituationResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AnalogousSituationResponseTest.groovy index 0b152de46..b99b02c0b 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AnalogousSituationResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AnalogousSituationResponseTest.groovy @@ -39,7 +39,7 @@ class AnalogousSituationResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(analogousSituation: new BankruptcyCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: "CriterionID element" @@ -91,7 +91,7 @@ class AnalogousSituationResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(analogousSituation: new BankruptcyCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: @@ -107,7 +107,7 @@ class AnalogousSituationResponseTest extends AbstractExclusionCriteriaFixture { description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: @@ -124,7 +124,7 @@ class AnalogousSituationResponseTest extends AbstractExclusionCriteriaFixture { reason: "Reason here.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: @@ -141,7 +141,7 @@ class AnalogousSituationResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: @@ -158,7 +158,7 @@ class AnalogousSituationResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_15.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: @@ -175,7 +175,7 @@ class AnalogousSituationResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_15"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ANALOGOUS_SITUATION) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ArrangementWithCreditorsResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ArrangementWithCreditorsResponseTest.groovy index 46b1ba66f..1a749f8b0 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ArrangementWithCreditorsResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ArrangementWithCreditorsResponseTest.groovy @@ -39,7 +39,7 @@ class ArrangementWithCreditorsResponseTest extends AbstractExclusionCriteriaFixt def espd = new EspdDocument(arrangementWithCreditors: new BankruptcyCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: "CriterionID element" @@ -91,7 +91,7 @@ class ArrangementWithCreditorsResponseTest extends AbstractExclusionCriteriaFixt def espd = new EspdDocument(arrangementWithCreditors: new BankruptcyCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: @@ -107,7 +107,7 @@ class ArrangementWithCreditorsResponseTest extends AbstractExclusionCriteriaFixt description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: @@ -124,7 +124,7 @@ class ArrangementWithCreditorsResponseTest extends AbstractExclusionCriteriaFixt reason: "Reason here.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: @@ -141,7 +141,7 @@ class ArrangementWithCreditorsResponseTest extends AbstractExclusionCriteriaFixt availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: @@ -158,7 +158,7 @@ class ArrangementWithCreditorsResponseTest extends AbstractExclusionCriteriaFixt availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_14.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: @@ -175,7 +175,7 @@ class ArrangementWithCreditorsResponseTest extends AbstractExclusionCriteriaFixt availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_14"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ARRANGEMENT_WITH_CREDITORS) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AssetsAdministeredByLiquidatorResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AssetsAdministeredByLiquidatorResponseTest.groovy index 2e716b0fb..604c8feda 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AssetsAdministeredByLiquidatorResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/AssetsAdministeredByLiquidatorResponseTest.groovy @@ -39,7 +39,7 @@ class AssetsAdministeredByLiquidatorResponseTest extends AbstractExclusionCriter def espd = new EspdDocument(assetsAdministeredByLiquidator: new BankruptcyCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: "CriterionID element" @@ -91,7 +91,7 @@ class AssetsAdministeredByLiquidatorResponseTest extends AbstractExclusionCriter def espd = new EspdDocument(assetsAdministeredByLiquidator: new BankruptcyCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: @@ -107,7 +107,7 @@ class AssetsAdministeredByLiquidatorResponseTest extends AbstractExclusionCriter description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: @@ -124,7 +124,7 @@ class AssetsAdministeredByLiquidatorResponseTest extends AbstractExclusionCriter reason: "Reason here.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: @@ -141,7 +141,7 @@ class AssetsAdministeredByLiquidatorResponseTest extends AbstractExclusionCriter availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: @@ -158,7 +158,7 @@ class AssetsAdministeredByLiquidatorResponseTest extends AbstractExclusionCriter availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_16.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: @@ -175,7 +175,7 @@ class AssetsAdministeredByLiquidatorResponseTest extends AbstractExclusionCriter availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_16"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.ASSETS_ADMINISTERED_BY_LIQUIDATOR) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BankruptcyResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BankruptcyResponseTest.groovy index b251224d5..4b81e112f 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BankruptcyResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BankruptcyResponseTest.groovy @@ -35,7 +35,7 @@ class BankruptcyResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(bankruptcy: new BankruptcyCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.BANKRUPTCY) then: "CriterionID element" @@ -87,7 +87,7 @@ class BankruptcyResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(bankruptcy: new BankruptcyCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.BANKRUPTCY) then: @@ -103,7 +103,7 @@ class BankruptcyResponseTest extends AbstractExclusionCriteriaFixture { description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.BANKRUPTCY) then: @@ -120,7 +120,7 @@ class BankruptcyResponseTest extends AbstractExclusionCriteriaFixture { reason: "Reason here.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.BANKRUPTCY) then: @@ -137,7 +137,7 @@ class BankruptcyResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.BANKRUPTCY) then: @@ -154,7 +154,7 @@ class BankruptcyResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_12.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.BANKRUPTCY) then: @@ -171,7 +171,7 @@ class BankruptcyResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_12"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.BANKRUPTCY) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsEnvironmentalResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsEnvironmentalResponseTest.groovy index 73db7eff2..88871d458 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsEnvironmentalResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsEnvironmentalResponseTest.groovy @@ -40,7 +40,7 @@ class BreachingObligationsEnvironmentalResponseTest extends AbstractExclusionCri def espd = new EspdDocument(breachingObligationsEnvironmental: new LawCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_ENVIRONMENTAL) then: "CriterionID element" @@ -83,7 +83,7 @@ class BreachingObligationsEnvironmentalResponseTest extends AbstractExclusionCri def espd = new EspdDocument(breachingObligationsEnvironmental: new LawCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_ENVIRONMENTAL) then: @@ -99,7 +99,7 @@ class BreachingObligationsEnvironmentalResponseTest extends AbstractExclusionCri description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_ENVIRONMENTAL) then: @@ -116,7 +116,7 @@ class BreachingObligationsEnvironmentalResponseTest extends AbstractExclusionCri selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_ENVIRONMENTAL) then: @@ -133,7 +133,7 @@ class BreachingObligationsEnvironmentalResponseTest extends AbstractExclusionCri selfCleaning: new SelfCleaning(description: "Hodor_09 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_ENVIRONMENTAL) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsLabourResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsLabourResponseTest.groovy index 7e2526944..9eff80ca6 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsLabourResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsLabourResponseTest.groovy @@ -39,7 +39,7 @@ class BreachingObligationsLabourResponseTest extends AbstractExclusionCriteriaFi def espd = new EspdDocument(breachingObligationsLabour: new LawCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_LABOUR) then: "CriterionID element" @@ -86,7 +86,7 @@ class BreachingObligationsLabourResponseTest extends AbstractExclusionCriteriaFi def espd = new EspdDocument(breachingObligationsLabour: new LawCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_LABOUR) then: @@ -102,7 +102,7 @@ class BreachingObligationsLabourResponseTest extends AbstractExclusionCriteriaFi description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_LABOUR) then: @@ -119,7 +119,7 @@ class BreachingObligationsLabourResponseTest extends AbstractExclusionCriteriaFi selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_LABOUR) then: @@ -136,7 +136,7 @@ class BreachingObligationsLabourResponseTest extends AbstractExclusionCriteriaFi selfCleaning: new SelfCleaning(description: "Hodor_11 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_LABOUR) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsSocialResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsSocialResponseTest.groovy index 8170fac39..c1e7397a5 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsSocialResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BreachingObligationsSocialResponseTest.groovy @@ -39,7 +39,7 @@ class BreachingObligationsSocialResponseTest extends AbstractExclusionCriteriaFi def espd = new EspdDocument(breachingObligationsSocial: new LawCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_SOCIAL) then: "CriterionID element" @@ -86,7 +86,7 @@ class BreachingObligationsSocialResponseTest extends AbstractExclusionCriteriaFi def espd = new EspdDocument(breachingObligationsSocial: new LawCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_SOCIAL) then: @@ -102,7 +102,7 @@ class BreachingObligationsSocialResponseTest extends AbstractExclusionCriteriaFi description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_SOCIAL) then: @@ -119,7 +119,7 @@ class BreachingObligationsSocialResponseTest extends AbstractExclusionCriteriaFi selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_SOCIAL) then: @@ -136,7 +136,7 @@ class BreachingObligationsSocialResponseTest extends AbstractExclusionCriteriaFi selfCleaning: new SelfCleaning(description: "Hodor_10 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BREACHING_OF_OBLIGATIONS_SOCIAL) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BusinessActivitiesSuspendedResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BusinessActivitiesSuspendedResponseTest.groovy index ba9d5479e..bd0b0a12f 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BusinessActivitiesSuspendedResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/BusinessActivitiesSuspendedResponseTest.groovy @@ -39,7 +39,7 @@ class BusinessActivitiesSuspendedResponseTest extends AbstractExclusionCriteriaF def espd = new EspdDocument(businessActivitiesSuspended: new BankruptcyCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: "CriterionID element" @@ -91,7 +91,7 @@ class BusinessActivitiesSuspendedResponseTest extends AbstractExclusionCriteriaF def espd = new EspdDocument(businessActivitiesSuspended: new BankruptcyCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: @@ -107,7 +107,7 @@ class BusinessActivitiesSuspendedResponseTest extends AbstractExclusionCriteriaF description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: @@ -124,7 +124,7 @@ class BusinessActivitiesSuspendedResponseTest extends AbstractExclusionCriteriaF reason: "Reason here.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: @@ -141,7 +141,7 @@ class BusinessActivitiesSuspendedResponseTest extends AbstractExclusionCriteriaF availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: @@ -158,7 +158,7 @@ class BusinessActivitiesSuspendedResponseTest extends AbstractExclusionCriteriaF availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_15.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: @@ -175,7 +175,7 @@ class BusinessActivitiesSuspendedResponseTest extends AbstractExclusionCriteriaF availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_15"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.BUSINESS_ACTIVITIES_SUSPENDED) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ChildLabourResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ChildLabourResponseTest.groovy index 4b8017f34..d0111398c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ChildLabourResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ChildLabourResponseTest.groovy @@ -43,7 +43,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: "CriterionID element" @@ -82,7 +82,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -100,7 +100,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -117,7 +117,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true, reason: "Reason_06 here")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -134,7 +134,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true, convicted: "Hodor_06 was convicted")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -151,7 +151,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(childLabour: new CriminalConvictionsCriterion(exists: true, periodLength: "7 years")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -169,7 +169,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -186,7 +186,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(description: "Hodor_06 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -203,7 +203,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -220,7 +220,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_06.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: @@ -237,7 +237,7 @@ class ChildLabourResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_06"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CHILD_LABOUR) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ConflictOfInterestParticipationProcurementProcedureResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ConflictOfInterestParticipationProcurementProcedureResponseTest.groovy index 0f258c405..4033b7623 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ConflictOfInterestParticipationProcurementProcedureResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ConflictOfInterestParticipationProcurementProcedureResponseTest.groovy @@ -38,7 +38,7 @@ class ConflictOfInterestParticipationProcurementProcedureResponseTest extends Ab def espd = new EspdDocument(conflictInterest: new ConflictInterestCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CONFLICT_OF_INTEREST_EO_PROCUREMENT_PROCEDURE) then: "CriterionID element" @@ -83,7 +83,7 @@ class ConflictOfInterestParticipationProcurementProcedureResponseTest extends Ab def espd = new EspdDocument(conflictInterest: new ConflictInterestCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CONFLICT_OF_INTEREST_EO_PROCUREMENT_PROCEDURE) then: @@ -99,7 +99,7 @@ class ConflictOfInterestParticipationProcurementProcedureResponseTest extends Ab description: "conflict description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.DIRECT_INVOLVEMENT_PROCUREMENT_PROCEDURE) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/CorruptionResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/CorruptionResponseTest.groovy index 9a601c10c..35ac52849 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/CorruptionResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/CorruptionResponseTest.groovy @@ -44,7 +44,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) then: "CriterionID element" checkCriterionId(response, idx, "c27b7c4e-c837-4529-b867-ed55ce639db5") @@ -82,7 +82,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(corruption: new CriminalConvictionsCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -100,7 +100,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(corruption: new CriminalConvictionsCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -117,7 +117,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(corruption: new CriminalConvictionsCriterion(exists: true, reason: "Reason_02 here")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -134,7 +134,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(corruption: new CriminalConvictionsCriterion(exists: true, convicted: "Hodor_02 was convicted")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -151,7 +151,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(corruption: new CriminalConvictionsCriterion(exists: true, periodLength: "7 years")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -169,7 +169,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -186,7 +186,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(description: "Hodor_02 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -203,7 +203,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -220,7 +220,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_02.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: @@ -237,7 +237,7 @@ class CorruptionResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_02"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.CORRUPTION) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/DirectInvolvementPreparationProcurementResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/DirectInvolvementPreparationProcurementResponseTest.groovy index df2d212ec..4b10fd395 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/DirectInvolvementPreparationProcurementResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/DirectInvolvementPreparationProcurementResponseTest.groovy @@ -38,7 +38,7 @@ class DirectInvolvementPreparationProcurementResponseTest extends AbstractExclus def espd = new EspdDocument(involvementPreparationProcurement: new ConflictInterestCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.DIRECT_INVOLVEMENT_PROCUREMENT_PROCEDURE) then: "CriterionID element" @@ -81,7 +81,7 @@ class DirectInvolvementPreparationProcurementResponseTest extends AbstractExclus def espd = new EspdDocument(involvementPreparationProcurement: new ConflictInterestCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.DIRECT_INVOLVEMENT_PROCUREMENT_PROCEDURE) then: @@ -97,7 +97,7 @@ class DirectInvolvementPreparationProcurementResponseTest extends AbstractExclus description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.DIRECT_INVOLVEMENT_PROCUREMENT_PROCEDURE) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/EarlyTerminationResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/EarlyTerminationResponseTest.groovy index 4e2c32a76..1e38e25b3 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/EarlyTerminationResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/EarlyTerminationResponseTest.groovy @@ -39,7 +39,7 @@ class EarlyTerminationResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(earlyTermination: new ConflictInterestCriterion(exists: true)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.EARLY_TERMINATION) then: "CriterionID element" @@ -86,7 +86,7 @@ class EarlyTerminationResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(earlyTermination: new ConflictInterestCriterion(exists: true, answer: true)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.EARLY_TERMINATION) then: @@ -102,7 +102,7 @@ class EarlyTerminationResponseTest extends AbstractExclusionCriteriaFixture { description: "bogus description.")) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.EARLY_TERMINATION) then: @@ -119,7 +119,7 @@ class EarlyTerminationResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(answer: false))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.EARLY_TERMINATION) then: @@ -136,7 +136,7 @@ class EarlyTerminationResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(description: "Hodor_17 is clean"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.EARLY_TERMINATION) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/FraudResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/FraudResponseTest.groovy index ce2d68dbe..41e055f20 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/FraudResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/FraudResponseTest.groovy @@ -44,7 +44,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) then: "CriterionID element" checkCriterionId(response, idx, "297d2323-3ede-424e-94bc-a91561e6f320") @@ -81,7 +81,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(fraud: new CriminalConvictionsCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -99,7 +99,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(fraud: new CriminalConvictionsCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -116,7 +116,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(fraud: new CriminalConvictionsCriterion(exists: true, reason: "Reason_03 here")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -133,7 +133,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(fraud: new CriminalConvictionsCriterion(exists: true, convicted: "Hodor_03 was convicted")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -150,7 +150,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(fraud: new CriminalConvictionsCriterion(exists: true, periodLength: "7 years")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -168,7 +168,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -185,7 +185,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(description: "Hodor_03 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -202,7 +202,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -219,7 +219,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_03.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: @@ -236,7 +236,7 @@ class FraudResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_03"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.FRAUD) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyOfMisinterpretationResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyOfMisinterpretationResponseTest.groovy index 6d3f3f860..b0e1fdb42 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyOfMisinterpretationResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyOfMisinterpretationResponseTest.groovy @@ -38,7 +38,7 @@ class GuiltyOfMisinterpretationResponseTest extends AbstractExclusionCriteriaFix def espd = new EspdDocument(guiltyMisinterpretation: new ConflictInterestCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.GUILTY_OF_MISINTERPRETATION) then: "CriterionID element" @@ -74,7 +74,7 @@ class GuiltyOfMisinterpretationResponseTest extends AbstractExclusionCriteriaFix def espd = new EspdDocument(guiltyMisinterpretation: new ConflictInterestCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.GUILTY_OF_MISINTERPRETATION) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyProfessionalMisconductResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyProfessionalMisconductResponseTest.groovy index 9086b38e2..090fd4a90 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyProfessionalMisconductResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/GuiltyProfessionalMisconductResponseTest.groovy @@ -39,7 +39,7 @@ class GuiltyProfessionalMisconductResponseTest extends AbstractExclusionCriteria def espd = new EspdDocument(guiltyGrave: new MisconductDistortionCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.GUILTY_OF_PROFESSIONAL_MISCONDUCT) then: "CriterionID element" @@ -86,7 +86,7 @@ class GuiltyProfessionalMisconductResponseTest extends AbstractExclusionCriteria def espd = new EspdDocument(guiltyGrave: new MisconductDistortionCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.GUILTY_OF_PROFESSIONAL_MISCONDUCT) then: @@ -102,7 +102,7 @@ class GuiltyProfessionalMisconductResponseTest extends AbstractExclusionCriteria description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.GUILTY_OF_PROFESSIONAL_MISCONDUCT) then: @@ -119,7 +119,7 @@ class GuiltyProfessionalMisconductResponseTest extends AbstractExclusionCriteria selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.GUILTY_OF_PROFESSIONAL_MISCONDUCT) then: @@ -136,7 +136,7 @@ class GuiltyProfessionalMisconductResponseTest extends AbstractExclusionCriteria selfCleaning: new SelfCleaning(description: "Hodor_16 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.GUILTY_OF_PROFESSIONAL_MISCONDUCT) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/InsolvencyResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/InsolvencyResponseTest.groovy index 3d3b30d74..6be015cca 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/InsolvencyResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/InsolvencyResponseTest.groovy @@ -39,7 +39,7 @@ class InsolvencyResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(insolvency: new BankruptcyCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.INSOLVENCY) then: "CriterionID element" @@ -88,7 +88,7 @@ class InsolvencyResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(insolvency: new BankruptcyCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.INSOLVENCY) then: @@ -104,7 +104,7 @@ class InsolvencyResponseTest extends AbstractExclusionCriteriaFixture { description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.INSOLVENCY) then: @@ -121,7 +121,7 @@ class InsolvencyResponseTest extends AbstractExclusionCriteriaFixture { reason: "Reason here.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.INSOLVENCY) then: @@ -138,7 +138,7 @@ class InsolvencyResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.INSOLVENCY) then: @@ -155,7 +155,7 @@ class InsolvencyResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_11.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.INSOLVENCY) then: @@ -172,7 +172,7 @@ class InsolvencyResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_11"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.INSOLVENCY) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MixedExclusionCriteriaResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MixedExclusionCriteriaResponseTest.groovy index abebb0dac..a03bd2b44 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MixedExclusionCriteriaResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MixedExclusionCriteriaResponseTest.groovy @@ -43,7 +43,7 @@ class MixedExclusionCriteriaResponseTest extends AbstractExclusionCriteriaFixtur def espd = new EspdDocument(criminalConvictions: participation, corruption: corruption) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) then: request.Criterion.size() == 2 + SelectionCriterion.values().length + OtherCriterion.values().length @@ -72,7 +72,7 @@ class MixedExclusionCriteriaResponseTest extends AbstractExclusionCriteriaFixtur def espd = new EspdDocument(criminalConvictions: participation, corruption: corruption) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) then: "check self cleaning description requirement in participation criterion" def idx1 = 0 @@ -95,7 +95,7 @@ class MixedExclusionCriteriaResponseTest extends AbstractExclusionCriteriaFixtur def espd = new EspdDocument(criminalConvictions: participation, corruption: corruption) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) then: "check self cleaning description requirement in participation criterion" def idx1 = 0 diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MoneyLaunderingResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MoneyLaunderingResponseTest.groovy index 45f8cd4b5..0dcde7bd4 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MoneyLaunderingResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/MoneyLaunderingResponseTest.groovy @@ -44,7 +44,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(moneyLaundering: new CriminalConvictionsCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: "CriterionID element" @@ -83,7 +83,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(moneyLaundering: new CriminalConvictionsCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -101,7 +101,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(moneyLaundering: new CriminalConvictionsCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -118,7 +118,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(moneyLaundering: new CriminalConvictionsCriterion(exists: true, reason: "Reason_05 here")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -135,7 +135,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(moneyLaundering: new CriminalConvictionsCriterion(exists: true, convicted: "Hodor_05 was convicted")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -152,7 +152,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(moneyLaundering: new CriminalConvictionsCriterion(exists: true, periodLength: "7 years")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -170,7 +170,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -187,7 +187,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(description: "Hodor_05 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -204,7 +204,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -221,7 +221,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_05.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: @@ -238,7 +238,7 @@ class MoneyLaunderingResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_05"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.MONEY_LAUNDERING) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/NationalExclusionGroundsResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/NationalExclusionGroundsResponseTest.groovy index 5e9bf1f92..2c21b1c48 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/NationalExclusionGroundsResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/NationalExclusionGroundsResponseTest.groovy @@ -40,7 +40,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt def espd = new EspdDocument(purelyNationalGrounds: new PurelyNationalGrounds(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS) then: "CriterionID element" @@ -92,7 +92,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt def espd = new EspdDocument(purelyNationalGrounds: new PurelyNationalGrounds(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS) then: @@ -108,7 +108,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt description: "bogus description.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS) then: @@ -125,7 +125,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -142,7 +142,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt selfCleaning: new SelfCleaning(description: "Hodor_24 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -159,7 +159,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS) then: @@ -176,7 +176,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_21.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS) then: @@ -193,7 +193,7 @@ class NationalExclusionGroundsResponseTest extends AbstractExclusionCriteriaFixt availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_21"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ParticipationInCriminalOrganisationResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ParticipationInCriminalOrganisationResponseTest.groovy index e6b129356..0364eb781 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ParticipationInCriminalOrganisationResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/ParticipationInCriminalOrganisationResponseTest.groovy @@ -43,7 +43,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) then: "CriterionID element" checkCriterionId(response, idx, "005eb9ed-1347-4ca3-bb29-9bc0db64e1ab") @@ -82,7 +82,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC def espd = new EspdDocument(criminalConvictions: new CriminalConvictionsCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -100,7 +100,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC def espd = new EspdDocument(criminalConvictions: new CriminalConvictionsCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -117,7 +117,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC def espd = new EspdDocument(criminalConvictions: new CriminalConvictionsCriterion(exists: true, reason: "Reason_01 here")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -134,7 +134,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC def espd = new EspdDocument(criminalConvictions: new CriminalConvictionsCriterion(exists: true, convicted: "Hodor_01 was convicted")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -151,7 +151,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC def espd = new EspdDocument(criminalConvictions: new CriminalConvictionsCriterion(exists: true, periodLength: "7 years")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -169,7 +169,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -186,7 +186,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC selfCleaning: new SelfCleaning(description: "Hodor_01 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -203,7 +203,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -220,7 +220,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_01.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: @@ -237,7 +237,7 @@ class ParticipationInCriminalOrganisationResponseTest extends AbstractExclusionC availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_01"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PARTICIPATION_CRIMINAL_ORGANISATION) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfSocialSecurityResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfSocialSecurityResponseTest.groovy index 6a49b5b67..6b68c4a32 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfSocialSecurityResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfSocialSecurityResponseTest.groovy @@ -42,7 +42,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: "CriterionID element" @@ -128,7 +128,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -143,7 +143,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, country: Country.RO)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -161,7 +161,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, amount: BigDecimal.valueOf(445.322), currency: "RON")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -177,7 +177,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, breachEstablishedOtherThanJudicialDecision: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -191,7 +191,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, meansDescription: "Other means were used")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -205,7 +205,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, decisionFinalAndBinding: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -224,7 +224,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -240,7 +240,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, periodLength: "Till the end of the year 2013.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -256,7 +256,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, eoFulfilledObligations: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -274,7 +274,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, obligationsDescription: "This debt was the result of a miscalculation by our accountability department.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -290,7 +290,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, availableElectronically: new AvailableElectronically(answer: true))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -305,7 +305,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_08.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: @@ -320,7 +320,7 @@ class PaymentOfSocialSecurityResponseTest extends AbstractExclusionCriteriaFixtu def espd = new EspdDocument(paymentSocialSecurity: new TaxesCriterion(exists: true, availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_08"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_SOCIAL_SECURITY) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfTaxesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfTaxesResponseTest.groovy index 652e8410c..2f5cc5d5c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfTaxesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/PaymentOfTaxesResponseTest.groovy @@ -41,7 +41,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: "CriterionID element" @@ -123,7 +123,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -138,7 +138,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, country: Country.GB)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -156,7 +156,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, amount: BigDecimal.valueOf(445), currency: "RON")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -172,7 +172,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, breachEstablishedOtherThanJudicialDecision: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -186,7 +186,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, meansDescription: "Other means were used")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -200,7 +200,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, decisionFinalAndBinding: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -219,7 +219,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -235,7 +235,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, periodLength: "Till the end of the year 2013.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -251,7 +251,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, eoFulfilledObligations: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -269,7 +269,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, obligationsDescription: "This debt was the result of a miscalculation by our accountability department.")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -285,7 +285,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, availableElectronically: new AvailableElectronically(answer: true))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -300,7 +300,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_07.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: @@ -315,7 +315,7 @@ class PaymentOfTaxesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(paymentTaxes: new TaxesCriterion(exists: true, availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_07"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.PAYMENT_OF_TAXES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/TerroristOffencesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/TerroristOffencesResponseTest.groovy index cc883d3b0..71542b12d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/TerroristOffencesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/exclusion/TerroristOffencesResponseTest.groovy @@ -43,7 +43,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(terroristOffences: new CriminalConvictionsCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: "CriterionID element" @@ -82,7 +82,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(terroristOffences: new CriminalConvictionsCriterion(exists: true, answer: null)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -100,7 +100,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(terroristOffences: new CriminalConvictionsCriterion(exists: true, dateOfConviction: now)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -117,7 +117,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(terroristOffences: new CriminalConvictionsCriterion(exists: true, reason: "Reason_04 here")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -134,7 +134,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(terroristOffences: new CriminalConvictionsCriterion(exists: true, convicted: "Hodor_04 was convicted")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -151,7 +151,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { def espd = new EspdDocument(terroristOffences: new CriminalConvictionsCriterion(exists: true, periodLength: "7 years")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -169,7 +169,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -186,7 +186,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { selfCleaning: new SelfCleaning(description: "Hodor_04 is clean"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -203,7 +203,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -220,7 +220,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_04.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: @@ -237,7 +237,7 @@ class TerroristOffencesResponseTest extends AbstractExclusionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_04"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(ExclusionCriterion.TERRORIST_OFFENCES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdRequestResponseMergeTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdRequestResponseMergeTest.groovy index 40cc9f63f..37ba98727 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdRequestResponseMergeTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdRequestResponseMergeTest.groovy @@ -29,11 +29,9 @@ import eu.europa.ec.grow.espd.domain.enums.other.Country import eu.europa.ec.grow.espd.xml.LocalDateAdapter import eu.europa.ec.grow.espd.xml.LocalTimeAdapter import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils import org.joda.time.LocalDate import org.joda.time.LocalTime import spock.lang.Shared - /** * Created by ratoico on 3/8/16 at 4:11 PM. */ @@ -44,9 +42,7 @@ class EspdRequestResponseMergeTest extends AbstractXmlFileImport { void setupSpec() { // init objects run before the first feature method - def espdRequestXml = importXmlRequestFile("../response/merging/request_to_merge.xml") - def espdResponseXml = importXmlResponseFile("merging/response_to_merge.xml") - espd = marshaller.mergeEspdRequestAndResponse(IOUtils.toInputStream(espdRequestXml), IOUtils.toInputStream(espdResponseXml)).get() + espd = parseXmlMergeFile("../response/merging/request_to_merge.xml", "merging/response_to_merge.xml") } void cleanupSpec() { diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdResponseOtherInformationImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdResponseOtherInformationImportTest.groovy index 2e2cc20ba..84de8c95e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdResponseOtherInformationImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/EspdResponseOtherInformationImportTest.groovy @@ -23,16 +23,15 @@ */ package eu.europa.ec.grow.espd.xml.response.importing -import eu.europa.ec.grow.espd.domain.enums.other.Country + import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.enums.other.Country import eu.europa.ec.grow.espd.xml.LocalDateAdapter import eu.europa.ec.grow.espd.xml.LocalTimeAdapter import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils import org.joda.time.LocalDate import org.joda.time.LocalTime import spock.lang.Shared - /** * Created by ratoico on 1/19/16 at 10:20 AM. */ @@ -160,8 +159,7 @@ class EspdResponseOtherInformationImportTest extends AbstractXmlFileImport { def "we should not load the ojs number if it is marked as a temporary one in the scheme id attribute of the id"() { given: - def espdXml = importXmlResponseFile("response_temporary_ojs_number_import.xml") - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdXml)).get() + EspdDocument espd = parseXmlResponseFile("response_temporary_ojs_number_import.xml") expect: espd.fileRefByCA == "SMART 2015/0065" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorParticipatingProcurementProcedureImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorParticipatingProcurementProcedureImportTest.groovy index 3af1ff681..2e3db688d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorParticipatingProcurementProcedureImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorParticipatingProcurementProcedureImportTest.groovy @@ -24,22 +24,17 @@ package eu.europa.ec.grow.espd.xml.response.importing.award -import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/20/16 at 3:34 PM. */ class EconomicOperatorParticipatingProcurementProcedureImportTest extends AbstractXmlFileImport { def "03. should import all fields of 'Economic operator participating procurement procedure'"() { - given: - def espdResponseXml = importXmlResponseFile("award/eo_participating_procurement_procedure_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("award/eo_participating_procurement_procedure_import.xml") then: espd.eoParticipatingProcurementProcedure.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorRegisteredImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorRegisteredImportTest.groovy index 212df87a1..ccd207bc3 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorRegisteredImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorRegisteredImportTest.groovy @@ -24,22 +24,17 @@ package eu.europa.ec.grow.espd.xml.response.importing.award -import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/20/16 at 3:30 PM. */ class EconomicOperatorRegisteredImportTest extends AbstractXmlFileImport { def "02. should import all fields of 'Economic operator registered'"() { - given: - def espdResponseXml = importXmlResponseFile("award/eo_registered_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("award/eo_registered_import.xml") then: espd.eoRegistered.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorReliesCapacitiesImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorReliesCapacitiesImportTest.groovy index 57ad32db9..ab0a712e4 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorReliesCapacitiesImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/EconomicOperatorReliesCapacitiesImportTest.groovy @@ -24,22 +24,17 @@ package eu.europa.ec.grow.espd.xml.response.importing.award -import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/20/16 at 3:45 PM. */ class EconomicOperatorReliesCapacitiesImportTest extends AbstractXmlFileImport { def "04. should import all fields of 'Economic operator relies capacities'"() { - given: - def espdResponseXml = importXmlResponseFile("award/eo_relies_capacities_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("award/eo_relies_capacities_import.xml") then: espd.eoReliesCapacities.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/MeetsObjectiveImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/MeetsObjectiveImportTest.groovy index 6b872f994..39187def3 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/MeetsObjectiveImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/MeetsObjectiveImportTest.groovy @@ -25,22 +25,17 @@ package eu.europa.ec.grow.espd.xml.response.importing.award import eu.europa.ec.grow.espd.domain.AvailableElectronically -import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/20/16 at 3:50 PM. */ class MeetsObjectiveImportTest extends AbstractXmlFileImport { def "06. should import all fields of 'Meets objective'"() { - given: - def espdResponseXml = importXmlResponseFile("award/meets_objective_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("award/meets_objective_import.xml") then: espd.meetsObjective.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/ProcurementReservedImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/ProcurementReservedImportTest.groovy index 556144462..c14be9268 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/ProcurementReservedImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/ProcurementReservedImportTest.groovy @@ -35,11 +35,8 @@ import org.apache.commons.io.IOUtils class ProcurementReservedImportTest extends AbstractXmlFileImport { def "01. should import all fields of 'Procurement reserved'"() { - given: - def espdResponseXml = importXmlResponseFile("award/procurement_reserved_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("award/procurement_reserved_import.xml") then: espd.procurementReserved.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/SucontractingThirdPartiesImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/SucontractingThirdPartiesImportTest.groovy index fefbb7225..7c41e4afc 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/SucontractingThirdPartiesImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/award/SucontractingThirdPartiesImportTest.groovy @@ -24,21 +24,17 @@ package eu.europa.ec.grow.espd.xml.response.importing.award -import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.OtherCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 2/29/16 at 1:47 PM. */ class SucontractingThirdPartiesImportTest extends AbstractXmlFileImport { def "06. should import all fields of 'Subcontracting Third Parties'"() { - given: - def espdResponseXml = importXmlResponseFile("award/subcontracting_third_parties.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("award/subcontracting_third_parties.xml") then: espd.subcontractingThirdParties.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/AgreementsWithEOImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/AgreementsWithEOImportTest.groovy index 4a618ac43..f72587363 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/AgreementsWithEOImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/AgreementsWithEOImportTest.groovy @@ -28,18 +28,14 @@ import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.MisconductDistortionCriterion import eu.europa.ec.grow.espd.domain.SelfCleaning import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/18/16 at 10:41 AM. */ class AgreementsWithEOImportTest extends AbstractXmlFileImport { def "19. should import all fields of 'Conflict of interest due to its participation in the procurement procedure'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/agreements_with_eo_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/agreements_with_eo_import.xml") then: espd.agreementsWithOtherEO.exists == true @@ -57,11 +53,8 @@ class AgreementsWithEOImportTest extends AbstractXmlFileImport { } def "an exclusion criterion with no answer will have a value of FALSE"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/exclusion_criterion_no_answer_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/exclusion_criterion_no_answer_import.xml") then: espd.agreementsWithOtherEO.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BankruptcyImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BankruptcyImportTest.groovy index cf575569f..34ce8cd8d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BankruptcyImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BankruptcyImportTest.groovy @@ -23,22 +23,19 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.exclusion + import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.BankruptcyCriterion import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/8/16 at 9:26 AM. */ class BankruptcyImportTest extends AbstractXmlFileImport { def "10. should import all fields of 'Bankruptcy'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/bankruptcy_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/bankruptcy_import.xml") then: espd.bankruptcy.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsEnvironmentalImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsEnvironmentalImportTest.groovy index d4e2b8ff0..5f5a0ba17 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsEnvironmentalImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsEnvironmentalImportTest.groovy @@ -24,22 +24,18 @@ package eu.europa.ec.grow.espd.xml.response.importing.exclusion -import eu.europa.ec.grow.espd.domain.LawCriterion import eu.europa.ec.grow.espd.domain.EspdDocument +import eu.europa.ec.grow.espd.domain.LawCriterion import eu.europa.ec.grow.espd.domain.SelfCleaning import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/7/16 at 5:43 PM. */ class BreachingOfObligationsEnvironmentalImportTest extends AbstractXmlFileImport { def "09. should import all fields of 'Breaching of obligations in the fields of environmental law'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/breaching_of_obligations_environmental_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/breaching_of_obligations_environmental_import.xml") then: espd.breachingObligationsEnvironmental.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsLabourImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsLabourImportTest.groovy index 5b06307c7..f10b34a90 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsLabourImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsLabourImportTest.groovy @@ -36,11 +36,8 @@ import org.apache.commons.io.IOUtils class BreachingOfObligationsLabourImportTest extends AbstractXmlFileImport { def "11. should import all fields of 'Breaching of obligations in the fields of labour law'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/breaching_of_obligations_labour_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/breaching_of_obligations_labour_import.xml") then: espd.breachingObligationsLabour.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsSocialImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsSocialImportTest.groovy index 663d7cd91..c1c4a054d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsSocialImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/BreachingOfObligationsSocialImportTest.groovy @@ -36,11 +36,8 @@ import org.apache.commons.io.IOUtils class BreachingOfObligationsSocialImportTest extends AbstractXmlFileImport { def "10. should import all fields of 'Breaching of obligations in the fields of social law'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/breaching_of_obligations_social_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/breaching_of_obligations_social_import.xml") then: espd.breachingObligationsSocial.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ConflictOfInterestImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ConflictOfInterestImportTest.groovy index 2c1b965f4..12ed69657 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ConflictOfInterestImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ConflictOfInterestImportTest.groovy @@ -27,18 +27,14 @@ package eu.europa.ec.grow.espd.xml.response.importing.exclusion import eu.europa.ec.grow.espd.domain.ConflictInterestCriterion import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/8/16 at 10:49 AM. */ class ConflictOfInterestImportTest extends AbstractXmlFileImport { def "20. should import all fields of 'Conflict of interest due to its participation in the procurement procedure'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/conflict_of_interest_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/conflict_of_interest_import.xml") then: espd.conflictInterest.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/MisconductImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/MisconductImportTest.groovy index 254e029dc..90c6c1881 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/MisconductImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/MisconductImportTest.groovy @@ -28,18 +28,14 @@ import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.MisconductDistortionCriterion import eu.europa.ec.grow.espd.domain.SelfCleaning import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/8/16 at 9:40 AM. */ class MisconductImportTest extends AbstractXmlFileImport { def "18. should import all fields of 'Guilty of grave professional misconduct'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/guilty_of_grave_professional_misconduct_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/guilty_of_grave_professional_misconduct_import.xml") then: espd.guiltyGrave.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/NationalExclusionGroundsImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/NationalExclusionGroundsImportTest.groovy index 5696ccef1..054c6b71c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/NationalExclusionGroundsImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/NationalExclusionGroundsImportTest.groovy @@ -23,23 +23,20 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.exclusion + import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.PurelyNationalGrounds import eu.europa.ec.grow.espd.domain.SelfCleaning import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/8/16 at 10:59 AM. */ class NationalExclusionGroundsImportTest extends AbstractXmlFileImport { def "21. should import all fields of 'Purely national exclusion grounds'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/purely_national_grounds_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/purely_national_grounds_import.xml") then: espd.purelyNationalGrounds.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ParticipationCriminalOrganisationImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ParticipationCriminalOrganisationImportTest.groovy index 695ef2f2c..f4e43eeb0 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ParticipationCriminalOrganisationImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/ParticipationCriminalOrganisationImportTest.groovy @@ -30,18 +30,14 @@ import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.SelfCleaning import eu.europa.ec.grow.espd.xml.LocalDateAdapter import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/7/16 at 10:41 AM. */ class ParticipationCriminalOrganisationImportTest extends AbstractXmlFileImport { def "01. should import all fields of 'Participation in a criminal organisation'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/participation_criminal_organisation_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/participation_criminal_organisation_import.xml") then: espd.criminalConvictions.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/PaymentOfTaxesImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/PaymentOfTaxesImportTest.groovy index 587a7ff84..707a3d00f 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/PaymentOfTaxesImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/exclusion/PaymentOfTaxesImportTest.groovy @@ -24,25 +24,20 @@ package eu.europa.ec.grow.espd.xml.response.importing.exclusion -import eu.europa.ec.grow.espd.domain.enums.other.Country import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.TaxesCriterion +import eu.europa.ec.grow.espd.domain.enums.other.Country import eu.europa.ec.grow.espd.xml.LocalDateAdapter import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/7/16 at 3:54 PM. */ class PaymentOfTaxesImportTest extends AbstractXmlFileImport { def "07. should import all fields of 'Payment of taxes'"() { - given: - def espdResponseXml = importXmlResponseFile("exclusion/payment_of_taxes_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("exclusion/payment_of_taxes_import.xml") then: espd.paymentTaxes.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AllowanceOfChecksImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AllowanceOfChecksImportTest.groovy index 85632c875..154ffbd83 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AllowanceOfChecksImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AllowanceOfChecksImportTest.groovy @@ -23,21 +23,18 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.selection + import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.TechnicalProfessionalCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/12/16 at 5:24 PM. */ class AllowanceOfChecksImportTest extends AbstractXmlFileImport { def "22. should import all fields of 'Allowance of checks'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/allowance_of_checks_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/allowance_of_checks_import.xml") then: espd.allowanceOfChecks.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AverageYearlyTurnoverImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AverageYearlyTurnoverImportTest.groovy index d51560f9a..5f6216a7c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AverageYearlyTurnoverImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/AverageYearlyTurnoverImportTest.groovy @@ -28,18 +28,14 @@ import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EconomicFinancialStandingCriterion import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 8/23/16. */ class AverageYearlyTurnoverImportTest extends AbstractXmlFileImport { def "06. should import all fields of 'Average yearly turnover'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/average_yearly_turnover_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/average_yearly_turnover_import.xml") then: espd.averageYearlyTurnover.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesEnvironmentalImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesEnvironmentalImportTest.groovy index 4d7eff7e9..41b17ef61 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesEnvironmentalImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesEnvironmentalImportTest.groovy @@ -23,22 +23,19 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.selection + import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.QualityAssuranceCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/13/16 at 11:18 AM. */ class CertificatesIndependentBodiesEnvironmentalImportTest extends AbstractXmlFileImport { def "32. should import all fields of 'Certificates by independent bodies about environmental management systems or standards'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/certificates_independent_bodies_environmental_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/certificates_independent_bodies_environmental_import.xml") then: espd.certificateIndependentBodiesAboutEnvironmental.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesQualityImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesQualityImportTest.groovy index fdb8bd517..6cc6843f2 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesQualityImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/CertificatesIndependentBodiesQualityImportTest.groovy @@ -23,22 +23,19 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.selection + import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.QualityAssuranceCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/13/16 at 11:12 AM. */ class CertificatesIndependentBodiesQualityImportTest extends AbstractXmlFileImport { def "31. should import all fields of 'Certificates by independent bodies about quality assurance standards'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/certificates_independent_bodies_quality_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/certificates_independent_bodies_quality_import.xml") then: espd.certificateIndependentBodiesAboutQa.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/EnrolmentProfessionalRegisterImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/EnrolmentProfessionalRegisterImportTest.groovy index 186f0e78b..88c24c897 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/EnrolmentProfessionalRegisterImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/EnrolmentProfessionalRegisterImportTest.groovy @@ -36,11 +36,8 @@ import org.apache.commons.io.IOUtils class EnrolmentProfessionalRegisterImportTest extends AbstractXmlFileImport { def "02. should import all fields of 'Enrolment in a relevant professional register'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/enrolment_professional_register_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/enrolment_professional_register_import.xml") then: espd.enrolmentProfessionalRegister.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/FinancialRatioImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/FinancialRatioImportTest.groovy index 1de4791b1..707caf798 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/FinancialRatioImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/FinancialRatioImportTest.groovy @@ -35,11 +35,8 @@ import org.apache.commons.io.IOUtils class FinancialRatioImportTest extends AbstractXmlFileImport { def "11. should import all fields of 'Financial ratio'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/financial_ratio_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/financial_ratio_import.xml") def unboundedGroups = espd.financialRatio.unboundedGroups then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/GeneralYearlyTurnoverImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/GeneralYearlyTurnoverImportTest.groovy index ff6564ca2..ac1141a80 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/GeneralYearlyTurnoverImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/GeneralYearlyTurnoverImportTest.groovy @@ -29,19 +29,14 @@ import eu.europa.ec.grow.espd.domain.DynamicRequirementGroup import eu.europa.ec.grow.espd.domain.EconomicFinancialStandingCriterion import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/8/16 at 2:44 PM. */ class GeneralYearlyTurnoverImportTest extends AbstractXmlFileImport { def "06. should import all fields of 'General yearly turnover'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/general_yearly_turnover_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/general_yearly_turnover_import.xml") def unboundedGroups = espd.generalYearlyTurnover.unboundedGroups then: @@ -84,11 +79,8 @@ class GeneralYearlyTurnoverImportTest extends AbstractXmlFileImport { } def "a selection criterion with no answer will be treated as FALSE"() { - given: - def espdResponseXml = importXmlResponseFile("selection/selection_criterion_no_answer_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/selection_criterion_no_answer_import.xml") then: espd.generalYearlyTurnover.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/NumberOfManagerialStaffImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/NumberOfManagerialStaffImportTest.groovy index 9cb6f291e..a6eb0d8d5 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/NumberOfManagerialStaffImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/NumberOfManagerialStaffImportTest.groovy @@ -23,23 +23,20 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.selection + import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.DynamicRequirementGroup import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.TechnicalProfessionalCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/13/16 at 10:15 AM. */ class NumberOfManagerialStaffImportTest extends AbstractXmlFileImport { def "24. should import all fields of 'Number of managerial staff'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/number_of_managerial_staff_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/number_of_managerial_staff_import.xml") def unboundedGroups = espd.numberManagerialStaff.unboundedGroups then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/OtherEconomicRequirementsImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/OtherEconomicRequirementsImportTest.groovy index 426d54f13..23a444849 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/OtherEconomicRequirementsImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/OtherEconomicRequirementsImportTest.groovy @@ -36,11 +36,8 @@ import org.apache.commons.io.IOUtils class OtherEconomicRequirementsImportTest extends AbstractXmlFileImport { def "12. should import all fields of 'Other economic or financial requirements'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/other_economic_requirements_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/other_economic_requirements_import.xml") then: espd.otherEconomicFinancialRequirements.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ProfessionalRiskInsuranceImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ProfessionalRiskInsuranceImportTest.groovy index 08cb26fa7..d39d53973 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ProfessionalRiskInsuranceImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ProfessionalRiskInsuranceImportTest.groovy @@ -28,19 +28,14 @@ import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EconomicFinancialStandingCriterion import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/8/16 at 3:25 PM. */ class ProfessionalRiskInsuranceImportTest extends AbstractXmlFileImport { def "12. should import all fields of 'Professional risk indemnity insurance'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/professional_risk_insurance_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/professional_risk_insurance_import.xml") then: espd.professionalRiskInsurance.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SatisfiesAllImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SatisfiesAllImportTest.groovy index 434a94ed7..f08dc8a7b 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SatisfiesAllImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SatisfiesAllImportTest.groovy @@ -23,21 +23,18 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.selection + import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.SatisfiesAllCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/26/16 at 9:20 AM. */ class SatisfiesAllImportTest extends AbstractXmlFileImport { def "1. should import all fields of 'Satisfies all'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/satisfies_all_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/satisfies_all_import.xml") then: espd.selectionSatisfiesAll.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ServiceContractsAuthorisationImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ServiceContractsAuthorisationImportTest.groovy index 4fa7bbf9d..0560326e6 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ServiceContractsAuthorisationImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/ServiceContractsAuthorisationImportTest.groovy @@ -28,18 +28,14 @@ import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.SuitabilityCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 2/29/16 at 4:46 PM. */ class ServiceContractsAuthorisationImportTest extends AbstractXmlFileImport { def "04. should import all fields of 'For service contracts: authorisation of particular organisation needed'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/service_contracts_authorisation_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/service_contracts_authorisation_import.xml") then: espd.serviceContractsAuthorisation.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SubcontractingProprtionImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SubcontractingProprtionImportTest.groovy index 64b4de34a..dcab73b87 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SubcontractingProprtionImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SubcontractingProprtionImportTest.groovy @@ -27,18 +27,14 @@ package eu.europa.ec.grow.espd.xml.response.importing.selection import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.TechnicalProfessionalCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/8/16 at 1:54 PM. */ class SubcontractingProprtionImportTest extends AbstractXmlFileImport { def "28. should import all fields of 'Subcontracting proportion'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/subcontracting_proportion_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/subcontracting_proportion_import.xml") then: espd.subcontractingProportion.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SupplyContractsCertificateQualityImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SupplyContractsCertificateQualityImportTest.groovy index ef9d36293..39c549857 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SupplyContractsCertificateQualityImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/SupplyContractsCertificateQualityImportTest.groovy @@ -28,19 +28,14 @@ import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.TechnicalProfessionalCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/13/16 at 10:57 AM. */ class SupplyContractsCertificateQualityImportTest extends AbstractXmlFileImport { def "30. should import all fields of 'For supply contracts: certificates by quality control institutes'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/supply_contracts_certificates_quality_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/supply_contracts_certificates_quality_import.xml") then: espd.supplyContractsCertificatesQc.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechnicalFacilitiesQualityImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechnicalFacilitiesQualityImportTest.groovy index bd3aaf13c..17d71400a 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechnicalFacilitiesQualityImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechnicalFacilitiesQualityImportTest.groovy @@ -28,19 +28,14 @@ import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.TechnicalProfessionalCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils - /** * Created by ratoico on 1/8/16 at 1:49 PM. */ class TechnicalFacilitiesQualityImportTest extends AbstractXmlFileImport { def "19. should import all fields of 'Technical facilities and measures for ensuring quality'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/technical_facilities_quality_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/technical_facilities_quality_import.xml") then: espd.technicalFacilitiesMeasures.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechniciansTechnicalBodiesImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechniciansTechnicalBodiesImportTest.groovy index 71f00c799..a68fdc6e5 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechniciansTechnicalBodiesImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/TechniciansTechnicalBodiesImportTest.groovy @@ -23,22 +23,19 @@ */ package eu.europa.ec.grow.espd.xml.response.importing.selection + import eu.europa.ec.grow.espd.domain.AvailableElectronically import eu.europa.ec.grow.espd.domain.EspdDocument import eu.europa.ec.grow.espd.domain.TechnicalProfessionalCriterion import eu.europa.ec.grow.espd.xml.base.AbstractXmlFileImport -import org.apache.commons.io.IOUtils /** * Created by ratoico on 1/8/16 at 1:15 PM. */ class TechniciansTechnicalBodiesImportTest extends AbstractXmlFileImport { def "17. should import all fields of 'Technicians or technical bodies for quality control'"() { - given: - def espdResponseXml = importXmlResponseFile("selection/technicians_technical_bodies_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/technicians_technical_bodies_import.xml") then: espd.techniciansTechnicalBodies.exists == true diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/WorkContractsPerformanceOfWorksImportTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/WorkContractsPerformanceOfWorksImportTest.groovy index 6f3162885..ab6def7d0 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/WorkContractsPerformanceOfWorksImportTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/importing/selection/WorkContractsPerformanceOfWorksImportTest.groovy @@ -38,11 +38,8 @@ import org.apache.commons.io.IOUtils class WorkContractsPerformanceOfWorksImportTest extends AbstractXmlFileImport { def "14. should import all fields of 'For works contracts: performance of works of the specified type' with unbounded requirement groups"() { - given: - def espdResponseXml = importXmlResponseFile("selection/work_contracts_performance_of_works_import.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/work_contracts_performance_of_works_import.xml") def unboundedGroups = espd.workContractsPerformanceOfWorks.unboundedGroups then: @@ -110,11 +107,8 @@ class WorkContractsPerformanceOfWorksImportTest extends AbstractXmlFileImport { } def "14. should import all fields of 'For works contracts: performance of works of the specified type' with old requirement ids before the unbounded groups feature"() { - given: - def espdResponseXml = importXmlResponseFile("selection/work_contracts_performance_of_works_import_old_req_ids.xml") - when: - EspdDocument espd = marshaller.importEspdResponse(IOUtils.toInputStream(espdResponseXml)).get() + EspdDocument espd = parseXmlResponseFile("selection/work_contracts_performance_of_works_import_old_req_ids.xml") def unboundedGroups = espd.workContractsPerformanceOfWorks.unboundedGroups then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllCriteriaSatisfiedResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllCriteriaSatisfiedResponseTest.groovy index bf606363f..9c4d8e833 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllCriteriaSatisfiedResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllCriteriaSatisfiedResponseTest.groovy @@ -40,7 +40,7 @@ class AllCriteriaSatisfiedResponseTest extends AbstractSelectionCriteriaFixture def idx = getResponseCriterionIndex(SelectionCriterion.ALL_SELECTION_CRITERIA_SATISFIED) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) then: "CriterionID element" checkCriterionId(response, idx, "7e7db838-eeac-46d9-ab39-42927486f22d") @@ -70,7 +70,7 @@ class AllCriteriaSatisfiedResponseTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(selectionSatisfiesAll: new SatisfiesAllCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ALL_SELECTION_CRITERIA_SATISFIED) then: @@ -87,7 +87,7 @@ class AllCriteriaSatisfiedResponseTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(selectionSatisfiesAll: new SatisfiesAllCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ALL_SELECTION_CRITERIA_SATISFIED) then: @@ -107,7 +107,7 @@ class AllCriteriaSatisfiedResponseTest extends AbstractSelectionCriteriaFixture workContractsPerformanceOfWorks: new TechnicalProfessionalCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ALL_SELECTION_CRITERIA_SATISFIED) then: @@ -126,7 +126,7 @@ class AllCriteriaSatisfiedResponseTest extends AbstractSelectionCriteriaFixture workContractsPerformanceOfWorks: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) then: "only selected selection criteria are present plus mandatory exclusion plus the award criterion" response.Criterion.size() == getMandatoryExclusionCriteriaSize() + 3 + OtherCriterion.values().length @@ -147,7 +147,7 @@ class AllCriteriaSatisfiedResponseTest extends AbstractSelectionCriteriaFixture workContractsPerformanceOfWorks: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) then: "only selected selection criteria are present plus mandatory exclusion plus the award criterion" response.Criterion.size() == getMandatoryExclusionCriteriaSize() + 4 + OtherCriterion.values().length diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllowanceOfChecksResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllowanceOfChecksResponseTest.groovy index bdcafe921..313f8df03 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllowanceOfChecksResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AllowanceOfChecksResponseTest.groovy @@ -38,7 +38,7 @@ class AllowanceOfChecksResponseTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(allowanceOfChecks: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ALLOWANCE_OF_CHECKS) then: "CriterionID element" @@ -73,7 +73,7 @@ class AllowanceOfChecksResponseTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(allowanceOfChecks: new TechnicalProfessionalCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ALLOWANCE_OF_CHECKS) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageAnnualManpowerResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageAnnualManpowerResponseTest.groovy index f43b6ce1a..220e3be17 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageAnnualManpowerResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageAnnualManpowerResponseTest.groovy @@ -40,7 +40,7 @@ class AverageAnnualManpowerResponseTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(averageAnnualManpower: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: "CriterionID element" @@ -77,7 +77,7 @@ class AverageAnnualManpowerResponseTest extends AbstractSelectionCriteriaFixture new DynamicRequirementGroup("year": 2014)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: "First year" @@ -111,7 +111,7 @@ class AverageAnnualManpowerResponseTest extends AbstractSelectionCriteriaFixture new DynamicRequirementGroup("number": 33)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: "First number" @@ -142,7 +142,7 @@ class AverageAnnualManpowerResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: @@ -158,7 +158,7 @@ class AverageAnnualManpowerResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_25.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: @@ -174,7 +174,7 @@ class AverageAnnualManpowerResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_25"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: @@ -190,7 +190,7 @@ class AverageAnnualManpowerResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, issuer: "HODOR_25"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_ANNUAL_MANPOWER) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageYearlyTurnoverResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageYearlyTurnoverResponseTest.groovy index e4063b1d9..9b5b914bd 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageYearlyTurnoverResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/AverageYearlyTurnoverResponseTest.groovy @@ -40,7 +40,7 @@ class AverageYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(averageYearlyTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_YEARLY_TURNOVER) then: "CriterionID element" @@ -81,7 +81,7 @@ class AverageYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture numberOfYears: 666)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def g1 = response.Criterion[idx].RequirementGroup[0] @@ -98,7 +98,7 @@ class AverageYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture averageTurnover: 11.11, averageTurnoverCurrency: "EUR")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def g1 = response.Criterion[idx].RequirementGroup[0] @@ -115,7 +115,7 @@ class AverageYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture unboundedGroups: [new DynamicRequirementGroup("amount": null, "currency": null)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def g1 = response.Criterion[idx].RequirementGroup[0] @@ -131,7 +131,7 @@ class AverageYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_YEARLY_TURNOVER) then: @@ -148,7 +148,7 @@ class AverageYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_07.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_YEARLY_TURNOVER) then: @@ -165,7 +165,7 @@ class AverageYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_07"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.AVERAGE_YEARLY_TURNOVER) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesEnvironmentalResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesEnvironmentalResponseTest.groovy index 5656f9e2a..92202ff6b 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesEnvironmentalResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesEnvironmentalResponseTest.groovy @@ -38,7 +38,7 @@ class CertificatesIndependentBodiesEnvironmentalResponseTest extends AbstractSel def espd = new EspdDocument(certificateIndependentBodiesAboutEnvironmental: new QualityAssuranceCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_ENVIRONMENTAL) then: "CriterionID element" @@ -86,7 +86,7 @@ class CertificatesIndependentBodiesEnvironmentalResponseTest extends AbstractSel def espd = new EspdDocument(certificateIndependentBodiesAboutEnvironmental: new QualityAssuranceCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_ENVIRONMENTAL) then: @@ -104,7 +104,7 @@ class CertificatesIndependentBodiesEnvironmentalResponseTest extends AbstractSel description: "explain description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_ENVIRONMENTAL) then: @@ -123,7 +123,7 @@ class CertificatesIndependentBodiesEnvironmentalResponseTest extends AbstractSel availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_ENVIRONMENTAL) then: @@ -140,7 +140,7 @@ class CertificatesIndependentBodiesEnvironmentalResponseTest extends AbstractSel availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_33.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_ENVIRONMENTAL) then: @@ -156,7 +156,7 @@ class CertificatesIndependentBodiesEnvironmentalResponseTest extends AbstractSel availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_33"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_ENVIRONMENTAL) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesQAResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesQAResponseTest.groovy index bc1816fde..eac68b14e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesQAResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/CertificatesIndependentBodiesQAResponseTest.groovy @@ -38,7 +38,7 @@ class CertificatesIndependentBodiesQAResponseTest extends AbstractSelectionCrite def espd = new EspdDocument(certificateIndependentBodiesAboutQa: new QualityAssuranceCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_QA) then: "CriterionID element" @@ -86,7 +86,7 @@ class CertificatesIndependentBodiesQAResponseTest extends AbstractSelectionCrite def espd = new EspdDocument(certificateIndependentBodiesAboutQa: new QualityAssuranceCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_QA) then: @@ -104,7 +104,7 @@ class CertificatesIndependentBodiesQAResponseTest extends AbstractSelectionCrite description: "explain description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_QA) then: @@ -123,7 +123,7 @@ class CertificatesIndependentBodiesQAResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_QA) then: @@ -139,7 +139,7 @@ class CertificatesIndependentBodiesQAResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_32.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_QA) then: @@ -155,7 +155,7 @@ class CertificatesIndependentBodiesQAResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_32"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.CERTIFICATE_INDEPENDENT_BODIES_ABOUT_QA) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EducationalProfessionalQualificationsResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EducationalProfessionalQualificationsResponseTest.groovy index 02f351ba7..4b0ae2ada 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EducationalProfessionalQualificationsResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EducationalProfessionalQualificationsResponseTest.groovy @@ -39,7 +39,7 @@ class EducationalProfessionalQualificationsResponseTest extends AbstractSelectio def espd = new EspdDocument(educationalProfessionalQualifications: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.EDUCATIONAL_AND_PROFESSIONAL_QUALIFICATIONS) then: "CriterionID element" @@ -79,7 +79,7 @@ class EducationalProfessionalQualificationsResponseTest extends AbstractSelectio description: "technical description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.EDUCATIONAL_AND_PROFESSIONAL_QUALIFICATIONS) then: @@ -96,7 +96,7 @@ class EducationalProfessionalQualificationsResponseTest extends AbstractSelectio availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.EDUCATIONAL_AND_PROFESSIONAL_QUALIFICATIONS) then: @@ -113,7 +113,7 @@ class EducationalProfessionalQualificationsResponseTest extends AbstractSelectio availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_22.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.EDUCATIONAL_AND_PROFESSIONAL_QUALIFICATIONS) then: @@ -130,7 +130,7 @@ class EducationalProfessionalQualificationsResponseTest extends AbstractSelectio availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_22"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.EDUCATIONAL_AND_PROFESSIONAL_QUALIFICATIONS) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentProfessionalRegisterResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentProfessionalRegisterResponseTest.groovy index d5665edc7..c33da161e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentProfessionalRegisterResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentProfessionalRegisterResponseTest.groovy @@ -40,7 +40,7 @@ class EnrolmentProfessionalRegisterResponseTest extends AbstractSelectionCriteri def espd = new EspdDocument(enrolmentProfessionalRegister: new SuitabilityCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_PROFESSIONAL_REGISTER) then: "CriterionID element" @@ -80,7 +80,7 @@ class EnrolmentProfessionalRegisterResponseTest extends AbstractSelectionCriteri def espd = new EspdDocument(enrolmentProfessionalRegister: new SuitabilityCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_PROFESSIONAL_REGISTER) then: @@ -98,7 +98,7 @@ class EnrolmentProfessionalRegisterResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_PROFESSIONAL_REGISTER) then: @@ -115,7 +115,7 @@ class EnrolmentProfessionalRegisterResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_02.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_PROFESSIONAL_REGISTER) then: @@ -132,7 +132,7 @@ class EnrolmentProfessionalRegisterResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_02"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_PROFESSIONAL_REGISTER) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentTradeRegisterResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentTradeRegisterResponseTest.groovy index 63533a3b5..27fc5073d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentTradeRegisterResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnrolmentTradeRegisterResponseTest.groovy @@ -39,7 +39,7 @@ class EnrolmentTradeRegisterResponseTest extends AbstractSelectionCriteriaFixtur def espd = new EspdDocument(enrolmentTradeRegister: new SuitabilityCriterion(exists: true)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_TRADE_REGISTER) then: "CriterionID element" @@ -79,7 +79,7 @@ class EnrolmentTradeRegisterResponseTest extends AbstractSelectionCriteriaFixtur def espd = new EspdDocument(enrolmentTradeRegister: new SuitabilityCriterion(exists: true, answer: true)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_TRADE_REGISTER) then: @@ -98,7 +98,7 @@ class EnrolmentTradeRegisterResponseTest extends AbstractSelectionCriteriaFixtur availableElectronically: new AvailableElectronically(answer: false))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_TRADE_REGISTER) then: @@ -115,7 +115,7 @@ class EnrolmentTradeRegisterResponseTest extends AbstractSelectionCriteriaFixtur availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_03.com"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_TRADE_REGISTER) then: @@ -132,7 +132,7 @@ class EnrolmentTradeRegisterResponseTest extends AbstractSelectionCriteriaFixtur availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_03"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENROLMENT_TRADE_REGISTER) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnvironmentalManagementMeasuresResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnvironmentalManagementMeasuresResponseTest.groovy index 292729ad6..76caca57b 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnvironmentalManagementMeasuresResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/EnvironmentalManagementMeasuresResponseTest.groovy @@ -39,7 +39,7 @@ class EnvironmentalManagementMeasuresResponseTest extends AbstractSelectionCrite def espd = new EspdDocument(environmentalManagementFeatures: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENVIRONMENTAL_MANAGEMENT_FEATURES) then: "CriterionID element" @@ -79,7 +79,7 @@ class EnvironmentalManagementMeasuresResponseTest extends AbstractSelectionCrite description: "technical description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENVIRONMENTAL_MANAGEMENT_FEATURES) then: @@ -96,7 +96,7 @@ class EnvironmentalManagementMeasuresResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENVIRONMENTAL_MANAGEMENT_FEATURES) then: @@ -113,7 +113,7 @@ class EnvironmentalManagementMeasuresResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_24.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENVIRONMENTAL_MANAGEMENT_FEATURES) then: @@ -130,7 +130,7 @@ class EnvironmentalManagementMeasuresResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_24"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.ENVIRONMENTAL_MANAGEMENT_FEATURES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/FinancialRatioResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/FinancialRatioResponseTest.groovy index d3fd3b4b8..7035bd75c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/FinancialRatioResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/FinancialRatioResponseTest.groovy @@ -40,7 +40,7 @@ class FinancialRatioResponseTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(financialRatio: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.FINANCIAL_RATIO) then: "CriterionID element" @@ -82,7 +82,7 @@ class FinancialRatioResponseTest extends AbstractSelectionCriteriaFixture { ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.FINANCIAL_RATIO) then: "Description 1" @@ -127,7 +127,7 @@ class FinancialRatioResponseTest extends AbstractSelectionCriteriaFixture { new DynamicRequirementGroup("ratio": 55.5)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.FINANCIAL_RATIO) then: "Ratio 1" @@ -167,7 +167,7 @@ class FinancialRatioResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.FINANCIAL_RATIO) then: @@ -184,7 +184,7 @@ class FinancialRatioResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_10.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.FINANCIAL_RATIO) then: @@ -201,7 +201,7 @@ class FinancialRatioResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_10"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.FINANCIAL_RATIO) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/GeneralYearlyTurnoverResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/GeneralYearlyTurnoverResponseTest.groovy index be926d1f1..5b29d0009 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/GeneralYearlyTurnoverResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/GeneralYearlyTurnoverResponseTest.groovy @@ -40,7 +40,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(generalYearlyTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) then: "CriterionID element" @@ -83,7 +83,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -135,7 +135,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -182,7 +182,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -234,7 +234,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -275,7 +275,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) then: @@ -291,7 +291,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_06.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) then: @@ -307,7 +307,7 @@ class GeneralYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_06"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/NumberOfManagerialStaffResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/NumberOfManagerialStaffResponseTest.groovy index a898a33f1..a8d0d3817 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/NumberOfManagerialStaffResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/NumberOfManagerialStaffResponseTest.groovy @@ -41,7 +41,7 @@ class NumberOfManagerialStaffResponseTest extends AbstractSelectionCriteriaFixtu def espd = new EspdDocument(numberManagerialStaff: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: "CriterionID element" @@ -79,7 +79,7 @@ class NumberOfManagerialStaffResponseTest extends AbstractSelectionCriteriaFixtu ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: "First year" @@ -114,7 +114,7 @@ class NumberOfManagerialStaffResponseTest extends AbstractSelectionCriteriaFixtu ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: "First number" @@ -145,7 +145,7 @@ class NumberOfManagerialStaffResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: @@ -161,7 +161,7 @@ class NumberOfManagerialStaffResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_24.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: @@ -177,7 +177,7 @@ class NumberOfManagerialStaffResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_24"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.NUMBER_OF_MANAGERIAL_STAFF) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/OtherEconomicFinancialRequirementsResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/OtherEconomicFinancialRequirementsResponseTest.groovy index c4629879a..d0dca5a3d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/OtherEconomicFinancialRequirementsResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/OtherEconomicFinancialRequirementsResponseTest.groovy @@ -39,7 +39,7 @@ class OtherEconomicFinancialRequirementsResponseTest extends AbstractSelectionCr def espd = new EspdDocument(otherEconomicFinancialRequirements: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.OTHER_ECONOMIC_OR_FINANCIAL_REQUIREMENTS) then: "CriterionID element" @@ -81,7 +81,7 @@ class OtherEconomicFinancialRequirementsResponseTest extends AbstractSelectionCr description: "other economic or financial description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.OTHER_ECONOMIC_OR_FINANCIAL_REQUIREMENTS) then: @@ -98,7 +98,7 @@ class OtherEconomicFinancialRequirementsResponseTest extends AbstractSelectionCr availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.OTHER_ECONOMIC_OR_FINANCIAL_REQUIREMENTS) then: @@ -115,7 +115,7 @@ class OtherEconomicFinancialRequirementsResponseTest extends AbstractSelectionCr availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_12.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.OTHER_ECONOMIC_OR_FINANCIAL_REQUIREMENTS) then: @@ -132,7 +132,7 @@ class OtherEconomicFinancialRequirementsResponseTest extends AbstractSelectionCr availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_12"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.OTHER_ECONOMIC_OR_FINANCIAL_REQUIREMENTS) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ProfessionalRiskIndemnityResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ProfessionalRiskIndemnityResponseTest.groovy index 790d55cb4..68b5be171 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ProfessionalRiskIndemnityResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ProfessionalRiskIndemnityResponseTest.groovy @@ -39,7 +39,7 @@ class ProfessionalRiskIndemnityResponseTest extends AbstractSelectionCriteriaFix def espd = new EspdDocument(professionalRiskInsurance: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.PROFESSIONAL_RISK_INSURANCE) then: "CriterionID element" @@ -81,7 +81,7 @@ class ProfessionalRiskIndemnityResponseTest extends AbstractSelectionCriteriaFix amount: 11.11, currency: "EUR")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.PROFESSIONAL_RISK_INSURANCE) then: @@ -99,7 +99,7 @@ class ProfessionalRiskIndemnityResponseTest extends AbstractSelectionCriteriaFix amount: null, currency: "EUR")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.PROFESSIONAL_RISK_INSURANCE) then: @@ -115,7 +115,7 @@ class ProfessionalRiskIndemnityResponseTest extends AbstractSelectionCriteriaFix availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.PROFESSIONAL_RISK_INSURANCE) then: @@ -132,7 +132,7 @@ class ProfessionalRiskIndemnityResponseTest extends AbstractSelectionCriteriaFix availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_11.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.PROFESSIONAL_RISK_INSURANCE) then: @@ -149,7 +149,7 @@ class ProfessionalRiskIndemnityResponseTest extends AbstractSelectionCriteriaFix availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_11"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.PROFESSIONAL_RISK_INSURANCE) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsAuthorisationResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsAuthorisationResponseTest.groovy index 2b213a10c..7d69c68c0 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsAuthorisationResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsAuthorisationResponseTest.groovy @@ -39,7 +39,7 @@ class ServiceContractsAuthorisationResponseTest extends AbstractSelectionCriteri def espd = new EspdDocument(serviceContractsAuthorisation: new SuitabilityCriterion(exists: true)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: "CriterionID element" @@ -84,7 +84,7 @@ class ServiceContractsAuthorisationResponseTest extends AbstractSelectionCriteri def espd = new EspdDocument(serviceContractsAuthorisation: new SuitabilityCriterion(exists: true, answer: false)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: @@ -101,7 +101,7 @@ class ServiceContractsAuthorisationResponseTest extends AbstractSelectionCriteri def espd = new EspdDocument(serviceContractsAuthorisation: new SuitabilityCriterion(exists: true, answer: true, description: "hodor")) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: @@ -119,7 +119,7 @@ class ServiceContractsAuthorisationResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: false))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: @@ -136,7 +136,7 @@ class ServiceContractsAuthorisationResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_04.com"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: @@ -153,7 +153,7 @@ class ServiceContractsAuthorisationResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_04"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsMembershipResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsMembershipResponseTest.groovy index 51bc518f6..c393b3e2e 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsMembershipResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsMembershipResponseTest.groovy @@ -39,7 +39,7 @@ class ServiceContractsMembershipResponseTest extends AbstractSelectionCriteriaFi def espd = new EspdDocument(serviceContractsMembership: new SuitabilityCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_MEMBERSHIP) then: "CriterionID element" @@ -84,7 +84,7 @@ class ServiceContractsMembershipResponseTest extends AbstractSelectionCriteriaFi def espd = new EspdDocument(serviceContractsMembership: new SuitabilityCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_MEMBERSHIP) then: @@ -101,7 +101,7 @@ class ServiceContractsMembershipResponseTest extends AbstractSelectionCriteriaFi def espd = new EspdDocument(serviceContractsMembership: new SuitabilityCriterion(exists: true, answer: true, description: "hodor 2")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_AUTHORISATION) then: @@ -119,7 +119,7 @@ class ServiceContractsMembershipResponseTest extends AbstractSelectionCriteriaFi availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_MEMBERSHIP) then: @@ -136,7 +136,7 @@ class ServiceContractsMembershipResponseTest extends AbstractSelectionCriteriaFi availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_05.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_MEMBERSHIP) then: @@ -153,7 +153,7 @@ class ServiceContractsMembershipResponseTest extends AbstractSelectionCriteriaFi availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_05"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_MEMBERSHIP) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsPerformanceServicesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsPerformanceServicesResponseTest.groovy index b9b978ad8..42b46ab94 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsPerformanceServicesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ServiceContractsPerformanceServicesResponseTest.groovy @@ -43,7 +43,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC def espd = new EspdDocument(serviceContractsPerformanceServices: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: "CriterionID element" @@ -79,7 +79,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC new DynamicRequirementGroup("description": "desc5"), new DynamicRequirementGroup("description": "desc6")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: "First description" @@ -123,7 +123,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC new DynamicRequirementGroup("amount": 55.55, "currency": "YEN")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: "First amount" @@ -171,7 +171,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC new DynamicRequirementGroup("startDate": date2)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: "First date" @@ -196,7 +196,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC new DynamicRequirementGroup("endDate": date2)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: "First date" @@ -219,7 +219,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC new DynamicRequirementGroup("recipients": "rec2")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: "First recipients" @@ -241,7 +241,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: @@ -258,7 +258,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_15.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: @@ -275,7 +275,7 @@ class ServiceContractsPerformanceServicesResponseTest extends AbstractSelectionC availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_15"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SERVICE_CONTRACTS_PERFORMANCE_OF_SERVICES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SetupEconomicOperatorResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SetupEconomicOperatorResponseTest.groovy index c93076b49..f8d46ad73 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SetupEconomicOperatorResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SetupEconomicOperatorResponseTest.groovy @@ -37,7 +37,7 @@ class SetupEconomicOperatorResponseTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(setupEconomicOperator: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SETUP_ECONOMIC_OPERATOR) then: "CriterionID element" @@ -73,7 +73,7 @@ class SetupEconomicOperatorResponseTest extends AbstractSelectionCriteriaFixture year: 2016)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SETUP_ECONOMIC_OPERATOR) then: "Specify year" diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificAverageTurnoverResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificAverageTurnoverResponseTest.groovy index ee6685d06..35c1b9f1d 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificAverageTurnoverResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificAverageTurnoverResponseTest.groovy @@ -39,7 +39,7 @@ class SpecificAverageTurnoverResponseTest extends AbstractSelectionCriteriaFixtu def espd = new EspdDocument(specificAverageTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_AVERAGE_TURNOVER) then: "CriterionID element" @@ -80,7 +80,7 @@ class SpecificAverageTurnoverResponseTest extends AbstractSelectionCriteriaFixtu answer: true, numberOfYears: 32)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_AVERAGE_TURNOVER) then: @@ -96,7 +96,7 @@ class SpecificAverageTurnoverResponseTest extends AbstractSelectionCriteriaFixtu averageTurnover: 11.1123, averageTurnoverCurrency: "RON")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def g1 = response.Criterion[idx].RequirementGroup[0] @@ -113,7 +113,7 @@ class SpecificAverageTurnoverResponseTest extends AbstractSelectionCriteriaFixtu averageTurnover: null, averageTurnoverCurrency: "ALB")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def g1 = response.Criterion[idx].RequirementGroup[0] @@ -129,7 +129,7 @@ class SpecificAverageTurnoverResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_AVERAGE_TURNOVER) then: @@ -145,7 +145,7 @@ class SpecificAverageTurnoverResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_09.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_AVERAGE_TURNOVER) then: @@ -161,7 +161,7 @@ class SpecificAverageTurnoverResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_09"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_AVERAGE_TURNOVER) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificYearlyTurnoverResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificYearlyTurnoverResponseTest.groovy index dca5839fe..6937cb64c 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificYearlyTurnoverResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SpecificYearlyTurnoverResponseTest.groovy @@ -40,7 +40,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur def espd = new EspdDocument(specificYearlyTurnover: new EconomicFinancialStandingCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_YEARLY_TURNOVER) then: "CriterionID element" @@ -83,7 +83,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -135,7 +135,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -182,7 +182,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -234,7 +234,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur ])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.GENERAL_YEARLY_TURNOVER) def crit = response.Criterion[idx] @@ -275,7 +275,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_YEARLY_TURNOVER) then: @@ -292,7 +292,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_08.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_YEARLY_TURNOVER) then: @@ -309,7 +309,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_08"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_YEARLY_TURNOVER) then: @@ -326,7 +326,7 @@ class SpecificYearlyTurnoverResponseTest extends AbstractSelectionCriteriaFixtur availableElectronically: new AvailableElectronically(answer: true, issuer: "HODOR_08"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SPECIFIC_YEARLY_TURNOVER) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/StudyResearchFacilitiesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/StudyResearchFacilitiesResponseTest.groovy index b0eb9494b..aa3ced294 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/StudyResearchFacilitiesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/StudyResearchFacilitiesResponseTest.groovy @@ -39,7 +39,7 @@ class StudyResearchFacilitiesResponseTest extends AbstractSelectionCriteriaFixtu def espd = new EspdDocument(studyResearchFacilities: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.STUDY_AND_RESEARCH_FACILITIES) then: "CriterionID element" @@ -79,7 +79,7 @@ class StudyResearchFacilitiesResponseTest extends AbstractSelectionCriteriaFixtu description: "technical description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.STUDY_AND_RESEARCH_FACILITIES) then: @@ -96,7 +96,7 @@ class StudyResearchFacilitiesResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.STUDY_AND_RESEARCH_FACILITIES) then: @@ -113,7 +113,7 @@ class StudyResearchFacilitiesResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_19.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.STUDY_AND_RESEARCH_FACILITIES) then: @@ -130,7 +130,7 @@ class StudyResearchFacilitiesResponseTest extends AbstractSelectionCriteriaFixtu availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_19"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.STUDY_AND_RESEARCH_FACILITIES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SubcontractingProportionResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SubcontractingProportionResponseTest.groovy index c70f02beb..a12c650cd 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SubcontractingProportionResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SubcontractingProportionResponseTest.groovy @@ -37,7 +37,7 @@ class SubcontractingProportionResponseTest extends AbstractSelectionCriteriaFixt def espd = new EspdDocument(subcontractingProportion: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUBCONTRACTING_PROPORTION) then: "CriterionID element" @@ -73,7 +73,7 @@ class SubcontractingProportionResponseTest extends AbstractSelectionCriteriaFixt specify: "specify here")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUBCONTRACTING_PROPORTION) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyChainManagementResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyChainManagementResponseTest.groovy index f8ed6f07a..d87d7f228 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyChainManagementResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyChainManagementResponseTest.groovy @@ -39,7 +39,7 @@ class SupplyChainManagementResponseTest extends AbstractSelectionCriteriaFixture def espd = new EspdDocument(supplyChainManagement: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CHAIN_MANAGEMENT) then: "CriterionID element" @@ -79,7 +79,7 @@ class SupplyChainManagementResponseTest extends AbstractSelectionCriteriaFixture description: "technical description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CHAIN_MANAGEMENT) then: @@ -96,7 +96,7 @@ class SupplyChainManagementResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CHAIN_MANAGEMENT) then: @@ -112,7 +112,7 @@ class SupplyChainManagementResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_20.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CHAIN_MANAGEMENT) then: @@ -128,7 +128,7 @@ class SupplyChainManagementResponseTest extends AbstractSelectionCriteriaFixture availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_20"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CHAIN_MANAGEMENT) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsCertificatesByQCResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsCertificatesByQCResponseTest.groovy index 27f7ba88e..aaac38968 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsCertificatesByQCResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsCertificatesByQCResponseTest.groovy @@ -39,7 +39,7 @@ class SupplyContractsCertificatesByQCResponseTest extends AbstractSelectionCrite def espd = new EspdDocument(supplyContractsCertificatesQc: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_CERTIFICATES_QC) then: "CriterionID element" @@ -85,7 +85,7 @@ class SupplyContractsCertificatesByQCResponseTest extends AbstractSelectionCrite def espd = new EspdDocument(supplyContractsCertificatesQc: new TechnicalProfessionalCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_CERTIFICATES_QC) then: @@ -103,7 +103,7 @@ class SupplyContractsCertificatesByQCResponseTest extends AbstractSelectionCrite description: "technical description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_CERTIFICATES_QC) then: @@ -119,7 +119,7 @@ class SupplyContractsCertificatesByQCResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_CERTIFICATES_QC) then: @@ -135,7 +135,7 @@ class SupplyContractsCertificatesByQCResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_31.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_CERTIFICATES_QC) then: @@ -151,7 +151,7 @@ class SupplyContractsCertificatesByQCResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_31"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_CERTIFICATES_QC) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsPerformanceDeliveriesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsPerformanceDeliveriesResponseTest.groovy index add1cccfd..7f7b86161 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsPerformanceDeliveriesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsPerformanceDeliveriesResponseTest.groovy @@ -43,7 +43,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection def espd = new EspdDocument(supplyContractsPerformanceDeliveries: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: "CriterionID element" @@ -78,7 +78,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection new DynamicRequirementGroup("description": "desc3"), new DynamicRequirementGroup("description": "desc4")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: @@ -104,7 +104,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection new DynamicRequirementGroup("description": "desc5"), new DynamicRequirementGroup("description": "desc6")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: @@ -157,7 +157,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection new DynamicRequirementGroup("amount": 55.55, "currency": "YEN")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: "First amount" @@ -205,7 +205,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection new DynamicRequirementGroup("startDate": date2)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: "First date" @@ -230,7 +230,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection new DynamicRequirementGroup("endDate": date2)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: "First date" @@ -253,7 +253,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection new DynamicRequirementGroup("recipients": "rec2")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: "First recipients" @@ -276,7 +276,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: @@ -293,7 +293,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_14.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: @@ -310,7 +310,7 @@ class SupplyContractsPerformanceDeliveriesResponseTest extends AbstractSelection availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_14"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_PERFORMANCE_OF_DELIVERIES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithCAResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithCAResponseTest.groovy index 796cc0c7a..df5ed45ce 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithCAResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithCAResponseTest.groovy @@ -39,7 +39,7 @@ class SupplyContractsSamplesWithCAResponseTest extends AbstractSelectionCriteria def espd = new EspdDocument(supplyContractsSamplesDescriptionsWithCa: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITH_CA) then: "CriterionID element" @@ -77,7 +77,7 @@ class SupplyContractsSamplesWithCAResponseTest extends AbstractSelectionCriteria def espd = new EspdDocument(supplyContractsSamplesDescriptionsWithCa: new TechnicalProfessionalCriterion(exists: true, answer: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITH_CA) then: @@ -94,7 +94,7 @@ class SupplyContractsSamplesWithCAResponseTest extends AbstractSelectionCriteria availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITH_CA) then: @@ -111,7 +111,7 @@ class SupplyContractsSamplesWithCAResponseTest extends AbstractSelectionCriteria availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_30.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITH_CA) then: @@ -128,7 +128,7 @@ class SupplyContractsSamplesWithCAResponseTest extends AbstractSelectionCriteria availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_30"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITH_CA) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithoutCAResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithoutCAResponseTest.groovy index cd962f1ad..65a9bb517 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithoutCAResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/SupplyContractsSamplesWithoutCAResponseTest.groovy @@ -39,7 +39,7 @@ class SupplyContractsSamplesWithoutCAResponseTest extends AbstractSelectionCrite def espd = new EspdDocument(supplyContractsSamplesDescriptionsWithoutCa: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITHOUT_CA) then: "CriterionID element" @@ -77,7 +77,7 @@ class SupplyContractsSamplesWithoutCAResponseTest extends AbstractSelectionCrite def espd = new EspdDocument(supplyContractsSamplesDescriptionsWithoutCa: new TechnicalProfessionalCriterion(exists: true, answer: false)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITHOUT_CA) then: @@ -94,7 +94,7 @@ class SupplyContractsSamplesWithoutCAResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITHOUT_CA) then: @@ -110,7 +110,7 @@ class SupplyContractsSamplesWithoutCAResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_29.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITHOUT_CA) then: @@ -126,7 +126,7 @@ class SupplyContractsSamplesWithoutCAResponseTest extends AbstractSelectionCrite availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_29"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.SUPPLY_CONTRACTS_SAMPLES_DESCRIPTIONS_WITHOUT_CA) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechnicalFacilitiesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechnicalFacilitiesResponseTest.groovy index 21260d5f9..af46403a4 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechnicalFacilitiesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechnicalFacilitiesResponseTest.groovy @@ -39,7 +39,7 @@ class TechnicalFacilitiesResponseTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(technicalFacilitiesMeasures: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICAL_FACILITIES_AND_MEASURES) then: "CriterionID element" @@ -79,7 +79,7 @@ class TechnicalFacilitiesResponseTest extends AbstractSelectionCriteriaFixture { description: "technical description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICAL_FACILITIES_AND_MEASURES) then: @@ -96,7 +96,7 @@ class TechnicalFacilitiesResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICAL_FACILITIES_AND_MEASURES) then: @@ -113,7 +113,7 @@ class TechnicalFacilitiesResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_18.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICAL_FACILITIES_AND_MEASURES) then: @@ -130,7 +130,7 @@ class TechnicalFacilitiesResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_18"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICAL_FACILITIES_AND_MEASURES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechniciansTechnicalBodiesResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechniciansTechnicalBodiesResponseTest.groovy index 26abcf791..a94e38113 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechniciansTechnicalBodiesResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/TechniciansTechnicalBodiesResponseTest.groovy @@ -39,7 +39,7 @@ class TechniciansTechnicalBodiesResponseTest extends AbstractSelectionCriteriaFi def espd = new EspdDocument(techniciansTechnicalBodies: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICIANS_OR_TECHNICAL_BODIES) then: "CriterionID element" @@ -79,7 +79,7 @@ class TechniciansTechnicalBodiesResponseTest extends AbstractSelectionCriteriaFi description: "technicians description")) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICIANS_OR_TECHNICAL_BODIES) then: @@ -96,7 +96,7 @@ class TechniciansTechnicalBodiesResponseTest extends AbstractSelectionCriteriaFi availableElectronically: new AvailableElectronically(answer: false))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICIANS_OR_TECHNICAL_BODIES) then: @@ -113,7 +113,7 @@ class TechniciansTechnicalBodiesResponseTest extends AbstractSelectionCriteriaFi availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_16.com"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICIANS_OR_TECHNICAL_BODIES) then: @@ -130,7 +130,7 @@ class TechniciansTechnicalBodiesResponseTest extends AbstractSelectionCriteriaFi availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_16"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TECHNICIANS_OR_TECHNICAL_BODIES) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ToolsPlantResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ToolsPlantResponseTest.groovy index bfed4819c..f524cb1ef 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ToolsPlantResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/ToolsPlantResponseTest.groovy @@ -39,7 +39,7 @@ class ToolsPlantResponseTest extends AbstractSelectionCriteriaFixture { def espd = new EspdDocument(toolsPlantTechnicalEquipment: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TOOLS_PLANT_TECHNICAL_EQUIPMENT) then: "CriterionID element" @@ -79,7 +79,7 @@ class ToolsPlantResponseTest extends AbstractSelectionCriteriaFixture { description: "technical description")) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TOOLS_PLANT_TECHNICAL_EQUIPMENT) then: @@ -96,7 +96,7 @@ class ToolsPlantResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TOOLS_PLANT_TECHNICAL_EQUIPMENT) then: @@ -112,7 +112,7 @@ class ToolsPlantResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_26.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TOOLS_PLANT_TECHNICAL_EQUIPMENT) then: @@ -128,7 +128,7 @@ class ToolsPlantResponseTest extends AbstractSelectionCriteriaFixture { availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_26"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.TOOLS_PLANT_TECHNICAL_EQUIPMENT) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsPerformanceWorksResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsPerformanceWorksResponseTest.groovy index a38af5c9b..fcb70f416 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsPerformanceWorksResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsPerformanceWorksResponseTest.groovy @@ -43,7 +43,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri def espd = new EspdDocument(workContractsPerformanceOfWorks: new TechnicalProfessionalCriterion(exists: true)) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: "CriterionID element" @@ -78,7 +78,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri new DynamicRequirementGroup("description": "desc3"), new DynamicRequirementGroup("description": "desc4")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: @@ -104,7 +104,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri new DynamicRequirementGroup("description": "desc5"), new DynamicRequirementGroup("description": "desc6")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: @@ -157,7 +157,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri new DynamicRequirementGroup("amount": 55.55, "currency": "YEN")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: "First amount" @@ -205,7 +205,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri new DynamicRequirementGroup("startDate": date2)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: "First date" @@ -230,7 +230,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri new DynamicRequirementGroup("endDate": date2)])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: "First date" @@ -253,7 +253,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri new DynamicRequirementGroup("recipients": "rec2")])) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: "First recipients" @@ -275,7 +275,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: false))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: @@ -292,7 +292,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_13.com"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: @@ -309,7 +309,7 @@ class WorkContractsPerformanceWorksResponseTest extends AbstractSelectionCriteri availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_13"))) when: - def response = parseResponseXml(espd) + def response = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_PERFORMANCE_OF_WORKS) then: diff --git a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsTechniciansResponseTest.groovy b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsTechniciansResponseTest.groovy index 96d3fc560..d860d0685 100644 --- a/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsTechniciansResponseTest.groovy +++ b/espd-web/src/test/groovy/eu/europa/ec/grow/espd/xml/response/selection/WorkContractsTechniciansResponseTest.groovy @@ -39,7 +39,7 @@ class WorkContractsTechniciansResponseTest extends AbstractSelectionCriteriaFixt def espd = new EspdDocument(workContractsTechnicians: new TechnicalProfessionalCriterion(exists: true)) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_TECHNICIANS_OR_TECHNICAL_BODIES) then: "CriterionID element" @@ -79,7 +79,7 @@ class WorkContractsTechniciansResponseTest extends AbstractSelectionCriteriaFixt description: "technicians description")) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_TECHNICIANS_OR_TECHNICAL_BODIES) then: @@ -96,7 +96,7 @@ class WorkContractsTechniciansResponseTest extends AbstractSelectionCriteriaFixt availableElectronically: new AvailableElectronically(answer: false))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_TECHNICIANS_OR_TECHNICAL_BODIES) then: @@ -113,7 +113,7 @@ class WorkContractsTechniciansResponseTest extends AbstractSelectionCriteriaFixt availableElectronically: new AvailableElectronically(answer: true, url: "http://hodor_17.com"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_TECHNICIANS_OR_TECHNICAL_BODIES) then: @@ -130,7 +130,7 @@ class WorkContractsTechniciansResponseTest extends AbstractSelectionCriteriaFixt availableElectronically: new AvailableElectronically(answer: true, code: "HODOR_17"))) when: - def request = parseResponseXml(espd) + def request = generateResponseXml(espd) def idx = getResponseCriterionIndex(SelectionCriterion.WORK_CONTRACTS_TECHNICIANS_OR_TECHNICAL_BODIES) then: From 532fa8d3477bde7dc5f9d7735e7cb6e0d2ae719e Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Tue, 24 Jan 2017 14:45:16 +0100 Subject: [PATCH 07/24] #140 added popup box appearing in 1hour of unactivity --- .../resources/WEB-INF/views/espdTemplate.jsp | 8 ++++++++ .../META-INF/resources/static/css/espd.css | 20 +++++++++++++++++++ .../main/resources/i18n/messages.properties | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp index 60c829293..ae6822616 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp @@ -49,8 +49,16 @@ var ecertisHandler = EcertisHandler("${ecertisCriterionURL}", "${agent == 'eo' ? espd.economicOperator.country.iso2Code : espd.authority.country.iso2Code}") $('.ecertis-link-header').click(ecertisHandler); + + $("#espd-popup").delay(3600000).show(0); }); +
diff --git a/espd-web/src/main/resources/META-INF/resources/static/css/espd.css b/espd-web/src/main/resources/META-INF/resources/static/css/espd.css index 412f0cf89..a35a5c44b 100644 --- a/espd-web/src/main/resources/META-INF/resources/static/css/espd.css +++ b/espd-web/src/main/resources/META-INF/resources/static/css/espd.css @@ -467,3 +467,23 @@ a.splashLangBox { white-space: -o-pre-wrap; /* Opera 7 */ word-wrap: break-word; /* IE */ } + +/* define popup 1hour reminder style*/ + +.espd-popup{ + width:100%; + min-height:100%; + background-color: rgba(0,0,0,0.5); + overflow:hidden; + position:fixed; + top:0px; + z-index: 1000; +} +.espd-popup .espd-popup-content{ + margin:40px auto 0px auto; + width:300px; + padding:10px; + background-color: white; + border-radius:5px; + box-shadow: 0px 0px 10px #000; +} \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index a8c1b44a6..9779d2c97 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -217,4 +217,5 @@ report_security_incident=Report on an Information Security Incident filter_i_am_ce=I am contracting entity tooltip_ce_ref_buyer=The term contracting entity refers to the buyer. -error_ted_notice_not_supported=The uploaded file is a notice and not an ESPD, therefore it cannot be used with this service \ No newline at end of file +error_ted_notice_not_supported=The uploaded file is a notice and not an ESPD, therefore it cannot be used with this service +expire_reminder_message=You have not done any action in the ESPD service for almost one hour.

Please save the eESPD to make sure that you do not loose data.

You can import (reuse) your eESPD at any time to continue working \ No newline at end of file From 5a881d2c5ced7f6ebf1948c7d43fe4a57b19b687 Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Tue, 24 Jan 2017 16:59:05 +0100 Subject: [PATCH 08/24] #121 add prefill parameters for the /filter page --- .../src/main/asciidoc/configuration.adoc | 45 +++ .../grow/espd/controller/EspdController.java | 24 +- ...ameters.java => EspdFilterParameters.java} | 4 +- .../ec/grow/espd/domain/EspdDocument.java | 12 - .../resources/WEB-INF/views/filter.jsp | 355 ++++++++++++------ 5 files changed, 290 insertions(+), 150 deletions(-) rename espd-web/src/main/java/eu/europa/ec/grow/espd/controller/{EspdPrefillParameters.java => EspdFilterParameters.java} (95%) diff --git a/espd-docs/src/main/asciidoc/configuration.adoc b/espd-docs/src/main/asciidoc/configuration.adoc index 2bb1076fc..365f112e6 100644 --- a/espd-docs/src/main/asciidoc/configuration.adoc +++ b/espd-docs/src/main/asciidoc/configuration.adoc @@ -738,3 +738,48 @@ relative to the application context root. ---- + +=== Web Page Parameters + +Certain HTTP parameters can be passed to the web pages of the {espd} application to prefill specific fields. + +==== Filter Page + +The following parameters can be specified for the `/filter` page by issuing an HTTP GET request: + +* `lang` is used to specify the language to be used by the application. It consists of a two letter code from +the supported languages of the application. Example: +* `agent` is used to choose between a `contracting authority`, `contracting entity` and `economic operator. The only +accepted values are: + +** `ca` +** `ce` +** `eo` + +* `action` defines what the user would like to do. The accepted values are: + +** `ca_create_espd_request` for selecting the `Create a new ESPD` option as a contracting authority or contracting entity +** `ca_reuse_espd_request` for selecting the `Reuse an existing ESPD` option as a contracting authority or contracting entity +** `ca_review_espd_response` for selecting the `Review ESPD` option as a contracting authority or contracting entity +** `eo_import_espd` for selecting the `Import ESPD` option as an economic operator +** `eo_merge_espds` for selecting the `Merge two ESPDs` option as an economic operator +** `eo_create_response` for selecting the `Create response` option as an economic operator + +* `country` for selecting the desired country of the authority or economic operator. It must be the two letter +code of the country in uppercase. + +Example of such a request: +[source,bash] +.filter request.sh +---- +HTTP GET @ /espd/filter?lang=ro&agent=eo&action=eo_create_response&authority.country=RO +---- + +To go directly to the `procedure` page, you can perform an HTTP POST request on the `/filter` page with a +`multipart/form-data` content type. + +Additional parameters that need to be passed, depending on the use case, are: + +* `next` with a value of `procedure` +* `tedReceptionId` +* `attachments` in case you need to upload ESPD XML files \ No newline at end of file diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java index 1dd431c32..da54b12d7 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java @@ -25,10 +25,7 @@ package eu.europa.ec.grow.espd.controller; import com.google.common.base.Optional; -import eu.europa.ec.grow.espd.domain.DynamicRequirementGroup; -import eu.europa.ec.grow.espd.domain.EconomicOperatorImpl; -import eu.europa.ec.grow.espd.domain.EconomicOperatorRepresentative; -import eu.europa.ec.grow.espd.domain.EspdDocument; +import eu.europa.ec.grow.espd.domain.*; import eu.europa.ec.grow.espd.domain.enums.other.Country; import eu.europa.ec.grow.espd.domain.intf.UnboundedRequirementGroup; import eu.europa.ec.grow.espd.ted.TedRequest; @@ -107,7 +104,7 @@ public String viewContactPage() { } @GetMapping("/filter") - public String viewFilterPage(@ModelAttribute("espdPrefill") EspdPrefillParameters prefillParameters) { + public String viewFilterPage(@ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters) { return "filter"; } @@ -124,9 +121,12 @@ public String cancel(SessionStatus status) { @PostMapping(value = "/filter", params = "action=ca_create_espd_request") public String createNewRequestAsCA( @RequestParam("agent") String agent, - @RequestParam("authority.country") Country country, + @RequestParam("country") Country country, @ModelAttribute("espd") EspdDocument document) throws IOException { document.setExtendCe("ce".equals(agent)); + if (document.getAuthority() == null) { + document.setAuthority(new PartyImpl()); + } document.getAuthority().setCountry(country); document.selectCAExclusionCriteriaEU(); copyTedInformation(document); @@ -161,7 +161,7 @@ private void copyTedInformation(EspdDocument document) { public String reuseRequestAsCA( @RequestParam("agent") String agent, @RequestPart List attachments, - @ModelAttribute("espd") EspdDocument document, + @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { @@ -182,7 +182,7 @@ public String reuseRequestAsCA( public String reviewResponseAsCA( @RequestParam("agent") String agent, @RequestPart List attachments, - @ModelAttribute("espd") EspdDocument document, + @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { @@ -201,9 +201,9 @@ public String reviewResponseAsCA( @PostMapping(value = "/filter", params = "action=eo_import_espd") public String importEspdAsEo( - @RequestParam("authority.country") Country country, + @RequestParam("country") Country country, @RequestPart List attachments, - @ModelAttribute("espd") EspdDocument document, + @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { @@ -239,7 +239,7 @@ private boolean needsToLoadProcurementProcedureInformation(EspdDocument espdDocu @PostMapping(value = "/filter", params = "action=eo_merge_espds") public String mergeTwoEspds( @RequestPart List attachments, - @ModelAttribute("espd") EspdDocument document, + @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, Model model, BindingResult result) throws IOException { try (InputStream reqIs = attachments.get(1).getInputStream(); @@ -257,7 +257,7 @@ public String mergeTwoEspds( @PostMapping(value = "/filter", params = "action=eo_create_response") public String createNewResponseAsEO( - @RequestParam("authority.country") Country country, + @RequestParam("country") Country country, @ModelAttribute("espd") EspdDocument document, Model model, BindingResult result) throws IOException { diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdPrefillParameters.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java similarity index 95% rename from espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdPrefillParameters.java rename to espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java index ca78c4f59..e93432226 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdPrefillParameters.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java @@ -34,10 +34,12 @@ import java.util.List; /** + * Form backing object for the Filter page. + * * Created by ratoico on 1/19/17. */ @Data -class EspdPrefillParameters { +class EspdFilterParameters { private String agent; diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java index 87a59f974..8700d8abd 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java @@ -30,9 +30,7 @@ import isa.names.specification.ubl.schema.xsd.ccv_commonaggregatecomponents_1.CriterionType; import lombok.Data; import org.apache.commons.beanutils.PropertyUtils; -import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.Date; import java.util.List; @@ -147,16 +145,6 @@ public class EspdDocument { private List ublCriteria; - //trick to use List of MultipartFile as @RequestParam - public void setAttachments(List attachments) throws IOException { - } - - public List getAttachments() { - return null; - } - - private String agent; - public final boolean atLeastOneSelectionCriterionWasSelected() { boolean atLeastOnePresent = false; for (SelectionCriterion ccvCriterion : diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp index b2ba901f1..47ab82b02 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp @@ -1,4 +1,4 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> @@ -28,157 +28,264 @@ --%> - - - - -

+ + +
- - - + + + -
-

-
- - -
- -
- - -
- +
-
-

- - -

-
- - -
-
- - -
-
- - -
-
-
-

${span18n['filter_what_you_do']}

+
+

+ + +

+
+ + +
+
+ + +
+
+ + +
+
+
+

${span18n['filter_what_you_do']}

- - + +
- +
- +
- - + +
- - + +
 
-
-
-

-
- - - -
+
+
+

- - + +
- - + +
-
-
-
-
-

+
+ + + +
+
+
+
+
+

- -
+ +

@@ -187,23 +294,21 @@ $(function() {
- -

${span18n['filter_where_are_you_from_ca']}

-

${span18n['filter_where_are_you_from_eo']}

- - - - - - -
-
-
-
+

${span18n['filter_where_are_you_from_ca']}

+

${span18n['filter_where_are_you_from_eo']}

+ + + + + +
+
+
+
- - + + From 52cfc7ce9a91699953fb45b3b8bb3a1e7897dae3 Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Wed, 25 Jan 2017 11:45:10 +0100 Subject: [PATCH 09/24] #121 add prefill parameters for the /procedure page --- .../src/main/asciidoc/configuration.adoc | 46 ++++++++++++++++++- .../grow/espd/controller/EspdController.java | 34 +++++++++++++- .../espd/controller/EspdFilterParameters.java | 8 ---- .../controller/EspdProcedureParameters.java | 46 +++++++++++++++++++ 4 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java diff --git a/espd-docs/src/main/asciidoc/configuration.adoc b/espd-docs/src/main/asciidoc/configuration.adoc index 365f112e6..6cb56f2ab 100644 --- a/espd-docs/src/main/asciidoc/configuration.adoc +++ b/espd-docs/src/main/asciidoc/configuration.adoc @@ -782,4 +782,48 @@ Additional parameters that need to be passed, depending on the use case, are: * `next` with a value of `procedure` * `tedReceptionId` -* `attachments` in case you need to upload ESPD XML files \ No newline at end of file +* `attachments` in case you need to upload ESPD XML files + +These parameters are defined in the `EspdFilterParameters` class. + +==== Procedure Page + +We also support adding parameters to the `/procedure` page when issuing an HTTP GET request. + +When the `agent` is a contracting authority or contracting entity, the following parameters are supported for +filling in the fields belonging to `Part I - Information about the procurement procedure section`. + +* `officialName` +* `procurerCountry` - must be a two letter country code in uppercase +* `title` +* `description` +* `fileRefByCA` + + +[source,bash] +.Procedure page request example.sh +---- +HTTP GET @ espd/request/ca/procedure?title=ESPD&description=application&procurerCountry=RO +---- + +When the agent is economic operator, the parameters below can additionally be configured: + +* `name` +* `vatNumber` +* `anotherNationalId` +* `website` +* `street` +* `postalCode` +* `city` +* `country` - must be a two letter country code in uppercase +* `contactName` +* `contactEmail` +* `contactPhone` + +[source,bash] +.Procedure page request example.sh +---- +HTTP GET @ espd/response/eo/procedure?country=RO&city=Drobeta&procurerCountry=IT +---- + +These parameters are defined in the `EspdProcedureParameters` class. \ No newline at end of file diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java index da54b12d7..5ff6d36bb 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java @@ -270,7 +270,39 @@ public String createNewResponseAsEO( return redirectToPage(RESPONSE_EO_PROCEDURE_PAGE); } - @GetMapping("/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish|print}") + @GetMapping("/request/ca/procedure") + public String procedureAuthority( + EspdProcedureParameters procedureParameters, + @ModelAttribute("espd") EspdDocument espd) { + copyProcurementInformation(procedureParameters, espd); + return "request_ca_procedure"; + } + + @GetMapping("/response/eo/procedure") + public String procedureEconomicOperator( + EspdProcedureParameters procedureParameters, + @ModelAttribute("espd") EspdDocument espd) { + copyProcurementInformation(procedureParameters, espd); + if (espd.getEconomicOperator() == null) { + espd.setEconomicOperator(new EconomicOperatorImpl()); + } + espd.getEconomicOperator().copyProperties(procedureParameters); + return "response_eo_procedure"; + } + + private void copyProcurementInformation(EspdProcedureParameters procedureParameters, + @ModelAttribute("espd") EspdDocument espd) { + espd.setProcedureTitle(procedureParameters.getTitle()); + espd.setProcedureShortDesc(procedureParameters.getDescription()); + espd.setFileRefByCA(procedureParameters.getFileRefByCA()); + if (espd.getAuthority() == null) { + espd.setAuthority(new PartyImpl()); + } + espd.getAuthority().setName(procedureParameters.getOfficialName()); + espd.getAuthority().setCountry(procedureParameters.getProcurerCountry()); + } + + @GetMapping("/{flow:request|response}/{agent:ca|eo}/{step:exclusion|selection|finish|print}") public String view( @PathVariable String flow, @PathVariable String agent, diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java index e93432226..2aaeb7e24 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java @@ -24,8 +24,6 @@ package eu.europa.ec.grow.espd.controller; -import eu.europa.ec.grow.espd.domain.EconomicOperatorImpl; -import eu.europa.ec.grow.espd.domain.PartyImpl; import eu.europa.ec.grow.espd.domain.enums.other.Country; import lombok.Data; import org.springframework.web.multipart.MultipartFile; @@ -47,14 +45,8 @@ class EspdFilterParameters { private Country country; - private String whoAreYou; - private String tedReceptionId; - private PartyImpl authority; - - private EconomicOperatorImpl economicOperator; - //trick to use List of MultipartFile as @RequestParam public void setAttachments(List attachments) throws IOException { } diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java new file mode 100644 index 000000000..10baf7a88 --- /dev/null +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java @@ -0,0 +1,46 @@ +/* + * + * Copyright 2016 EUROPEAN COMMISSION + * + * Licensed under the EUPL, Version 1.1 or – as soon they + * will be approved by the European Commission - subsequent + * versions of the EUPL (the "Licence"); + * + * You may not use this work except in compliance with the Licence. + * + * You may obtain a copy of the Licence at: + * + * https://joinup.ec.europa.eu/community/eupl/og_page/eupl + * + * Unless required by applicable law or agreed to in + * writing, software distributed under the Licence is + * distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the Licence for the specific language governing + * permissions and limitations under the Licence. + * + */ + +package eu.europa.ec.grow.espd.controller; + +import eu.europa.ec.grow.espd.domain.PartyImpl; +import eu.europa.ec.grow.espd.domain.enums.other.Country; +import lombok.Data; + +/** + * Created by ratoico on 1/24/17. + */ +@Data +class EspdProcedureParameters extends PartyImpl { + + private String officialName; + + private Country procurerCountry; + + private String title; + + private String description; + + private String fileRefByCA; +} From 571a1a176be6131b0dc252f0942dcc7f9d4a9774 Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Wed, 25 Jan 2017 15:57:42 +0100 Subject: [PATCH 10/24] #121 use /initialization URL instead of /filter or /procedure pages to initialize ESPD values --- .../src/main/asciidoc/configuration.adoc | 59 +--- .../grow/espd/controller/EspdController.java | 297 +++++++++--------- ...java => EspdInitializationParameters.java} | 20 +- .../controller/EspdProcedureParameters.java | 46 --- .../resources/WEB-INF/views/filter.jsp | 2 +- 5 files changed, 175 insertions(+), 249 deletions(-) rename espd-web/src/main/java/eu/europa/ec/grow/espd/controller/{EspdFilterParameters.java => EspdInitializationParameters.java} (74%) delete mode 100644 espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java diff --git a/espd-docs/src/main/asciidoc/configuration.adoc b/espd-docs/src/main/asciidoc/configuration.adoc index 6cb56f2ab..d73aeb56b 100644 --- a/espd-docs/src/main/asciidoc/configuration.adoc +++ b/espd-docs/src/main/asciidoc/configuration.adoc @@ -739,22 +739,19 @@ relative to the application context root. ---- -=== Web Page Parameters +=== Web Page Initialization Parameters -Certain HTTP parameters can be passed to the web pages of the {espd} application to prefill specific fields. - -==== Filter Page - -The following parameters can be specified for the `/filter` page by issuing an HTTP GET request: +Certain HTTP parameters can be passed to the `/initialization` URL of the {espd} application to +initialize specific fields. When issuing such a request, the application redirects the client to the `/filter` page. * `lang` is used to specify the language to be used by the application. It consists of a two letter code from the supported languages of the application. Example: -* `agent` is used to choose between a `contracting authority`, `contracting entity` and `economic operator. The only +* `agent` is used to choose between a `contracting authority`, `contracting entity` and `economic operator`. The only accepted values are: -** `ca` -** `ce` -** `eo` +** `ca` for contracting authority +** `ce` for contracting entity +** `eo` for economic operator * `action` defines what the user would like to do. The accepted values are: @@ -763,33 +760,11 @@ accepted values are: ** `ca_review_espd_response` for selecting the `Review ESPD` option as a contracting authority or contracting entity ** `eo_import_espd` for selecting the `Import ESPD` option as an economic operator ** `eo_merge_espds` for selecting the `Merge two ESPDs` option as an economic operator -** `eo_create_response` for selecting the `Create response` option as an economic operator +** `eo_create_espd_response` for selecting the `Create response` option as an economic operator * `country` for selecting the desired country of the authority or economic operator. It must be the two letter code of the country in uppercase. -Example of such a request: -[source,bash] -.filter request.sh ----- -HTTP GET @ /espd/filter?lang=ro&agent=eo&action=eo_create_response&authority.country=RO ----- - -To go directly to the `procedure` page, you can perform an HTTP POST request on the `/filter` page with a -`multipart/form-data` content type. - -Additional parameters that need to be passed, depending on the use case, are: - -* `next` with a value of `procedure` -* `tedReceptionId` -* `attachments` in case you need to upload ESPD XML files - -These parameters are defined in the `EspdFilterParameters` class. - -==== Procedure Page - -We also support adding parameters to the `/procedure` page when issuing an HTTP GET request. - When the `agent` is a contracting authority or contracting entity, the following parameters are supported for filling in the fields belonging to `Part I - Information about the procurement procedure section`. @@ -798,15 +773,10 @@ filling in the fields belonging to `Part I - Information about the procurement p * `title` * `description` * `fileRefByCA` +* `tedReceptionId` specifies the received notice number - -[source,bash] -.Procedure page request example.sh ----- -HTTP GET @ espd/request/ca/procedure?title=ESPD&description=application&procurerCountry=RO ----- - -When the agent is economic operator, the parameters below can additionally be configured: +When the agent is economic operator, the parameters below can additionally be configured to initialize +`Part II Information concerning the economic operator - Section A`: * `name` * `vatNumber` @@ -821,9 +791,10 @@ When the agent is economic operator, the parameters below can additionally be co * `contactPhone` [source,bash] -.Procedure page request example.sh +.Initialization page request example.sh ---- -HTTP GET @ espd/response/eo/procedure?country=RO&city=Drobeta&procurerCountry=IT +HTTP POST @ espd/initialization?country=RO&city=Drobeta&agent=eo&action=eo_create_espd_response&procurerCountry=FR&lang=ro ---- -These parameters are defined in the `EspdProcedureParameters` class. \ No newline at end of file +All the parameters described above are defined in the `EspdInitializationParameters` class. +It is recommended to use HTTP POST requests but HTTP GET requests are also supported. \ No newline at end of file diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java index cdb504f22..60d3f1fe8 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java @@ -102,8 +102,7 @@ public String viewContactPage() { } @GetMapping("/filter") - public String viewFilterPage(@ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters) { - + public String viewFilterPage(@ModelAttribute("espdFilterParams") EspdInitializationParameters initParams) { return "filter"; } @@ -159,7 +158,7 @@ private void copyTedInformation(EspdDocument document) { public String reuseRequestAsCA( @RequestParam("agent") String agent, @RequestPart List attachments, - @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, + @ModelAttribute("espdFilterParams") EspdInitializationParameters initParams, Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { @@ -180,7 +179,7 @@ public String reuseRequestAsCA( public String reviewResponseAsCA( @RequestParam("agent") String agent, @RequestPart List attachments, - @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, + @ModelAttribute("espdFilterParams") EspdInitializationParameters initParams, Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { @@ -201,7 +200,7 @@ public String reviewResponseAsCA( public String importEspdAsEo( @RequestParam("country") Country country, @RequestPart List attachments, - @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, + @ModelAttribute("espdFilterParams") EspdInitializationParameters initParams, Model model, BindingResult result) throws IOException { try (InputStream is = attachments.get(0).getInputStream()) { @@ -237,7 +236,7 @@ private boolean needsToLoadProcurementProcedureInformation(EspdDocument espdDocu @PostMapping(value = "/filter", params = "action=eo_merge_espds") public String mergeTwoEspds( @RequestPart List attachments, - @ModelAttribute("espdFilterParams") EspdFilterParameters filterParameters, + @ModelAttribute("espdFilterParams") EspdInitializationParameters initParams, Model model, BindingResult result) throws IOException { try (InputStream reqIs = attachments.get(1).getInputStream(); @@ -253,7 +252,7 @@ public String mergeTwoEspds( return "filter"; } - @PostMapping(value = "/filter", params = "action=eo_create_response") + @PostMapping(value = "/filter", params = "action=eo_create_espd_response") public String createNewResponseAsEO( @RequestParam("country") Country country, @ModelAttribute("espd") EspdDocument document, @@ -268,39 +267,7 @@ public String createNewResponseAsEO( return redirectToPage(RESPONSE_EO_PROCEDURE_PAGE); } - @GetMapping("/request/ca/procedure") - public String procedureAuthority( - EspdProcedureParameters procedureParameters, - @ModelAttribute("espd") EspdDocument espd) { - copyProcurementInformation(procedureParameters, espd); - return "request_ca_procedure"; - } - - @GetMapping("/response/eo/procedure") - public String procedureEconomicOperator( - EspdProcedureParameters procedureParameters, - @ModelAttribute("espd") EspdDocument espd) { - copyProcurementInformation(procedureParameters, espd); - if (espd.getEconomicOperator() == null) { - espd.setEconomicOperator(new EconomicOperatorImpl()); - } - espd.getEconomicOperator().copyProperties(procedureParameters); - return "response_eo_procedure"; - } - - private void copyProcurementInformation(EspdProcedureParameters procedureParameters, - @ModelAttribute("espd") EspdDocument espd) { - espd.setProcedureTitle(procedureParameters.getTitle()); - espd.setProcedureShortDesc(procedureParameters.getDescription()); - espd.setFileRefByCA(procedureParameters.getFileRefByCA()); - if (espd.getAuthority() == null) { - espd.setAuthority(new PartyImpl()); - } - espd.getAuthority().setName(procedureParameters.getOfficialName()); - espd.getAuthority().setCountry(procedureParameters.getProcurerCountry()); - } - - @GetMapping("/{flow:request|response}/{agent:ca|eo}/{step:exclusion|selection|finish|print}") + @GetMapping("/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish|overview}") public String view( @PathVariable String flow, @PathVariable String agent, @@ -321,118 +288,6 @@ public String previous( flow + "_" + agent + "_" + step : redirectToPage(flow + "/" + agent + "/" + prev); } - @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:finish}", params = "overview") - public String overview( - @PathVariable String flow, - @PathVariable String agent, - @PathVariable String step, - @ModelAttribute("espd") EspdDocument espd, - BindingResult bindingResult) { - return bindingResult.hasErrors() ? - flow + "_" + agent + "_" + step : redirectToPage(flow + "/" + agent + "/overview"); - } - - @PostMapping(value = "/{flow:request|response}/eo/procedure", params = "add") - public String addRepresentative(@PathVariable String flow, @RequestParam Integer add, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - espd.getEconomicOperator().getRepresentatives().add(add, new EconomicOperatorRepresentative()); - return redirectToPage(flow + "/eo/procedure#representative" + add); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_financialRatio") - public String addFinancialRatio(@PathVariable String flow, @RequestParam("add_financialRatio") Integer addIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return addMultipleReference(espd.getFinancialRatio(), - addIndex, "#financialRatio", flow); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_workContractsPerformanceOfWorks") - public String addWorkContractsPerformanceOfWorks(@PathVariable String flow, - @RequestParam("add_workContractsPerformanceOfWorks") Integer addIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return addMultipleReference(espd.getWorkContractsPerformanceOfWorks(), - addIndex, "#workContractsPerformanceOfWorks", flow); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_supplyContractsPerformanceDeliveries") - public String addSupplyContractsPerformanceDeliveries(@PathVariable String flow, - @RequestParam("add_supplyContractsPerformanceDeliveries") Integer addIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return addMultipleReference(espd.getSupplyContractsPerformanceDeliveries(), - addIndex, "#supplyContractsPerformanceDeliveries", flow); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_serviceContractsPerformanceServices") - public String addServiceContractsPerformanceServices(@PathVariable String flow, - @RequestParam("add_serviceContractsPerformanceServices") Integer addIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return addMultipleReference(espd.getServiceContractsPerformanceServices(), - addIndex, "#serviceContractsPerformanceServices", flow); - } - - private String addMultipleReference(UnboundedRequirementGroup espdCriterion, Integer referencePosition, - String referenceHash, String flow) { - espdCriterion.getUnboundedGroups().add(referencePosition, new DynamicRequirementGroup()); - return redirectToPage(flow + "/eo/selection" + referenceHash + referencePosition); - } - - @PostMapping(value = "/{flow:request|response}/eo/procedure", params = "remove") - public String removeRepresentative(@PathVariable String flow, @RequestParam Integer remove, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - if (CollectionUtils.isNotEmpty(espd.getEconomicOperator().getRepresentatives())) { - - espd.getEconomicOperator().getRepresentatives().remove(remove.intValue()); - } - if (CollectionUtils.isEmpty(espd.getEconomicOperator().getRepresentatives())) { - espd.getEconomicOperator().getRepresentatives().add(new EconomicOperatorRepresentative()); - } - remove = Math.min(espd.getEconomicOperator().getRepresentatives().size() - 1, remove); - return redirectToPage(flow + "/eo/procedure#representative" + remove); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_financialRatio") - public String removeFinancialRatio(@PathVariable String flow, - @RequestParam("remove_financialRatio") Integer removeIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return removeMultipleReference(espd.getFinancialRatio(), removeIndex, "#financialRatio", flow); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_workContractsPerformanceOfWorks") - public String removeWorkContractsPerformanceOfWorks(@PathVariable String flow, - @RequestParam("remove_workContractsPerformanceOfWorks") Integer removeIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return removeMultipleReference(espd.getWorkContractsPerformanceOfWorks(), - removeIndex, "#workContractsPerformanceOfWorks", flow); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_supplyContractsPerformanceDeliveries") - public String removeSupplyContractsPerformanceDeliveries(@PathVariable String flow, - @RequestParam("remove_supplyContractsPerformanceDeliveries") Integer removeIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return removeMultipleReference(espd.getSupplyContractsPerformanceDeliveries(), - removeIndex, "#supplyContractsPerformanceDeliveries", flow); - } - - @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_serviceContractsPerformanceServices") - public String removeServiceContractsPerformanceServices(@PathVariable String flow, - @RequestParam("remove_serviceContractsPerformanceServices") Integer removeIndex, - @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { - return removeMultipleReference(espd.getServiceContractsPerformanceServices(), - removeIndex, "#serviceContractsPerformanceServices", flow); - } - - private String removeMultipleReference(UnboundedRequirementGroup espdCriterion, Integer referencePosition, - String referenceHash, String flow) { - if (CollectionUtils.isNotEmpty(espdCriterion.getUnboundedGroups())) { - espdCriterion.getUnboundedGroups().remove(referencePosition.intValue()); - } - if (CollectionUtils.isEmpty(espdCriterion.getUnboundedGroups())) { - espdCriterion.getUnboundedGroups().add(new DynamicRequirementGroup()); - } - referencePosition = Math.min(espdCriterion.getUnboundedGroups().size() - 1, referencePosition); - return redirectToPage(flow + "/eo/selection" + referenceHash + referencePosition); - } - @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:procedure|exclusion|selection|finish}", params = "next") public String next( @@ -454,6 +309,17 @@ public String next( return redirectToPage(flow + "/" + agent + "/" + next); } + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:finish}", params = "overview") + public String overview( + @PathVariable String flow, + @PathVariable String agent, + @PathVariable String step, + @ModelAttribute("espd") EspdDocument espd, + BindingResult bindingResult) { + return bindingResult.hasErrors() ? + flow + "_" + agent + "_" + step : redirectToPage(flow + "/" + agent + "/overview"); + } + @PostMapping(value = "/{flow:request|response}/{agent:ca|eo}/{step:overview}", params = "download=xml") public String downloadXmlFile( @PathVariable String flow, @@ -516,7 +382,7 @@ public String downloadZip( private void serveFileForDownload(ByteArrayOutputStream fileStream, String agent, String fileType, HttpServletResponse response) throws IOException { - String fileName = "ca".equalsIgnoreCase(agent) ? "espd-request2." + fileType : "espd-response." + fileType; + String fileName = "ca".equalsIgnoreCase(agent) ? "espd-request." + fileType : "espd-response." + fileType; response.setContentType("application/" + fileType); response.setContentLength(fileStream.size()); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, format("attachment; filename=\"%s\"", fileName)); @@ -539,6 +405,30 @@ private String addHtmlHeader(String html) { return "" + newHtml + "
"; } + @RequestMapping("/initialization") + public String initializeEspd(@ModelAttribute("espdFilterParams") EspdInitializationParameters initParams, + Model model) { + EspdDocument espd = new EspdDocument(); + copyProcurementInformation(initParams, espd); + if (espd.getEconomicOperator() == null) { + espd.setEconomicOperator(new EconomicOperatorImpl()); + } + espd.getEconomicOperator().copyProperties(initParams); + model.addAttribute("espd", espd); + return "filter"; + } + + private void copyProcurementInformation(EspdInitializationParameters initParams, EspdDocument espd) { + espd.setProcedureTitle(initParams.getTitle()); + espd.setProcedureShortDesc(initParams.getDescription()); + espd.setFileRefByCA(initParams.getFileRefByCA()); + if (espd.getAuthority() == null) { + espd.setAuthority(new PartyImpl()); + } + espd.getAuthority().setName(initParams.getOfficialName()); + espd.getAuthority().setCountry(initParams.getProcurerCountry()); + } + private static String redirectToPage(String pageName) { return "redirect:/" + pageName; } @@ -562,4 +452,105 @@ private void dateBinder(WebDataBinder binder) { public String getPage() { return SESSION_EXPIRED_PAGE; } + + @PostMapping(value = "/{flow:request|response}/eo/procedure", params = "add") + public String addRepresentative(@PathVariable String flow, @RequestParam Integer add, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + espd.getEconomicOperator().getRepresentatives().add(add, new EconomicOperatorRepresentative()); + return redirectToPage(flow + "/eo/procedure#representative" + add); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_financialRatio") + public String addFinancialRatio(@PathVariable String flow, @RequestParam("add_financialRatio") Integer addIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return addMultipleReference(espd.getFinancialRatio(), + addIndex, "#financialRatio", flow); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_workContractsPerformanceOfWorks") + public String addWorkContractsPerformanceOfWorks(@PathVariable String flow, + @RequestParam("add_workContractsPerformanceOfWorks") Integer addIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return addMultipleReference(espd.getWorkContractsPerformanceOfWorks(), + addIndex, "#workContractsPerformanceOfWorks", flow); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_supplyContractsPerformanceDeliveries") + public String addSupplyContractsPerformanceDeliveries(@PathVariable String flow, + @RequestParam("add_supplyContractsPerformanceDeliveries") Integer addIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return addMultipleReference(espd.getSupplyContractsPerformanceDeliveries(), + addIndex, "#supplyContractsPerformanceDeliveries", flow); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "add_serviceContractsPerformanceServices") + public String addServiceContractsPerformanceServices(@PathVariable String flow, + @RequestParam("add_serviceContractsPerformanceServices") Integer addIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return addMultipleReference(espd.getServiceContractsPerformanceServices(), + addIndex, "#serviceContractsPerformanceServices", flow); + } + + private String addMultipleReference(UnboundedRequirementGroup espdCriterion, Integer referencePosition, + String referenceHash, String flow) { + espdCriterion.getUnboundedGroups().add(referencePosition, new DynamicRequirementGroup()); + return redirectToPage(flow + "/eo/selection" + referenceHash + referencePosition); + } + + @PostMapping(value = "/{flow:request|response}/eo/procedure", params = "remove") + public String removeRepresentative(@PathVariable String flow, @RequestParam Integer remove, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + if (CollectionUtils.isNotEmpty(espd.getEconomicOperator().getRepresentatives())) { + + espd.getEconomicOperator().getRepresentatives().remove(remove.intValue()); + } + if (CollectionUtils.isEmpty(espd.getEconomicOperator().getRepresentatives())) { + espd.getEconomicOperator().getRepresentatives().add(new EconomicOperatorRepresentative()); + } + remove = Math.min(espd.getEconomicOperator().getRepresentatives().size() - 1, remove); + return redirectToPage(flow + "/eo/procedure#representative" + remove); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_financialRatio") + public String removeFinancialRatio(@PathVariable String flow, + @RequestParam("remove_financialRatio") Integer removeIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return removeMultipleReference(espd.getFinancialRatio(), removeIndex, "#financialRatio", flow); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_workContractsPerformanceOfWorks") + public String removeWorkContractsPerformanceOfWorks(@PathVariable String flow, + @RequestParam("remove_workContractsPerformanceOfWorks") Integer removeIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return removeMultipleReference(espd.getWorkContractsPerformanceOfWorks(), + removeIndex, "#workContractsPerformanceOfWorks", flow); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_supplyContractsPerformanceDeliveries") + public String removeSupplyContractsPerformanceDeliveries(@PathVariable String flow, + @RequestParam("remove_supplyContractsPerformanceDeliveries") Integer removeIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return removeMultipleReference(espd.getSupplyContractsPerformanceDeliveries(), + removeIndex, "#supplyContractsPerformanceDeliveries", flow); + } + + @PostMapping(value = "/{flow:request|response}/eo/selection", params = "remove_serviceContractsPerformanceServices") + public String removeServiceContractsPerformanceServices(@PathVariable String flow, + @RequestParam("remove_serviceContractsPerformanceServices") Integer removeIndex, + @ModelAttribute("espd") EspdDocument espd, BindingResult bindingResult) { + return removeMultipleReference(espd.getServiceContractsPerformanceServices(), + removeIndex, "#serviceContractsPerformanceServices", flow); + } + + private String removeMultipleReference(UnboundedRequirementGroup espdCriterion, Integer referencePosition, + String referenceHash, String flow) { + if (CollectionUtils.isNotEmpty(espdCriterion.getUnboundedGroups())) { + espdCriterion.getUnboundedGroups().remove(referencePosition.intValue()); + } + if (CollectionUtils.isEmpty(espdCriterion.getUnboundedGroups())) { + espdCriterion.getUnboundedGroups().add(new DynamicRequirementGroup()); + } + referencePosition = Math.min(espdCriterion.getUnboundedGroups().size() - 1, referencePosition); + return redirectToPage(flow + "/eo/selection" + referenceHash + referencePosition); + } } diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdInitializationParameters.java similarity index 74% rename from espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java rename to espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdInitializationParameters.java index 2aaeb7e24..90a35269c 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdFilterParameters.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdInitializationParameters.java @@ -24,6 +24,7 @@ package eu.europa.ec.grow.espd.controller; +import eu.europa.ec.grow.espd.domain.PartyImpl; import eu.europa.ec.grow.espd.domain.enums.other.Country; import lombok.Data; import org.springframework.web.multipart.MultipartFile; @@ -32,21 +33,30 @@ import java.util.List; /** - * Form backing object for the Filter page. + * Class used to initialize an ESPD document with certain parameters. It also allows one to specify the selected + * values for the '/filter' page. * - * Created by ratoico on 1/19/17. + * Created by ratoico on 1/24/17. */ @Data -class EspdFilterParameters { +class EspdInitializationParameters extends PartyImpl { private String agent; private String action; - private Country country; - private String tedReceptionId; + private String officialName; + + private Country procurerCountry; + + private String title; + + private String description; + + private String fileRefByCA; + //trick to use List of MultipartFile as @RequestParam public void setAttachments(List attachments) throws IOException { } diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java deleted file mode 100644 index 10baf7a88..000000000 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdProcedureParameters.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * Copyright 2016 EUROPEAN COMMISSION - * - * Licensed under the EUPL, Version 1.1 or – as soon they - * will be approved by the European Commission - subsequent - * versions of the EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * - * You may obtain a copy of the Licence at: - * - * https://joinup.ec.europa.eu/community/eupl/og_page/eupl - * - * Unless required by applicable law or agreed to in - * writing, software distributed under the Licence is - * distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the Licence for the specific language governing - * permissions and limitations under the Licence. - * - */ - -package eu.europa.ec.grow.espd.controller; - -import eu.europa.ec.grow.espd.domain.PartyImpl; -import eu.europa.ec.grow.espd.domain.enums.other.Country; -import lombok.Data; - -/** - * Created by ratoico on 1/24/17. - */ -@Data -class EspdProcedureParameters extends PartyImpl { - - private String officialName; - - private Country procurerCountry; - - private String title; - - private String description; - - private String fileRefByCA; -} diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp index 47ab82b02..1b079e603 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp @@ -272,7 +272,7 @@
- Date: Wed, 25 Jan 2017 16:00:52 +0100 Subject: [PATCH 11/24] fix broken language names in English --- .../src/main/resources/i18n/messages_en.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/espd-web/src/main/resources/i18n/messages_en.properties b/espd-web/src/main/resources/i18n/messages_en.properties index b11f9ccf5..a264537b5 100644 --- a/espd-web/src/main/resources/i18n/messages_en.properties +++ b/espd-web/src/main/resources/i18n/messages_en.properties @@ -49,7 +49,7 @@ country_AS=American Samoa country_AT=Austria country_AU=Australia country_AW=Aruba -country_AX=Ã…land Islands +country_AX=Åland Islands country_AZ=Azerbaijan country_BA=Bosnia and Herzegovina country_BB=Barbados @@ -60,7 +60,7 @@ country_BG=Bulgaria country_BH=Bahrain country_BI=Burundi country_BJ=Benin -country_BL=Saint Barthélemy +country_BL=Saint Barthélemy country_BM=Bermuda country_BN=Brunei country_BO=Bolivia @@ -78,7 +78,7 @@ country_CD=Democratic Republic of the Congo country_CF=Central African Republic country_CG=Congo country_CH=Switzerland -country_CI=Côte d'Ivoire +country_CI=Côte d'Ivoire country_CK=Cook Islands country_CL=Chile country_CM=Cameroon @@ -87,7 +87,7 @@ country_CO=Colombia country_CR=Costa Rica country_CU=Cuba country_CV=Cape Verde -country_CW=Curaçao +country_CW=Curaçao country_CX=Christmas Island country_CY=Cyprus country_CZ=Czech Republic @@ -222,7 +222,7 @@ country_PT=Portugal country_PW=Palau country_PY=Paraguay country_QA=Qatar -country_RE=Réunion +country_RE=Réunion country_RO=Romania country_RS=Serbia country_RU=Russia @@ -243,7 +243,7 @@ country_SN=Senegal country_SO=Somalia country_SR=Suriname country_SS=Sudan -country_ST=São Tomé and Principe +country_ST=São Tomé and Principe country_SV=El Salvador country_SX=Sint Maarten country_SY=Syria From b9cde912caa1a0970d0cb8820fa020e39f07a68a Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Wed, 25 Jan 2017 17:17:13 +0100 Subject: [PATCH 12/24] #131 fixed URL for subcriteria legis. ref. --- .../src/main/resources/META-INF/resources/static/js/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espd-web/src/main/resources/META-INF/resources/static/js/init.js b/espd-web/src/main/resources/META-INF/resources/static/js/init.js index 6b32c56b5..9ebb27429 100644 --- a/espd-web/src/main/resources/META-INF/resources/static/js/init.js +++ b/espd-web/src/main/resources/META-INF/resources/static/js/init.js @@ -136,7 +136,7 @@ function EcertisHandler(url, country) { //Currently display only first LegislationReference from array, in future could be more item.find("#description").html(val.LegislationReference[0].Title.value); - item.find("#url").text(val.LegislationReference[0].Article.value).attr("href",data.LegislationReference[0].URI); + item.find("#url").text(val.LegislationReference[0].Article.value).attr("href", val.LegislationReference[0].URI); var hasEvidences = false; $.each( $(val.RequirementGroup), function( key, val ) { From ed4734c314bd2d1c466ce5ba941dd171109330e3 Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Thu, 26 Jan 2017 10:32:57 +0100 Subject: [PATCH 13/24] small memory improvement for enum values by using an unmodifiable and constant list --- .../europa/ec/grow/espd/domain/enums/other/Country.java | 9 +++++---- .../europa/ec/grow/espd/domain/enums/other/Currency.java | 6 ++++++ .../europa/ec/grow/espd/domain/enums/other/Language.java | 8 ++++++-- .../resources/META-INF/resources/WEB-INF/views/500.jsp | 8 ++++---- .../WEB-INF/views/criteriaTemplates/common/countries.jsp | 2 +- .../views/criteriaTemplates/common/currencies.jsp | 2 +- .../META-INF/resources/WEB-INF/views/header.jsp | 2 +- .../META-INF/resources/WEB-INF/views/welcome.jsp | 2 +- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java index 1b0fa2fd2..77da0cdb6 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java @@ -27,8 +27,7 @@ import eu.europa.ec.grow.espd.domain.ubl.CacCountry; import lombok.Getter; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import static org.apache.commons.lang3.StringUtils.trimToEmpty; @@ -297,10 +296,12 @@ public enum Country implements CacCountry { private final Currency currency; - private static final Map BY_ISO2_CODE = new HashMap<>(values().length); + public static final List VALUES = Collections.unmodifiableList(Arrays.asList(values())); + + private static final Map BY_ISO2_CODE = new HashMap<>(VALUES.size()); static { - for (Country c : values()) { + for (Country c : VALUES) { BY_ISO2_CODE.put(c.getIso2Code().toLowerCase(), c); } } diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Currency.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Currency.java index 92df8d80e..8c36150da 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Currency.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Currency.java @@ -25,6 +25,10 @@ import lombok.Getter; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + /** * Created by ratoico on 1/14/16 at 4:31 PM. */ @@ -213,6 +217,8 @@ public enum Currency { ZMK("Kwacha"), ZWD("Zimbabwe Dollar"); + public static final List VALUES = Collections.unmodifiableList(Arrays.asList(values())); + private final String description; Currency(String description) { diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Language.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Language.java index 682e5b434..9e88f46cf 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Language.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Language.java @@ -26,6 +26,10 @@ import lombok.Getter; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + /** * Created by vigi on 11/16/15:11:12 AM. */ @@ -129,7 +133,7 @@ public enum Language { */ NORWEGIAN( "Norsk", "Norwegian", "no"); - private int order; + public static final List VALUES = Collections.unmodifiableList(Arrays.asList(values())); private String sourceLanguage; @@ -153,7 +157,7 @@ public enum Language { * */ public static Language getByLanguageCode(final String code) { - for (Language lang : values()) { + for (Language lang : VALUES) { if (lang.getCode().equalsIgnoreCase(code)) { return lang; } diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/500.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/500.jsp index 1cd66ee83..063c13b6f 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/500.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/500.jsp @@ -69,9 +69,9 @@
-
-
    -
    • -
    • -
    • -
-
+
@@ -125,16 +98,6 @@ - <%-- old sync piwik load - - - --%> - - <%-- postponed piwik load --%> diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/breadcrumb.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/breadcrumb.jsp index be5ccdb97..aef60d399 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/breadcrumb.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/breadcrumb.jsp @@ -1,6 +1,6 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="s" uri="http://www.springframework.org/tags" %> <%-- ~ @@ -26,9 +26,24 @@ ~ --%>
- + + +
    + +
  • + + + + + + + + +
    • +     +
+
\ No newline at end of file diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp index 2c12c4dc5..be8565f8a 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/footerButtons.jsp @@ -35,10 +35,6 @@ -<%----%> -<%----%> -<%-- --%> -<%----%>
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp index 46b8f0247..9bb7662e9 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp @@ -75,9 +75,12 @@
- + + + + ">
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp index 1b079e603..0f2d6ae73 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp @@ -31,9 +31,6 @@ $(function () { var country = $("select[name='authority.country']"); -// $('input.radiotab').click(function () { -// $(this).tab('show'); -// }); $('#whoareyou_ca').click(function () { $('#tab_ca').show(); $('#tab_eo').hide(); diff --git a/espd-web/src/main/resources/META-INF/resources/static/css/espd.css b/espd-web/src/main/resources/META-INF/resources/static/css/espd.css index a35a5c44b..849903368 100644 --- a/espd-web/src/main/resources/META-INF/resources/static/css/espd.css +++ b/espd-web/src/main/resources/META-INF/resources/static/css/espd.css @@ -324,30 +324,30 @@ a.progress-link:hover { text-decoration: underline !important; } text-decoration: underline; } -/* breadcrum */ +/* breadcrumb */ -.breadcrumElement { +.breadcrumbElement { color: white !important; text-decoration: none !important; } -.breadcrumElement a:visited { +.breadcrumbElement a:visited { text-decoration: none !important; color: white !important; } -.breadcrumElement a:hover { +.breadcrumbElement a:hover { text-decoration: none !important; color: white !important; border-bottom: 1px solid #FFFFFF !important; } -.breadcrumElement a:focus { +.breadcrumbElement a:focus { text-decoration: none !important; color: white !important; } -.breadcrumElement a:hover, a:active { +.breadcrumbElement a:hover, a:active { text-decoration: none !important; color: white !important; } diff --git a/espd-web/src/main/resources/application-acc.properties b/espd-web/src/main/resources/application-acc.properties index 9edd82cce..1355dd0b1 100644 --- a/espd-web/src/main/resources/application-acc.properties +++ b/espd-web/src/main/resources/application-acc.properties @@ -25,6 +25,15 @@ #display message redirecting to prod environment espd.environment=true +# Property used to customize the breadcrumb values. The values are comma separated and they consist of key-value pairs. +# From each map entry we build a list item containing a link where the 'href' attribute is the key of the map entry +# and the text of the link is i18ned by using the value of the map entry as the i18n message code. +# If this property is empty or not defined, the breadcrumb is not shown at all. +espd.page.breadcrumb=http://ec.europa.eu/index_en.htm->ec,#1->tools,#->espd + +# Property used to display or hide the Footer on all pages +espd.page.showFooter=true + # Enable or disable the Piwik integration piwik.enabled=true diff --git a/espd-web/src/main/resources/application-dev.properties b/espd-web/src/main/resources/application-dev.properties index d2e5822ba..64874ac9a 100644 --- a/espd-web/src/main/resources/application-dev.properties +++ b/espd-web/src/main/resources/application-dev.properties @@ -25,6 +25,15 @@ #display message redirecting to prod environment espd.environment=true +# Property used to customize the breadcrumb values. The values are comma separated and they consist of key-value pairs. +# From each map entry we build a list item containing a link where the 'href' attribute is the key of the map entry +# and the text of the link is i18ned by using the value of the map entry as the i18n message code. +# If this property is empty or not defined, the breadcrumb is not shown at all. +espd.page.breadcrumb=http://ec.europa.eu/index_en.htm->ec,#1->tools,#->espd + +# Property used to display or hide the Footer on all pages +espd.page.showFooter=true + # Enable or disable the Piwik integration piwik.enabled=true diff --git a/espd-web/src/main/resources/application-prod.properties b/espd-web/src/main/resources/application-prod.properties index 3b64fc112..e8bbc79e9 100644 --- a/espd-web/src/main/resources/application-prod.properties +++ b/espd-web/src/main/resources/application-prod.properties @@ -25,6 +25,15 @@ #display message redirecting to prod environment espd.environment=false +# Property used to customize the breadcrumb values. The values are comma separated and they consist of key-value pairs. +# From each map entry we build a list item containing a link where the 'href' attribute is the key of the map entry +# and the text of the link is i18ned by using the value of the map entry as the i18n message code. +# If this property is empty or not defined, the breadcrumb is not shown at all. +espd.page.breadcrumb=http://ec.europa.eu/index_en.htm->ec,#1->tools,#->espd + +# Property used to display or hide the Footer on all pages +espd.page.showFooter=true + # Enable or disable the Piwik integration piwik.enabled=true diff --git a/espd-web/src/main/resources/application.properties b/espd-web/src/main/resources/application.properties index ce3ff26ef..439d3a7a4 100644 --- a/espd-web/src/main/resources/application.properties +++ b/espd-web/src/main/resources/application.properties @@ -25,6 +25,15 @@ #display message redirecting to prod environment espd.environment=false +# Property used to customize the breadcrumb values. The values are comma separated and they consist of key-value pairs. +# From each map entry we build a list item containing a link where the 'href' attribute is the key of the map entry +# and the text of the link is i18ned by using the value of the map entry as the i18n message code. +# If this property is empty or not defined, the breadcrumb is not shown at all. +espd.page.breadcrumb=http://ec.europa.eu/index_en.htm->ec,#1->tools,#->espd + +# Property used to display or hide the Footer on all pages +espd.page.showFooter=true + # Enable or disable the Piwik integration piwik.enabled=false diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index 071ba3d4a..6dc5f5952 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -222,3 +222,4 @@ filter_i_am_ce=I am contracting entity tooltip_ce_ref_buyer=The term contracting entity refers to the buyer. error_ted_notice_not_supported=The uploaded file is a notice and not an ESPD, therefore it cannot be used with this service expire_reminder_message=You have not done any action in the ESPD service for almost one hour.

Please save the eESPD to make sure that you do not loose data.

You can import (reuse) your eESPD at any time to continue working +tools=Tools \ No newline at end of file From 39a0804dc014f76e6e928cfe354cb670e414097c Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Fri, 27 Jan 2017 10:27:08 +0100 Subject: [PATCH 19/24] #122 update README.txt file and the file names inside the zip file --- .../eu/europa/ec/grow/espd/util/EspdExporter.java | 9 +++++---- espd-web/src/main/resources/i18n/messages.properties | 6 +++--- espd-web/src/main/resources/zipInstructions.txt | 12 +++++++++++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java index 0b5a6e41c..15cf9082c 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/util/EspdExporter.java @@ -77,16 +77,17 @@ public ByteArrayOutputStream exportAsZip(EspdDocument espdDocument, String agent ByteArrayOutputStream xmlOutput = exportAsXml(espdDocument, agent); InputStream readMeStream = resourceLoader.getResource("classpath:zipInstructions.txt") .getInputStream()) { - return zip(xmlOutput, pdfOutput, readMeStream); + return zip(xmlOutput, pdfOutput, readMeStream, agent); } } private ByteArrayOutputStream zip(ByteArrayOutputStream xmlOut, ByteArrayOutputStream pdfOut, - InputStream readmeStream) { + InputStream readmeStream, String agent) { + String fileName = "ca".equalsIgnoreCase(agent) ? "espd-request" : "espd-response"; try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); ZipOutputStream zipStream = new ZipOutputStream(baos)) { - addOutputStreamToZipFile(xmlOut, "espd.xml", zipStream); - addOutputStreamToZipFile(pdfOut, "espd.pdf", zipStream); + addOutputStreamToZipFile(xmlOut, fileName + ".xml", zipStream); + addOutputStreamToZipFile(pdfOut, fileName + ".pdf", zipStream); addInputStreamToZipFile(readmeStream, "README.txt", zipStream); return baos; } catch (IOException e) { diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index 6dc5f5952..d23c12bcc 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -212,9 +212,9 @@ crit_end_date=End date crit_number_of_years=Number of years crit_average_turnover=Average turnover crit_issuer=Issuer -download_pdf=Download PDF -download_xml=Download XML -download_zip=Download ZIP +download_pdf=PDF format +download_xml=XML format +download_zip=Both formats faq_text_more_info=For more information on ESPD, please report_security_incident=Report on an Information Security Incident diff --git a/espd-web/src/main/resources/zipInstructions.txt b/espd-web/src/main/resources/zipInstructions.txt index 2ccf978c0..0041e32c9 100644 --- a/espd-web/src/main/resources/zipInstructions.txt +++ b/espd-web/src/main/resources/zipInstructions.txt @@ -1 +1,11 @@ -Instructions on how to use the ESPD \ No newline at end of file +This is a short documentation of the ESPD files that you find in this ZIP folder. + +espd.XML: The XML file is a file that our ESPD service or other compatible ESPD services can understand. +The advantage of using the eESPD as a XML file is that buyers and companies can reuse it for other procedures in the future. +It should be sent together with the procurement documents (from authority to companies) or as part of the bid (company to authority). + +espd.PDF: The PDF file is a human readable file of the eESPD. We suggest here as well that it is used alongside the XML +format with the procurement documents (from authority to companies) or as part of the bid (company to authority) as a reference document. + +If you have questions about the files please do not hesitate to get in contact with us through +the following email address: grow-espd@ec.europa.eu. From 26441da74ebb06d1f612983e08e85671714051d6 Mon Sep 17 00:00:00 2001 From: Virgiliu RATOI Date: Fri, 27 Jan 2017 11:06:53 +0100 Subject: [PATCH 20/24] prepare release 2017.01 --- espd-docs/pom.xml | 2 +- espd-docs/src/main/asciidoc/espd.adoc | 2 +- espd-docs/src/main/asciidoc/releaseNotes.adoc | 25 +++++++++++++++++++ espd-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/espd-docs/pom.xml b/espd-docs/pom.xml index e10490871..e62532aa0 100644 --- a/espd-docs/pom.xml +++ b/espd-docs/pom.xml @@ -29,7 +29,7 @@ espd eu.europa.ec.grow.espd - 2016.12.01 + 2017.01 4.0.0 diff --git a/espd-docs/src/main/asciidoc/espd.adoc b/espd-docs/src/main/asciidoc/espd.adoc index aef683d6d..d655d856e 100644 --- a/espd-docs/src/main/asciidoc/espd.adoc +++ b/espd-docs/src/main/asciidoc/espd.adoc @@ -3,7 +3,7 @@ Alexey Lukashov + Virgiliu Ratoi -v2016.12.01, 18-01-2017 +v2017.01, 31-01-2017 :sourcedir: ../java/eu/europa/ec/grow/espd :homepage: https://ec.europa.eu/espd[ESPD] diff --git a/espd-docs/src/main/asciidoc/releaseNotes.adoc b/espd-docs/src/main/asciidoc/releaseNotes.adoc index 689a4ec80..34eb3440b 100644 --- a/espd-docs/src/main/asciidoc/releaseNotes.adoc +++ b/espd-docs/src/main/asciidoc/releaseNotes.adoc @@ -1,5 +1,30 @@ == Release notes +=== 2017.01 (31st of January 2017) + +==== Bug + +* https://github.com/ESPD/ESPD-Service/issues/143[Remove the field 'Consortium name' from the user interface] +* https://github.com/ESPD/ESPD-Service/issues/132[Incorrect URL in D: Purely national exclusion grounds] +* https://github.com/ESPD/ESPD-Service/issues/131[Incorrect URL in eCertis integration for criteria] +* https://github.com/ESPD/ESPD-Service/issues/126[Evidence country] + +==== Enhancement + +* https://github.com/ESPD/ESPD-Service/issues/140[Pop-up window for session expiration] +* https://github.com/ESPD/ESPD-Service/issues/141[The extension of the session duration to 4 hours] +* https://github.com/ESPD/ESPD-Service/issues/122[Review the generation of XML files and print workflow] +* https://github.com/ESPD/ESPD-Service/issues/121[Prefill certain parameters for ESPD pages] +* https://github.com/ESPD/ESPD-Service/issues/120[Configuration parameters for breadcrumb and footer] +* https://github.com/ESPD/ESPD-Service/issues/119[Configuration parameter for skipping the language page] + +==== Translation + +* https://github.com/ESPD/ESPD-Service/issues/51[Part III: Section B: "Payment of taxes" and “Payment of social security”] +* https://github.com/ESPD/ESPD-Service/issues/87[Part III D: Purely national exclusion grounds wording should be changed] + +The full list of issues can be seen at https://github.com/ESPD/ESPD-Service/milestone/12?closed=1[ESPD Milestone 2017.01]. + === 2016.12.01 (18th of January 2017) ==== Bug diff --git a/espd-web/pom.xml b/espd-web/pom.xml index 1e6da6bf6..ac5fd77be 100644 --- a/espd-web/pom.xml +++ b/espd-web/pom.xml @@ -27,7 +27,7 @@ espd eu.europa.ec.grow.espd - 2016.12.01 + 2017.01 4.0.0 espd-web diff --git a/pom.xml b/pom.xml index f5a4d9f42..6870b3caa 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ eu.europa.ec.grow.espd espd pom - 2016.12.01 + 2017.01 espd-web espd-docs From b3030886970a5d0dba63fc2cc73f44e4988e1dd3 Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Fri, 27 Jan 2017 11:31:02 +0100 Subject: [PATCH 21/24] #140 translation for popup message --- espd-web/src/main/resources/i18n/messages.properties | 1 - espd-web/src/main/resources/i18n/messages_bg.properties | 1 + espd-web/src/main/resources/i18n/messages_cs.properties | 1 + espd-web/src/main/resources/i18n/messages_da.properties | 1 + espd-web/src/main/resources/i18n/messages_de.properties | 1 + espd-web/src/main/resources/i18n/messages_el.properties | 1 + espd-web/src/main/resources/i18n/messages_en.properties | 1 + espd-web/src/main/resources/i18n/messages_es.properties | 1 + espd-web/src/main/resources/i18n/messages_et.properties | 1 + espd-web/src/main/resources/i18n/messages_fi.properties | 1 + espd-web/src/main/resources/i18n/messages_fr.properties | 1 + espd-web/src/main/resources/i18n/messages_hr.properties | 1 + espd-web/src/main/resources/i18n/messages_hu.properties | 1 + espd-web/src/main/resources/i18n/messages_it.properties | 1 + espd-web/src/main/resources/i18n/messages_lt.properties | 1 + espd-web/src/main/resources/i18n/messages_lv.properties | 1 + espd-web/src/main/resources/i18n/messages_mt.properties | 1 + espd-web/src/main/resources/i18n/messages_nl.properties | 1 + espd-web/src/main/resources/i18n/messages_no.properties | 1 + espd-web/src/main/resources/i18n/messages_pl.properties | 1 + espd-web/src/main/resources/i18n/messages_pt.properties | 1 + espd-web/src/main/resources/i18n/messages_ro.properties | 1 + espd-web/src/main/resources/i18n/messages_sk.properties | 1 + espd-web/src/main/resources/i18n/messages_sl.properties | 1 + espd-web/src/main/resources/i18n/messages_sv.properties | 1 + 25 files changed, 24 insertions(+), 1 deletion(-) diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index 071ba3d4a..a09fd7f9d 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -221,4 +221,3 @@ report_security_incident=Report on an Information Security Incident filter_i_am_ce=I am contracting entity tooltip_ce_ref_buyer=The term contracting entity refers to the buyer. error_ted_notice_not_supported=The uploaded file is a notice and not an ESPD, therefore it cannot be used with this service -expire_reminder_message=You have not done any action in the ESPD service for almost one hour.

Please save the eESPD to make sure that you do not loose data.

You can import (reuse) your eESPD at any time to continue working diff --git a/espd-web/src/main/resources/i18n/messages_bg.properties b/espd-web/src/main/resources/i18n/messages_bg.properties index ee993abdf..8789c2997 100644 --- a/espd-web/src/main/resources/i18n/messages_bg.properties +++ b/espd-web/src/main/resources/i18n/messages_bg.properties @@ -649,3 +649,4 @@ validator_url=Въведете валиден URL адрес. view_ca=Преглед: (ВО) view_eo=Преглед: (ИО) yes=Да +expire_reminder_message=Не сте предприели никакво действие в системата за ЕЕДОП почти един час.

Моля, запазете еЕЕДОП, за да е сигурно, че няма да загубите данни.

По всяко време можете да заредите (да използвате повторно) вашият еЕЕДОП, за да продължите своята работа. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_cs.properties b/espd-web/src/main/resources/i18n/messages_cs.properties index aecbd37ac..ac8df325d 100644 --- a/espd-web/src/main/resources/i18n/messages_cs.properties +++ b/espd-web/src/main/resources/i18n/messages_cs.properties @@ -649,3 +649,4 @@ validator_url=Uveďte platnou adresu URL. view_ca=Zobrazit: (VZ) view_eo=Zobrazit: (HS) yes=Ano +expire_reminder_message=Ve službě jednotného evropského osvědčení pro zakázky nebyla již téměř hodinu zaznamenána žádná činnost.

Uložte si eESPD, abyste nepřišli o žádné údaje.

Chcete-li pokračovat v práci, můžete eESPD kdykoli naimportovat (znovu použít). \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_da.properties b/espd-web/src/main/resources/i18n/messages_da.properties index 11226135b..12a6d7e69 100644 --- a/espd-web/src/main/resources/i18n/messages_da.properties +++ b/espd-web/src/main/resources/i18n/messages_da.properties @@ -649,3 +649,4 @@ validator_url=Indtast en gyldig URL. view_ca=Vis: (OM) view_eo=Vis: (ØA) yes=Ja +expire_reminder_message=De har ikke været aktiv i ESPD-tjenesten i næsten en time.

Gem Deres eESPD, så De ikke mister data.

De kan importere (genanvende) Deres eESPD når som helst. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_de.properties b/espd-web/src/main/resources/i18n/messages_de.properties index 656f6ebb1..ca3de0c0e 100644 --- a/espd-web/src/main/resources/i18n/messages_de.properties +++ b/espd-web/src/main/resources/i18n/messages_de.properties @@ -649,3 +649,4 @@ validator_url=Geben Sie bitte eine gültige URL ein. view_ca=Ansicht: (CA) view_eo=Ansicht: (EO) yes=Ja +expire_reminder_message=Sie waren fast eine Stunde nicht im EEE-Dienst aktiv.

Bitte speichern Sie die eEEE, damit keine Daten verloren gehen.

Sie können Ihre eEEE jederzeit wieder importieren und weiterbearbeiten. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_el.properties b/espd-web/src/main/resources/i18n/messages_el.properties index 0ce76a0bf..7422f9e3f 100644 --- a/espd-web/src/main/resources/i18n/messages_el.properties +++ b/espd-web/src/main/resources/i18n/messages_el.properties @@ -649,3 +649,4 @@ validator_url=Εισάγετε έγκυρο URL. view_ca=Προβολή: (ΑΑ) view_eo=Προβολή: (ΟΦ) yes=Ναι +expire_reminder_message=Την τελευταία ώρα δεν έχετε κάνει καμία ενέργεια στην υπηρεσία ΕΕΕΣ.

Αποθηκεύστε το eΕΕΕΣ για να μη χάσετε δεδομένα.

Μπορείτε ανά πάσα στιγμή να εισάγετε (επαναχρησιμοποιήσετε) το eΕΕΕΣ για να συνεχίσετε την εργασία σας. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_en.properties b/espd-web/src/main/resources/i18n/messages_en.properties index a264537b5..757eb4840 100644 --- a/espd-web/src/main/resources/i18n/messages_en.properties +++ b/espd-web/src/main/resources/i18n/messages_en.properties @@ -654,3 +654,4 @@ validator_url=Please enter a valid URL. view_ca=View: (CA) view_eo=View: (EO) yes=Yes +expire_reminder_message=You have not done any action in the ESPD service for almost one hour.

Please save the eESPD to make sure that you do not loose data.

You can import (reuse) your eESPD at any time to continue working \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_es.properties b/espd-web/src/main/resources/i18n/messages_es.properties index db8e9ae41..e54b76be1 100644 --- a/espd-web/src/main/resources/i18n/messages_es.properties +++ b/espd-web/src/main/resources/i18n/messages_es.properties @@ -649,3 +649,4 @@ validator_url=Introduzca un URL válido. view_ca=Visualizar: (CA) view_eo=Visualizar: (EO) yes=Sí +expire_reminder_message=Hace casi una hora que no ha realizado ninguna acción en el servicio DEUC.

Guarde el DEUC electrónico para no perder datos.

Puede importar (volver a utilizar) el DEUC electrónico en cualquier momento y seguir trabajando. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_et.properties b/espd-web/src/main/resources/i18n/messages_et.properties index 4cfa9da1f..d4255ff64 100644 --- a/espd-web/src/main/resources/i18n/messages_et.properties +++ b/espd-web/src/main/resources/i18n/messages_et.properties @@ -649,3 +649,4 @@ validator_url=Sisestage korrektne URL. view_ca=Vaade: (CA) view_eo=Vaade: (EO) yes=Jah +expire_reminder_message=Te ei ole Euroopa ühtse hankedokumendi teenuse keskkonnas peaaegu tund aega midagi teinud.

Salvestage eESPD, et andmed kaotsi ei läheks.

Te saate töö jätkamiseks oma eESPD igal ajal (taaskasutamiseks) importida. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_fi.properties b/espd-web/src/main/resources/i18n/messages_fi.properties index 742b1cd37..9dc775a44 100644 --- a/espd-web/src/main/resources/i18n/messages_fi.properties +++ b/espd-web/src/main/resources/i18n/messages_fi.properties @@ -649,3 +649,4 @@ validator_url=Syötä URL-osoite view_ca=Näkymä: Hankintaviranomainen view_eo=Näkymä: Talouden toimija yes=Kyllä +expire_reminder_message=Et ole tehnyt yhteisen eurooppalaisen hankinta-asiakirjan palvelusivulla mitään lähes tuntiin.

Tallenna sähköinen asiakirja, ettet menetä tietoja.

Voit tuoda asiakirjan ja ottaa sen uudelleen työn alle koska tahansa. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_fr.properties b/espd-web/src/main/resources/i18n/messages_fr.properties index 381a7b1ff..43e29384f 100644 --- a/espd-web/src/main/resources/i18n/messages_fr.properties +++ b/espd-web/src/main/resources/i18n/messages_fr.properties @@ -649,3 +649,4 @@ validator_url=Veuillez indiquer une adresse URL valide. view_ca=Voir: (PA) view_eo=Voir: (OE) yes=Oui +expire_reminder_message=Si vous n’êtes plus intervenu dans le service DUME depuis presque une heure, veuillez sauvegarder l’eDUME afin d’être sûr de ne pas perdre de données.

Vous pouvez importer (réutiliser) votre eDUME à tout moment pour continuer à y travailler. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_hr.properties b/espd-web/src/main/resources/i18n/messages_hr.properties index a89b95448..d72641218 100644 --- a/espd-web/src/main/resources/i18n/messages_hr.properties +++ b/espd-web/src/main/resources/i18n/messages_hr.properties @@ -649,3 +649,4 @@ validator_url=Unesite valjanu URL adresu. view_ca=Prikaz: (JN) view_eo=Prikaz: (GS) yes=Da +expire_reminder_message=Gotovo sat vremena niste bili aktivni u servisu europske jedinstvene dokumentacije o nabavi.

Spremite elektroničku europsku jedinstvenu dokumentaciju o nabavi jer biste u protivnom mogli izgubiti podatke.

Možete bilo kada uvesti (ponovno upotrijebiti) elektroničku europsku jedinstvenu dokumentaciju o nabavi i nastaviti je uređivati. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_hu.properties b/espd-web/src/main/resources/i18n/messages_hu.properties index 2b0dc0d0a..58c6f5236 100644 --- a/espd-web/src/main/resources/i18n/messages_hu.properties +++ b/espd-web/src/main/resources/i18n/messages_hu.properties @@ -649,3 +649,4 @@ validator_url=Kérjük, érvényes URL-címet adjon meg. view_ca=Nézet: (ASZ) view_eo=Nézet: (GSZ) yes=Igen +expire_reminder_message=A rendszer úgy érzékeli, hogy Ön az elmúlt órában nem végzett semmilyen tevékenységet az ESPD-szolgáltatás felületén.

Az adatvesztés elkerülése érdekében kérjük, mentse el az e-ESPD-t.

A munka későbbi folytatásához bármikor importálhatja az elmentett e-ESPD-t. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_it.properties b/espd-web/src/main/resources/i18n/messages_it.properties index 81e6ae8ca..d1ee26369 100644 --- a/espd-web/src/main/resources/i18n/messages_it.properties +++ b/espd-web/src/main/resources/i18n/messages_it.properties @@ -649,3 +649,4 @@ validator_url=Indicare un URL valido. view_ca=Visualizzazione: (AG) view_eo=Visualizzazione: (OE) yes=Sì +expire_reminder_message=È trascorsa quasi un'ora senza attività nel servizio DGUE.

Salvare il DGUEe per non perdere dati.

È possibile importare (riutilizzare) il DGUEe in qualsiasi momento per continuare a lavorare. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_lt.properties b/espd-web/src/main/resources/i18n/messages_lt.properties index 96192899e..16c741131 100644 --- a/espd-web/src/main/resources/i18n/messages_lt.properties +++ b/espd-web/src/main/resources/i18n/messages_lt.properties @@ -649,3 +649,4 @@ validator_url=Įrašykite galiojantį interneto adresą (URL). view_ca=Rodyti: (PO) view_eo=Rodyti: (EVV) yes=Taip +expire_reminder_message=EBVPD paslaugos puslapyje beveik vieną valandą neatlikote jokių veiksmų.

Išsaugokite e. EBVPD tam, kad neprarastumėte duomenų.

Bet kuriuo metu galite importuoti (iš naujo naudoti) e. EBVPD ir tęsti darbą. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_lv.properties b/espd-web/src/main/resources/i18n/messages_lv.properties index c9826f0f9..39c4b2f22 100644 --- a/espd-web/src/main/resources/i18n/messages_lv.properties +++ b/espd-web/src/main/resources/i18n/messages_lv.properties @@ -649,3 +649,4 @@ validator_url=Lūdzu, ievadiet derīgu URL. view_ca=Skatīt: (CA) view_eo=Skatīt: (EO) yes=Jā +expire_reminder_message=Gandrīz stundu neesat veicis nevienu darbību ESPD pakalpojumā.

Saglabājiet e-ESPD veiktās izmaiņas, lai nodrošinātu, ka dati netiek zaudēti.

Jūs jebkurā laikā varat importēt (atkārtoti izmantot) savu e-ESPD, lai turpinātu darbu. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_mt.properties b/espd-web/src/main/resources/i18n/messages_mt.properties index 3c0db6e9e..e694a17d3 100644 --- a/espd-web/src/main/resources/i18n/messages_mt.properties +++ b/espd-web/src/main/resources/i18n/messages_mt.properties @@ -649,3 +649,4 @@ validator_url=Jekk jogħġbok daħħal URL validu. view_ca=Ivviżwalizza: (AK) view_eo=Ivviżwalizza: (OE) yes=Iva +expire_reminder_message=Ma għamilt l-ebda azzjoni fis-servizz tal-ESPD għal kważi siegħa.

Jekk jogħġbok issejvja l-eESPD biex tagħmel żgur li ma titlifx dejta.

Tista’ timporta (tuża mill-ġdid) l-eESPD tiegħek fi kwalunkwe ħin biex tkompli taħdem. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_nl.properties b/espd-web/src/main/resources/i18n/messages_nl.properties index 18bc83d03..4e6f72460 100644 --- a/espd-web/src/main/resources/i18n/messages_nl.properties +++ b/espd-web/src/main/resources/i18n/messages_nl.properties @@ -649,3 +649,4 @@ validator_url=Voer een URL (internetadres) in. view_ca=Bekijken: (als aanbestedende dienst) view_eo=Bekijken: (als ondernemer) yes=Ja +expire_reminder_message=U heeft bijna een uur lang geen handelingen in de UEA-webdienst verricht.

Bewaar het e-UEA om geen gegevens te verliezen.

U kunt uw e-UEA op elk moment importeren (hergebruiken) om verder te werken. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_no.properties b/espd-web/src/main/resources/i18n/messages_no.properties index d94d37ea1..7ed751a1d 100644 --- a/espd-web/src/main/resources/i18n/messages_no.properties +++ b/espd-web/src/main/resources/i18n/messages_no.properties @@ -649,3 +649,4 @@ validator_url=Vennligst skriv inn en gyldig URL (nettadresse) view_ca=Vis: (O) view_eo=Vis: (L) yes=Ja +expire_reminder_message=You have not done any action in the ESPD service for almost one hour.

Please save the eESPD to make sure that you do not loose data.

You can import (reuse) your eESPD at any time to continue working \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_pl.properties b/espd-web/src/main/resources/i18n/messages_pl.properties index 5e60376ad..d48ee4e71 100644 --- a/espd-web/src/main/resources/i18n/messages_pl.properties +++ b/espd-web/src/main/resources/i18n/messages_pl.properties @@ -649,3 +649,4 @@ validator_url=Proszę podać prawidłowy adres URL. view_ca=Widok: (IZ) view_eo=Widok: (WY) yes=Tak +expire_reminder_message=Od prawie godziny nie wykonali Państwo żadnej czynności w serwisie ESPD.

Proszę zapisać eESPD w celu zabezpieczenia się przed utratą danych.

W dowolnym momencie można zaimportować (ponowne użyć) eESPD, aby kontynuować pracę. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_pt.properties b/espd-web/src/main/resources/i18n/messages_pt.properties index 62b3b59cf..6f16f0ca8 100644 --- a/espd-web/src/main/resources/i18n/messages_pt.properties +++ b/espd-web/src/main/resources/i18n/messages_pt.properties @@ -649,3 +649,4 @@ validator_url=Queira inserir um endereço URL válido. view_ca=Ver: (AC) view_eo=Ver: (OE) yes=Sim +expire_reminder_message=You have not done any action in the ESPD service for almost one hour.

Please save the eESPD to make sure that you do not loose data.

You can import (reuse) your eESPD at any time to continue working \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_ro.properties b/espd-web/src/main/resources/i18n/messages_ro.properties index 4f273e8a8..2d60a1330 100644 --- a/espd-web/src/main/resources/i18n/messages_ro.properties +++ b/espd-web/src/main/resources/i18n/messages_ro.properties @@ -649,3 +649,4 @@ validator_url=Vă rugăm să introduceți un URL valid. view_ca=Ecran: (AC) view_eo=Ecran: (OE) yes=Da +expire_reminder_message=Nu ați efectuat nicio acțiune în serviciul DEAU timp de aproape o oră.

Vă rugăm să salvați documentul eDEAU pentru a vă asigura că nu pierdeți date.

Puteți importa (reutiliza) documentul dumneavoastră eDEAU în orice moment pentru a vă continua activitatea. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_sk.properties b/espd-web/src/main/resources/i18n/messages_sk.properties index 60b81ff1c..d97df5a8e 100644 --- a/espd-web/src/main/resources/i18n/messages_sk.properties +++ b/espd-web/src/main/resources/i18n/messages_sk.properties @@ -649,3 +649,4 @@ validator_url=Zadajte platnú adresu URL. view_ca=Zobraziť: (VO) view_eo=Zobraziť: (HS) yes=Áno +expire_reminder_message=Už takmer hodinu ste v službe jednotného európskeho dokumentu pre obstarávanie (ESPD) nevykonali žiadnu zmenu.

Uložte si eESPD, aby ste nestratili žiadne údaje.

Svoje eESPD môžete kedykoľvek importovať (znova použiť) a pokračovať v práci. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_sl.properties b/espd-web/src/main/resources/i18n/messages_sl.properties index 76b94c4c5..fbb0b412d 100644 --- a/espd-web/src/main/resources/i18n/messages_sl.properties +++ b/espd-web/src/main/resources/i18n/messages_sl.properties @@ -649,3 +649,4 @@ validator_url=Vnesite veljaven URL. view_ca=Pogled: Javni naročnik view_eo=Pogled: Gospodarski subjekt yes=Da +expire_reminder_message=Že skoraj eno uro niste uporabljali storitve ESPD.

Da ne boste izgubili podatkov iz elektronskega dokumenta eESPD, ga shranite.

Vaše podatke iz dokumenta eESPD lahko uvozite (ponovno uporabite) kadar koli in tako nadaljujete z delom. \ No newline at end of file diff --git a/espd-web/src/main/resources/i18n/messages_sv.properties b/espd-web/src/main/resources/i18n/messages_sv.properties index b7d950cf9..5d2be24d2 100644 --- a/espd-web/src/main/resources/i18n/messages_sv.properties +++ b/espd-web/src/main/resources/i18n/messages_sv.properties @@ -649,3 +649,4 @@ validator_url=Ange en giltig webbadress. view_ca=Visa: (Upphandlande myndighet) view_eo=Visa: (Ekonomisk aktör) yes=Ja +expire_reminder_message=Du har inte genomfört några åtgärder i tjänsten för det enhetliga upphandlingsdokumentet (ESPD) på nästan en timme.

Spara ditt eESPD-dokument så att du inte förlorar några uppgifter.

Du kan sedan importera (återanvända) det igen när du vill fortsätta arbeta. expire_reminder_message=expire_reminder_message= \ No newline at end of file From b0f4c35cdca208bd3dd01f075986a087bc1c174e Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Fri, 27 Jan 2017 11:38:02 +0100 Subject: [PATCH 22/24] #140 fix translation encoding --- espd-web/src/main/resources/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index 381b1bed0..3f6009950 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -1,4 +1,4 @@ -# +# # # Copyright 2016 EUROPEAN COMMISSION # From 43c7b938c3dd4b8575e876a341e3094cf87575ea Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Fri, 27 Jan 2017 11:39:31 +0100 Subject: [PATCH 23/24] #140 remove generic translation for popup message --- espd-web/src/main/resources/i18n/messages.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index 3f6009950..bd44ecc5d 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -221,5 +221,4 @@ report_security_incident=Report on an Information Security Incident filter_i_am_ce=I am contracting entity tooltip_ce_ref_buyer=The term contracting entity refers to the buyer. error_ted_notice_not_supported=The uploaded file is a notice and not an ESPD, therefore it cannot be used with this service -expire_reminder_message=You have not done any action in the ESPD service for almost one hour.

Please save the eESPD to make sure that you do not loose data.

You can import (reuse) your eESPD at any time to continue working tools=Tools From 1752d70b535c1c9349e267fd824938a08c75e4c7 Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Fri, 27 Jan 2017 15:32:39 +0100 Subject: [PATCH 24/24] #132 fix null pointer error for WebLogic --- .../META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp | 5 ++--- .../META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp index 2eb6a8954..41cbd2c2f 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp @@ -1,5 +1,3 @@ -<%@page import="eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion"%> - <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> @@ -37,6 +35,7 @@ <%request.setAttribute("exclusionCA", eu.europa.ec.grow.espd.xml.CriteriaTemplates.exclusionCE);%> +<%request.setAttribute("nationalExclusionGrounds", eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS);%> @@ -80,7 +79,7 @@ - +

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp index 43777c7ba..1ea5a1a41 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp @@ -1,5 +1,3 @@ -<%@page import="eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion"%> - <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> @@ -32,6 +30,7 @@ --%> <%request.setAttribute("exclusionEO", eu.europa.ec.grow.espd.xml.CriteriaTemplates.exclusionEO);%> +<%request.setAttribute("nationalExclusionGrounds", eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS);%> @@ -98,7 +97,7 @@ - +