improve coverage

vpulim · Oct 31, 2024 · b714adc · b714adc
1 parent 4f69219
commit b714adc
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 37 deletions.
diff --git a/src/wsdl/elements.ts b/src/wsdl/elements.ts
@@ -236,9 +236,9 @@ export class ElementElement extends Element {
     if (xmlns && xmlns[TNS_PREFIX]) {
       this.$targetNamespace = xmlns[TNS_PREFIX];
     }
-    let type: any = this.$type || this.$ref;
-    if (type) {
-      type = splitQName(type);
+    const inferredType: string = this.$type || this.$ref;
+    if (inferredType) {
+      const type = splitQName(inferredType);
       const typeName: string = type.name;
       const ns: string = xmlns && xmlns[type.prefix] ||
         this.xmlns[type.prefix] ||
@@ -259,7 +259,7 @@ export class ElementElement extends Element {
           let elem: any = {};
           typeStorage[typeName] = elem;
 
-          if ((this.$ref ) && isMany && typeElement instanceof ElementElement) {
+          if (this.$ref && isMany && typeElement instanceof ElementElement) {
             typeElement.$maxOccurs = this.$maxOccurs;
             typeElement.$minOccurs = this.$minOccurs;
           }

diff --git a/test/request-response-samples/Dummy__should_handle_ref_minOccurs_and_maxOccurs/name.xsd b/test/request-response-samples/Dummy__should_handle_ref_minOccurs_and_maxOccurs/name.xsd
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.Dummy.com/Name/Types" xmlns:tns="http://www.Dummy.com/Name/Types"
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.Dummy.com/Name/Types" xmlns:DUM="http://www.Dummy.com/Name/Types"
     elementFormDefault="qualified" attributeFormDefault="unqualified">
-    <xs:element name="DummyRequest">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="DummyField1" type="xs:string" minOccurs="0" />
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="DummyResponse">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="DummyList_MaxUnbounded">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element ref="tns:DummyItem" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:complexType name="DummyItemType">
-        <xs:sequence>
-            <xs:element name="DummyItemFirstChild" type="xs:string" />
-            <xs:element name="DummyItemSecondChild" type="xs:string" />
-        </xs:sequence>
-    </xs:complexType>
-    <xs:element name="DummyItem" type="tns:DummyItemType" />
-</xs:schema>
+    <element name="DummyRequest">
+        <complexType>
+            <sequence>
+                <element name="DummyField1" type="string" minOccurs="0" />
+            </sequence>
+        </complexType>
+    </element>
+    <element name="DummyResponse">
+        <complexType>
+            <sequence>
+                <element name="Status"/>
+                <element name="DummyList">
+                    <complexType>
+                        <sequence>
+                            <element ref="DUM:DummyItem" minOccurs="0" maxOccurs="unbounded" />
+                        </sequence>
+                    </complexType>
+                </element>
+            </sequence>
+        </complexType>
+    </element>
+    <complexType name="DummyItemType">
+        <sequence>
+            <element name="DummyItemFirstChild" type="string" />
+            <element name="DummyItemSecondChild" type="string" />
+        </sequence>
+    </complexType>
+    <element name="DummyItem" type="DUM:DummyItemType" />
+</schema>
diff --git a/test/request-response-samples/Dummy__should_handle_ref_minOccurs_and_maxOccurs/response.json b/test/request-response-samples/Dummy__should_handle_ref_minOccurs_and_maxOccurs/response.json
@@ -1,5 +1,6 @@
 {
-  "DummyList_MaxUnbounded": {
+  "Status": { "Result": "OK" },
+  "DummyList": {
     "DummyItem": [
       {
         "DummyItemFirstChild": "foo",

diff --git a/test/request-response-samples/Dummy__should_handle_ref_minOccurs_and_maxOccurs/response.xml b/test/request-response-samples/Dummy__should_handle_ref_minOccurs_and_maxOccurs/response.xml
@@ -4,12 +4,15 @@
     <soap:Header></soap:Header>
     <soap:Body>
         <n:DummyResponse>
-            <n:DummyList_MaxUnbounded>
+            <n:Status>
+                <n:Result>OK</n:Result>
+            </n:Status>
+            <n:DummyList>
                 <n:DummyItem>
                     <n:DummyItemFirstChild>foo</n:DummyItemFirstChild>
                     <n:DummyItemSecondChild>foo</n:DummyItemSecondChild>
                 </n:DummyItem>
-            </n:DummyList_MaxUnbounded>
+            </n:DummyList>
         </n:DummyResponse>
     </soap:Body>
 </soap:Envelope>