Ajout d'un cas test de projection xsd des matrices

diff --git a/Tests/MappingAccasXsd/Matrix/Matrix.xsd b/Tests/MappingAccasXsd/Matrix/Matrix.xsd
new file mode 100644 (file)
index 0000000..e1223d6
--- /dev/null
+++ b/Tests/MappingAccasXsd/Matrix/Matrix.xsd
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://chercheurs.edf.com/logiciels/Vimmp" xmlns:Vimmp="http://chercheurs.edf.com/logiciels/Vimmp" targetNamespace="http://chercheurs.edf.com/logiciels/Vimmp" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0">\r
+       <xs:simpleType name="T_simp5_element">\r
+               <xs:restriction base="xs:integer"/>\r
+       </xs:simpleType>\r
+       \r
+       <xs:simpleType name="T_simp5_matrix">\r
+               <xs:restriction>\r
+                       <xs:simpleType>\r
+                               <xs:list>\r
+                                       <xs:simpleType>\r
+                                               <xs:restriction base="T_simp5_element"/>\r
+                                       </xs:simpleType>\r
+                               </xs:list>\r
+                       </xs:simpleType>\r
+                       <xs:length value="4"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+\r
+       <xs:group name="T_simp5_lines">\r
+          <xs:sequence>\r
+                 <xs:element name="simp5" type="Vimmp:T_simp5_matrix" minOccurs="3" maxOccurs="3"/>    \r
+          </xs:sequence>\r
+       </xs:group>\r
+       \r
+       <xs:group name="T_simp5_content">\r
+          <xs:sequence>\r
+                  <xs:group ref="Vimmp:T_simp5_lines" minOccurs="1" maxOccurs="1"/>    \r
+          </xs:sequence>\r
+       </xs:group>\r
+       \r
+       <xs:complexType name="T_TestMatrix_0">\r
+               <xs:complexContent>\r
+                       <xs:extension base="T_step_Vimmp">\r
+                               <xs:sequence>\r
+                                  <xs:group ref="Vimmp:T_simp5_content" minOccurs="1" maxOccurs="1"/>  \r
+                               </xs:sequence>\r
+                       </xs:extension>\r
+               </xs:complexContent>\r
+       </xs:complexType>\r
+\r
+\r
+       <xs:element name="TestMatrix_0" type="Vimmp:T_TestMatrix_0" substitutionGroup="step_Vimmp"/>\r
+       <xs:complexType name="T_step_Vimmp" abstract="true"/>\r
+       <xs:element name="step_Vimmp" type="Vimmp:T_step_Vimmp"/>\r
+       <xs:element name="Vimmp" type="Vimmp:T_Vimmp"/>\r
+       <xs:complexType name="T_Vimmp">\r
+               <xs:choice minOccurs="0" maxOccurs="unbounded">\r
+                       <xs:element ref="step_Vimmp" minOccurs="0" maxOccurs="1"/>\r
+               </xs:choice>\r
+       </xs:complexType>\r
+</xs:schema>\r

diff --git a/Tests/MappingAccasXsd/Matrix/Matrix_V0.xsd b/Tests/MappingAccasXsd/Matrix/Matrix_V0.xsd
new file mode 100644 (file)
index 0000000..374bbda
--- /dev/null
+++ b/Tests/MappingAccasXsd/Matrix/Matrix_V0.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://chercheurs.edf.com/logiciels/Vimmp" xmlns:Vimmp="http://chercheurs.edf.com/logiciels/Vimmp" targetNamespace="http://chercheurs.edf.com/logiciels/Vimmp" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0">\r
+       <xs:simpleType name="T_simp5_element">\r
+               <xs:restriction base="xs:integer"/>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="T_simp5_line">\r
+               <xs:restriction>\r
+                       <xs:simpleType>\r
+                               <xs:list>\r
+                                       <xs:simpleType>\r
+                                               <xs:restriction base="T_simp5_element"/>\r
+                                       </xs:simpleType>\r
+                               </xs:list>\r
+                       </xs:simpleType>\r
+                       <xs:length value="4"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:complexType name="T_simp5_matrix">\r
+          <xs:sequence>\r
+                 <xs:element name="line" type="Vimmp:T_simp5_line" minOccurs="3" maxOccurs="3"/>       \r
+          </xs:sequence>\r
+       </xs:complexType>\r
+       \r
+               <xs:complexType name="T_TestMatrix_0">\r
+               <xs:complexContent>\r
+                       <xs:extension base="T_step_Vimmp">\r
+                               <xs:sequence>\r
+                                       <xs:element name="simp5" type="Vimmp:T_simp5_matrix" minOccurs="1" maxOccurs="1">\r
+                                       </xs:element>\r
+                               </xs:sequence>\r
+                       </xs:extension>\r
+               </xs:complexContent>\r
+       </xs:complexType>\r
+\r
+\r
+       <xs:element name="TestMatrix_0" type="Vimmp:T_TestMatrix_0" substitutionGroup="step_Vimmp"/>\r
+       <xs:complexType name="T_step_Vimmp" abstract="true"/>\r
+       <xs:element name="step_Vimmp" type="Vimmp:T_step_Vimmp"/>\r
+       <xs:element name="Vimmp" type="Vimmp:T_Vimmp"/>\r
+       <xs:complexType name="T_Vimmp">\r
+               <xs:choice minOccurs="0" maxOccurs="unbounded">\r
+                       <xs:element ref="step_Vimmp" minOccurs="0" maxOccurs="1"/>\r
+               </xs:choice>\r
+       </xs:complexType>\r
+</xs:schema>\r

diff --git a/Tests/MappingAccasXsd/Matrix/matrix_1.xml b/Tests/MappingAccasXsd/Matrix/matrix_1.xml
new file mode 100644 (file)
index 0000000..84e637c
--- /dev/null
+++ b/Tests/MappingAccasXsd/Matrix/matrix_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--Fichier échantillon XML généré par XMLSpy v2020 rel. 2 sp1 (x64) (http://www.altova.com)-->\r
+<Vimmp:Vimmp xmlns:Vimmp="http://chercheurs.edf.com/logiciels/Vimmp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://chercheurs.edf.com/logiciels/Vimmp Matrix.xsd">\r
+       <Vimmp:step_Vimmp xsi:type="Vimmp:T_TestMatrix_0">\r
+               <Vimmp:simp5>0 1 2 3</Vimmp:simp5>\r
+               <Vimmp:simp5>4 5 6 7</Vimmp:simp5>\r
+               <Vimmp:simp5>8 9 10 11</Vimmp:simp5>\r
+       </Vimmp:step_Vimmp>\r
+</Vimmp:Vimmp>\r

diff --git a/Tests/MappingAccasXsd/Matrix/matrix_V0.xml b/Tests/MappingAccasXsd/Matrix/matrix_V0.xml
new file mode 100644 (file)
index 0000000..2977f22
--- /dev/null
+++ b/Tests/MappingAccasXsd/Matrix/matrix_V0.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--Fichier échantillon XML généré par XMLSpy v2020 rel. 2 sp1 (x64) (http://www.altova.com)-->\r
+<Vimmp:Vimmp xmlns:Vimmp="http://chercheurs.edf.com/logiciels/Vimmp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://chercheurs.edf.com/logiciels/Vimmp Matrix.xsd">\r
+       <Vimmp:step_Vimmp xsi:type="Vimmp:T_TestMatrix_0">\r
+               <Vimmp:simp5>\r
+                       <Vimmp:line>0 1 2 3</Vimmp:line>\r
+                       <Vimmp:line>4 5 6 7</Vimmp:line>\r
+                       <Vimmp:line>8 9 10 12</Vimmp:line>\r
+               </Vimmp:simp5>\r
+       </Vimmp:step_Vimmp>\r
+</Vimmp:Vimmp>\r

diff --git a/Tests/MappingAccasXsd/Matrix/readExemple.py b/Tests/MappingAccasXsd/Matrix/readExemple.py
new file mode 100644 (file)
index 0000000..7d72eee
--- /dev/null
+++ b/Tests/MappingAccasXsd/Matrix/readExemple.py
@@ -0,0 +1,14 @@
+from Matrix_manualdriver import *
+
+pyxb.GlobalValidationConfig._setContentInfluencesGeneration(pyxb.GlobalValidationConfig.ALWAYS)
+pyxb.GlobalValidationConfig._setInvalidElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
+pyxb.GlobalValidationConfig._setOrphanElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
+
+
+jdd = CreateFromDocument(open('matrix_1.xml').read())
+print (jdd.toDOM().toprettyxml())
+c1=jdd.step_Vimmp[0]
+c1.simp5
+c1.simp5.line[0]
+c1.simp5.line[0][2]
+

diff --git a/Tests/MappingAccasXsd/Matrix/readExemple_V0.py b/Tests/MappingAccasXsd/Matrix/readExemple_V0.py
new file mode 100644 (file)
index 0000000..0071359
--- /dev/null
+++ b/Tests/MappingAccasXsd/Matrix/readExemple_V0.py
@@ -0,0 +1,14 @@
+from Matrix_manualdriver import *
+
+pyxb.GlobalValidationConfig._setContentInfluencesGeneration(pyxb.GlobalValidationConfig.ALWAYS)
+pyxb.GlobalValidationConfig._setInvalidElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
+pyxb.GlobalValidationConfig._setOrphanElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
+
+
+jdd = CreateFromDocument(open('matrix_V0.xml').read())
+print (jdd.toDOM().toprettyxml())
+c1=jdd.step_Vimmp[0]
+c1.simp5
+c1.simp5.line[0]
+c1.simp5.line[0][2]
+

diff --git a/Tests/MappingAccasXsd/Matrix/spec_1.xml b/Tests/MappingAccasXsd/Matrix/spec_1.xml
new file mode 100644 (file)
index 0000000..e0d4875
--- /dev/null
+++ b/Tests/MappingAccasXsd/Matrix/spec_1.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<ns1:Vimmp xmlns:ns1="http://chercheurs.edf.com/logiciels/Vimmp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://chercheurs.edf.com/logiciels/Vimmp file:///Z:/VIMMP/vimmptraining/app/datamodel/eficas/Tests/MappingAccasXsd/Annotations/cata_ExemplesCommantaireAndTexteAvecBlancs.xsd">
+       <ns1:step_Vimmp xsi:type="ns1:T_Mignonne">
+       
+<!-- simp1=SIMP(typ='TXM',validateur('TXM'),max='1')-->
+<simp1>
+       <str>Ma chaine unique</str>
+</simp1>
+
+<!-- simp2=SIMP(typ='TXM',validateur('TXM_SS_BLANC'),max='**')-->
+<simp2>Ma_chaine_n°0 Ma_chaine_n°1 Ma_chaine_n°2</simp2>
+
+<!-- simp3=SIMP(typ='TXM',validateur('TXM'),max='**')-->
+<simp3>
+   <str>Ma chaine n°0</str>
+   <str>Ma chaine n°1</str>
+   <str>Ma chaine n°2</str>
+</simp3>
+
+<!-- simp4=SIMP(typ='TUPLE(2)',validateur('R','TXM_SS_BLANC','R','TXM_SS_BLANC'),max='**')-->
+<simp4> 
+   <tuple n=4>3 cm 4 m</tuple>
+   <tuple n=4>1 cm 5 m</tuple>
+   <tuple n=4>2 cm 6 m</tuple>
+   <tuple n=4>3 cm 7 m</tuple>
+</simp4>
+
+<!-- simp5=MATRICE(3,4,methode_de_calcul_de_taille,format_sortie,valsup,valmin,typ='?',into=,list_headers) -->
+<simp5>
+   <matrix n=3 m=4>
+          <line>1 2 3 4   </line>
+          <line>5 6 7 8   </line>
+          <line>9 10 11 12</line>
+   </matrix>
+</simp5>
+
+
+</ns1:Vimmp>