From 731148917e51ea514147399eb92d0df25e3b704a Mon Sep 17 00:00:00 2001 From: Nicolas ROCHE Date: Fri, 12 May 2023 16:36:18 +0200 Subject: [PATCH] toulouse-maelis: [tests] get more data from town referential (#77547) --- tests/data/toulouse_maelis/R_read_family.xml | 4 +- .../toulouse_maelis/R_read_family_relax.xml | 4 +- .../R_read_family_reordered.xml | 4 +- .../toulouse_maelis/R_read_street_list.xml | 21 +++++++--- tests/test_toulouse_maelis.py | 42 ++++++++++++------- 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/tests/data/toulouse_maelis/R_read_family.xml b/tests/data/toulouse_maelis/R_read_family.xml index aca38831..fef787c5 100644 --- a/tests/data/toulouse_maelis/R_read_family.xml +++ b/tests/data/toulouse_maelis/R_read_family.xml @@ -21,9 +21,9 @@ 99350 - AM0330 + 2317 170 - TRAVERSE DES MARAICHERS + RUE ACHILLE VIADIEU Paris 75014 diff --git a/tests/data/toulouse_maelis/R_read_family_relax.xml b/tests/data/toulouse_maelis/R_read_family_relax.xml index 16605ac2..279e5bd4 100644 --- a/tests/data/toulouse_maelis/R_read_family_relax.xml +++ b/tests/data/toulouse_maelis/R_read_family_relax.xml @@ -21,9 +21,9 @@ 99350 - AM0330 + 2317 170 - TRAVERSE DES MARAICHERS + RUE ACHILLE VIADIEU Paris 75014 diff --git a/tests/data/toulouse_maelis/R_read_family_reordered.xml b/tests/data/toulouse_maelis/R_read_family_reordered.xml index 52ffa8a0..61e152ca 100644 --- a/tests/data/toulouse_maelis/R_read_family_reordered.xml +++ b/tests/data/toulouse_maelis/R_read_family_reordered.xml @@ -21,9 +21,9 @@ 99350 - AM0330 + 2317 170 - TRAVERSE DES MARAICHERS + RUE ACHILLE VIADIEU Paris 75014 diff --git a/tests/data/toulouse_maelis/R_read_street_list.xml b/tests/data/toulouse_maelis/R_read_street_list.xml index 0a26d6f5..4b72b464 100644 --- a/tests/data/toulouse_maelis/R_read_street_list.xml +++ b/tests/data/toulouse_maelis/R_read_street_list.xml @@ -2,16 +2,25 @@ - AS0264 - RUE SAINT FRANCOIS DE PAULE + 2315 + RUE DE LA VERRERIE + A00000000006 + 31500 + TOULOUSE - AP0594 - AVENUE PAULIANI + 2316 + RUE VESTREPAIN + A00000000002 + 31100 + TOULOUSE - AM0330 - TRAVERSE DES MARAICHERS + 2317 + RUE ACHILLE VIADIEU + A00000000005 + 31400 + TOULOUSE diff --git a/tests/test_toulouse_maelis.py b/tests/test_toulouse_maelis.py index 7752f6d2..2c3f975c 100644 --- a/tests/test_toulouse_maelis.py +++ b/tests/test_toulouse_maelis.py @@ -1108,18 +1108,32 @@ def test_read_street_list(con, app): assert resp.json['err'] == 0 assert len(resp.json['data']) == 3 assert resp.json['data'] == [ - {'id': 'AP0594', 'text': 'AVENUE PAULIANI', 'idStreet': 'AP0594', 'libelleStreet': 'AVENUE PAULIANI'}, { - 'id': 'AS0264', - 'text': 'RUE SAINT FRANCOIS DE PAULE', - 'idStreet': 'AS0264', - 'libelleStreet': 'RUE SAINT FRANCOIS DE PAULE', + 'id': '2317', + 'text': 'RUE ACHILLE VIADIEU', + 'town': 'TOULOUSE', + 'idTown': 'A00000000005', + 'zipCode': '31400', + 'idStreet': '2317', + 'libelleStreet': 'RUE ACHILLE VIADIEU', }, { - 'id': 'AM0330', - 'text': 'TRAVERSE DES MARAICHERS', - 'idStreet': 'AM0330', - 'libelleStreet': 'TRAVERSE DES MARAICHERS', + 'id': '2315', + 'text': 'RUE DE LA VERRERIE', + 'town': 'TOULOUSE', + 'idTown': 'A00000000006', + 'zipCode': '31500', + 'idStreet': '2315', + 'libelleStreet': 'RUE DE LA VERRERIE', + }, + { + 'id': '2316', + 'text': 'RUE VESTREPAIN', + 'town': 'TOULOUSE', + 'idTown': 'A00000000002', + 'zipCode': '31100', + 'idStreet': '2316', + 'libelleStreet': 'RUE VESTREPAIN', }, ] @@ -1406,11 +1420,11 @@ def test_read_family(family_service, xml, con, app): 'countryCode_text': 'MAROC', }, 'adresse': { - 'idStreet': 'AM0330', - 'idStreet_text': 'TRAVERSE DES MARAICHERS', + 'idStreet': '2317', + 'idStreet_text': 'RUE ACHILLE VIADIEU', 'num': 170, 'numComp': None, - 'street1': 'TRAVERSE DES MARAICHERS', + 'street1': 'RUE ACHILLE VIADIEU', 'street2': None, 'town': 'Paris', 'zipcode': '75014', @@ -2257,7 +2271,7 @@ def test_create_family(family_service, con, app): 'rl1/birth/countryCode': '99350', 'rl1/birth/dateBirth': '1938-07-26', 'rl1/birth/place': 'Rabbat', - 'rl1/adresse/idStreet': 'AM0330', + 'rl1/adresse/idStreet': '2317', 'rl1/adresse/street1': 'Chateau', 'rl1/adresse/town': 'Paris', 'rl1/adresse/zipcode': '75014', @@ -3252,7 +3266,7 @@ def test_update_coordinate(family_service, con, app): params = { 'adresse/num': '169', 'adresse/numComp': 'B', - 'adresse/idStreet': 'AM0330', + 'adresse/idStreet': '2317', 'adresse/street1': 'Château', 'adresse/street2': None, 'adresse/town': 'Paris',