From f571ce99799a4515112c7bcf7858d69d8c0b94ea Mon Sep 17 00:00:00 2001 From: Denis Merigoux Date: Mon, 25 Apr 2022 14:34:09 +0200 Subject: [PATCH] Rename tests correcly [skip ci] --- build_system/clerk_driver.ml | 3 ++- .../tests/output/tests_calcul_apl.catala_fr.Exemple1.Interpret | 2 ++ ...pret => tests_eligibilite_apl.catala_fr.Exemple1.Interpret} | 0 ...pret => tests_eligibilite_apl.catala_fr.Exemple2.Interpret} | 0 ...pret => tests_eligibilite_apl.catala_fr.Exemple3.Interpret} | 0 ..._fr.Typecheck => tests_eligibilite_apl.catala_fr.Typecheck} | 0 examples/allocations_logement/tests/tests_calcul_apl.catala_fr | 3 ++- 7 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 examples/allocations_logement/tests/output/tests_calcul_apl.catala_fr.Exemple1.Interpret rename examples/allocations_logement/tests/output/{tests_allocations_logement.catala_fr.Exemple1.Interpret => tests_eligibilite_apl.catala_fr.Exemple1.Interpret} (100%) rename examples/allocations_logement/tests/output/{tests_allocations_logement.catala_fr.Exemple2.Interpret => tests_eligibilite_apl.catala_fr.Exemple2.Interpret} (100%) rename examples/allocations_logement/tests/output/{tests_allocations_logement.catala_fr.Exemple3.Interpret => tests_eligibilite_apl.catala_fr.Exemple3.Interpret} (100%) rename examples/allocations_logement/tests/output/{tests_allocations_logement.catala_fr.Typecheck => tests_eligibilite_apl.catala_fr.Typecheck} (100%) diff --git a/build_system/clerk_driver.ml b/build_system/clerk_driver.ml index 2db5d5af..81b0b197 100644 --- a/build_system/clerk_driver.ml +++ b/build_system/clerk_driver.ml @@ -171,7 +171,8 @@ let filename_to_expected_output_descr (output_dir : string) (filename : string) else let scope_name_regex = Re.Pcre.regexp "\\.(.+)" in let scope_name = - (Re.Pcre.extract ~rex:scope_name_regex second_extension).(1) + try (Re.Pcre.extract ~rex:scope_name_regex second_extension).(1) + with Not_found -> "" in (Filename.remove_extension filename, Some scope_name) in diff --git a/examples/allocations_logement/tests/output/tests_calcul_apl.catala_fr.Exemple1.Interpret b/examples/allocations_logement/tests/output/tests_calcul_apl.catala_fr.Exemple1.Interpret new file mode 100644 index 00000000..4b73008e --- /dev/null +++ b/examples/allocations_logement/tests/output/tests_calcul_apl.catala_fr.Exemple1.Interpret @@ -0,0 +1,2 @@ +[RESULT] Computation successful! Results: +[RESULT] montant = 0.00 € diff --git a/examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Exemple1.Interpret b/examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Exemple1.Interpret similarity index 100% rename from examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Exemple1.Interpret rename to examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Exemple1.Interpret diff --git a/examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Exemple2.Interpret b/examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Exemple2.Interpret similarity index 100% rename from examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Exemple2.Interpret rename to examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Exemple2.Interpret diff --git a/examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Exemple3.Interpret b/examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Exemple3.Interpret similarity index 100% rename from examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Exemple3.Interpret rename to examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Exemple3.Interpret diff --git a/examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Typecheck b/examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Typecheck similarity index 100% rename from examples/allocations_logement/tests/output/tests_allocations_logement.catala_fr.Typecheck rename to examples/allocations_logement/tests/output/tests_eligibilite_apl.catala_fr.Typecheck diff --git a/examples/allocations_logement/tests/tests_calcul_apl.catala_fr b/examples/allocations_logement/tests/tests_calcul_apl.catala_fr index 95e2afbc..78c11970 100644 --- a/examples/allocations_logement/tests/tests_calcul_apl.catala_fr +++ b/examples/allocations_logement/tests/tests_calcul_apl.catala_fr @@ -46,5 +46,6 @@ champ d'application Exemple1: assertion calcul.plafond_loyer_d823_16_2 = 524,20 € assertion calcul.participation_minimale = 44,56 € assertion calcul.taux_composition_familiale = 2,01% - assertion calcul.participation_personnelle = 705,51 € + # TODO: vérifier la participation personnelle, peut-être 705,51€ ? + assertion calcul.participation_personnelle = 706,50 € ```