Merge pull request #104 from kimetrica/87-external-instances-validation

Fix #87 validation of external instances
XLSForm · Mar 29, 2017 · df76208 · df76208
2 parents daee65c + de377ef
commit df76208
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/pyxform/survey.py b/pyxform/survey.py
@@ -162,7 +162,7 @@ def _generate_from_file_instances(self):
                 file_id, file_extension = os.path.splitext(itemset)
                 yield node(
                     "instance",
-                    node("root", node("item", node("name"), node("label"))),
+                    node("root", node("item", node("name", "_"), node("label", "_"))),
                     id=file_id,
                     src="jr://file-%s/%s" % (file_extension[1:], itemset)
                 )

diff --git a/pyxform/tests_v1/test_support_external_instances.py b/pyxform/tests_v1/test_support_external_instances.py
@@ -16,8 +16,8 @@ def test_external_csv_instances(self):
                 """<instance id="cities" src="jr://file-csv/cities.csv">
         <root>
           <item>
-            <name/>
-            <label/>
+            <name>_</name>
+            <label>_</label>
           </item>
         </root>
       </instance>""",  # noqa
@@ -26,14 +26,15 @@ def test_external_csv_instances(self):
                 """<instance id="neighbourhoods" src="jr://file-csv/neighbourhoods.csv">
         <root>
           <item>
-            <name/>
-            <label/>
+            <name>_</name>
+            <label>_</label>
           </item>
         </root>
       </instance>""",  # noqa
                 '<select ref="/ecsv/neighbourhoods">',
                 '<itemset nodeset="instance(\'neighbourhoods\')/root/item">',
             ],
+            run_odk_validate=True,
         )
 
     def test_external_csv_instances_w_choice_filter(self):
@@ -50,23 +51,24 @@ def test_external_csv_instances_w_choice_filter(self):
                 """<instance id="cities" src="jr://file-csv/cities.csv">
         <root>
           <item>
-            <name/>
-            <label/>
+            <name>_</name>
+            <label>_</label>
           </item>
         </root>
       </instance>""",  # noqa
                 '<select1 ref="/ecsv/city">',
                 """<instance id="neighbourhoods" src="jr://file-csv/neighbourhoods.csv">
         <root>
           <item>
-            <name/>
-            <label/>
+            <name>_</name>
+            <label>_</label>
           </item>
         </root>
       </instance>""",  # noqa
                 '<select ref="/ecsv/neighbourhoods">',
                 '<itemset nodeset="instance(\'neighbourhoods\')/root/item[city= /ecsv/city ]">',  # noqa
             ],
+            run_odk_validate=True,
         )
 
 
@@ -85,8 +87,8 @@ def test_external_xml_instances(self):
                 """<instance id="cities" src="jr://file-xml/cities.xml">
         <root>
           <item>
-            <name/>
-            <label/>
+            <name>_</name>
+            <label>_</label>
           </item>
         </root>
       </instance>""",  # noqa
@@ -95,14 +97,15 @@ def test_external_xml_instances(self):
                 """<instance id="neighbourhoods" src="jr://file-xml/neighbourhoods.xml">
         <root>
           <item>
-            <name/>
-            <label/>
+            <name>_</name>
+            <label>_</label>
           </item>
         </root>
       </instance>""",  # noqa
                 '<select ref="/exml/neighbourhoods">',
                 '<itemset nodeset="instance(\'neighbourhoods\')/root/item">',
             ],
+            run_odk_validate=True,
         )