Projet

Général

Profil

0001-toulouse-maelis-upgrade-to-build-1857-71940.patch

Nicolas Roche, 01 décembre 2022 18:17

Télécharger (6,5 ko)

Voir les différences: 

Subject: [PATCH] toulouse-maelis: upgrade to build 1857 (#71940)


 functests/toulouse_maelis/data/test_create_family.json |  2 +-
 functests/toulouse_maelis/data/test_update_child.json  |  2 +-
 functests/toulouse_maelis/data/test_update_family.json |  2 +-
 functests/toulouse_maelis/test_family.py               | 10 ----------
 tests/data/toulouse_maelis/FamilyService.wsdl          |  3 ++-
 5 files changed, 5 insertions(+), 14 deletions(-)
functests/toulouse_maelis/data/test_create_family.json
118 118 
            "town": "Springfield"
119 119 
          }
120 120 
        },
121 121 
        "allergy1": "butterscotch, imitation butterscotch, glow-in-the-dark monster make-up",
122 122 
        "allergy2": "shrimp and cauliflower",
123 123 
        "comment1": "the shrimp allergy isn't fully identified",
124 124 
        "comment2": null,
125 125 
        "observ1": "Ay Caramba!",
126 
        "observ2": "Ay Caramba!",
126 
        "observ2": "Eat my shorts!",
127 127 
        "isAuthHospital": false,
128 128 
        "hospital": null,
129 129 
        "vaccinList": [
130 130 
          {
131 131 
            "code": "ROR",
132 132 
            "label": "ROUGEOLE-OREILLONS-RUBEOLE",
133 133 
            "vaccinationDate": "2022-02-22T00:00:00+01:00"
134 134 
          },
functests/toulouse_maelis/data/test_update_child.json
69 69 
        "town": "Springfield"
70 70 
      }
71 71 
    },
72 72 
    "allergy1": "butterscotch, imitation butterscotch, glow-in-the-dark monster make-up",
73 73 
    "allergy2": "shrimp and cauliflower",
74 74 
    "comment1": "the shrimp allergy isn't fully identified",
75 75 
    "comment2": null,
76 76 
    "observ1": "Ay Caramba!",
77 
    "observ2": "Ay Caramba!",
77 
    "observ2": "Eat my shorts!",
78 78 
    "isAuthHospital": true,
79 79 
    "hospital": "Springfield General Hospital",
80 80 
    "vaccinList": [
81 81 
      {
82 82 
        "code": "ROR",
83 83 
        "label": "ROUGEOLE-OREILLONS-RUBEOLE",
84 84 
        "vaccinationDate": "2022-02-22T00:00:00+01:00"
85 85 
      },
functests/toulouse_maelis/data/test_update_family.json
171 171 
            "town": "Springfield"
172 172 
          }
173 173 
        },
174 174 
        "allergy1": "butterscotch, imitation butterscotch, glow-in-the-dark monster make-up",
175 175 
        "allergy2": "shrimp and cauliflower",
176 176 
        "comment1": "the shrimp allergy isn't fully identified",
177 177 
        "comment2": null,
178 178 
        "observ1": "Ay Caramba!",
179 
        "observ2": "Ay Caramba!",
179 
        "observ2": "Eat my shorts!",
180 180 
        "isAuthHospital": true,
181 181 
        "hospital": "Springfield General Hospital",
182 182 
        "vaccinList": [
183 183 
          {
184 184 
            "code": "ROR",
185 185 
            "label": "ROUGEOLE-OREILLONS-RUBEOLE",
186 186 
            "vaccinationDate": "2022-02-22T00:00:00+01:00"
187 187 
          },
functests/toulouse_maelis/test_family.py
580 580 
def test_update_child_medical_record(conn, update_data):
581 581 
    unlink(conn, update_data['name_id'])
582 582 
    link(conn, update_data)
583 583 
    url = conn + '/update-child-medical-record?NameID=%s&child_id=%s' % (
584 584 
        update_data['name_id'],
585 585 
        update_data['bart_num'],
586 586 
    )
587 587 

  		




  588
  
  
    
    # observation 2 is wrong

  		




  589
  
  
    
    assert (

  		




  590
  
  
    
        update_data['data']['childList'][0]['medicalRecord']['observ2']

  		




  591
  
  
    
        != update_data['family_payload']['childList'][0]['medicalRecord']['observ2']

  		




  592
  
  
    
    )

  		




  593
  
  
    
    assert (

  		




  594
  
  
    
        update_data['data']['childList'][0]['medicalRecord']['observ2']

  		




  595
  
  
    
        == update_data['family_payload']['childList'][0]['medicalRecord']['observ1']

  		




  596
  
  
    
    )

  		




  597
  
  
    

  		




  598
  588
  
    
    # reset medical record

  		




  599
  589
  
    
    payload = FAMILY_RESET_PAYLOAD['childList'][0]['medicalRecord']

  		




  600
  590
  
    
    resp = requests.post(url, json=payload)

  		




  601
  591
  
    
    resp.raise_for_status()

  		




  602
  592
  
    
    assert resp.json()['err'] == 0

  		




  603
  593
  
    
    assert diff_child(

  		




  604
  594
  
    
        conn, update_data['name_id'], 0, 'test_update_child_medical_record.json', key='medicalRecord'

  		




  605
  595
  
    
    )

  		












  

    
      tests/data/toulouse_maelis/FamilyService.wsdl
    
  





  860
  860
  
    
    </xs:sequence>

  		




  861
  861
  
    
  </xs:complexType>

  		




  862
  862
  
    

  		




  863
  863
  
    
  <xs:complexType name="indicatorBean">

  		




  864
  864
  
    
    <xs:complexContent>

  		




  865
  865
  
    
      <xs:extension base="ns1:abstractSpecBean">

  		




  866
  866
  
    
        <xs:sequence>

  		




  867
  867
  
    
          <xs:element minOccurs="0" name="code" type="xs:string"/>

  		




  
  868
  
    
          <xs:element minOccurs="0" name="label" type="xs:string"/>

  		




  868
  869
  
    
          <xs:element minOccurs="0" name="note" type="xs:string"/>

  		




  869
  870
  
    
          <xs:element minOccurs="0" name="choice" type="xs:string"/>

  		




  870
  871
  
    
        </xs:sequence>

  		




  871
  872
  
    
      </xs:extension>

  		




  872
  873
  
    
    </xs:complexContent>

  		




  873
  874
  
    
  </xs:complexType>

  		




  874
  875
  
    

  		




  875
  876
  
    
  <xs:complexType name="activityTypeBean">

  		




  ......




  2488
  2489
  
    
      <wsdl:input message="tns:readTownList" name="readTownList">

  		




  2489
  2490
  
    
    </wsdl:input>

  		




  2490
  2491
  
    
      <wsdl:output message="tns:readTownListResponse" name="readTownListResponse">

  		




  2491
  2492
  
    
    </wsdl:output>

  		




  2492
  2493
  
    
      <wsdl:fault message="tns:MaelisFamilyException" name="MaelisFamilyException">

  		




  2493
  2494
  
    
    </wsdl:fault>

  		




  2494
  2495
  
    
    </wsdl:operation>

  		




  2495
  2496
  
    
    <wsdl:operation name="readCategoryList">

  		




  2496
  
  
    
<wsdl:documentation>[REF] Renvoie a liste des catégories familiales</wsdl:documentation>

  		




  
  2497
  
    
<wsdl:documentation>[REF] Renvoie la liste des catégories familiales</wsdl:documentation>

  		




  2497
  2498
  
    
      <wsdl:input message="tns:readCategoryList" name="readCategoryList">

  		




  2498
  2499
  
    
    </wsdl:input>

  		




  2499
  2500
  
    
      <wsdl:output message="tns:readCategoryListResponse" name="readCategoryListResponse">

  		




  2500
  2501
  
    
    </wsdl:output>

  		




  2501
  2502
  
    
      <wsdl:fault message="tns:MaelisFamilyException" name="MaelisFamilyException">

  		




  2502
  2503
  
    
    </wsdl:fault>

  		




  2503
  2504
  
    
    </wsdl:operation>

  		




  2504
  2505
  
    
    <wsdl:operation name="readFamilyByPassword">

  		




  2505
  
  
    
-