XLSForm · ukanga · Mar 28, 2022
diff --git a/tests/test_utils/__init__.py → pyxform/test_utils/__init__.py b/tests/test_utils/__init__.py → pyxform/test_utils/__init__.py
diff --git a/tests/test_utils/md_table.py → pyxform/test_utils/md_table.py b/tests/test_utils/md_table.py → pyxform/test_utils/md_table.py
diff --git a/tests/pyxform_test_case.py → pyxform/test_utils/pyxform_test_case.py b/tests/pyxform_test_case.py → pyxform/test_utils/pyxform_test_case.py
@@ -21,7 +21,7 @@
 from pyxform.utils import NSMAP
 from pyxform.validators.odk_validate import ODKValidateError, check_xform
 from pyxform.xls2json import workbook_to_json
-from tests.test_utils.md_table import md_table_to_ss_structure
+from pyxform.test_utils.md_table import md_table_to_ss_structure
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.StreamHandler())

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     packages=find_packages(exclude=["tests", "tests.*"]),
     package_data={
         "pyxform.validators.odk_validate": ["bin/*.*"],
-        "pyxform": ["iana_subtags.txt"],
+        "pyxform": ["iana_subtags.txt", "test_utils"],
     },
     url="http://pypi.python.org/pypi/pyxform/",
     description="A Python package to create XForms for ODK Collect.",

diff --git a/tests/test_allow_mock_accuracy.py b/tests/test_allow_mock_accuracy.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class GeoParameterTest(PyxformTestCase):

diff --git a/tests/test_area.py b/tests/test_area.py
@@ -2,7 +2,7 @@
 """
 AreaTest - test enclosed-area(geo_shape) calculation.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class AreaTest(PyxformTestCase):

diff --git a/tests/test_audio_quality.py b/tests/test_audio_quality.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class AudioQualityTest(PyxformTestCase):

diff --git a/tests/test_audit.py b/tests/test_audit.py
@@ -2,7 +2,7 @@
 """
 AuditTest - test audit question type.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class AuditTest(PyxformTestCase):

diff --git a/tests/test_background_audio.py b/tests/test_background_audio.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class BackgroundAudioTest(PyxformTestCase):

diff --git a/tests/test_bind_conversions.py b/tests/test_bind_conversions.py
@@ -2,7 +2,7 @@
 """
 BindConversionsTest - test bind conversions.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class BindConversionsTest(PyxformTestCase):

diff --git a/tests/test_bug_missing_headers.py b/tests/test_bug_missing_headers.py
@@ -2,7 +2,7 @@
 """
 Test missing headers in XLSForm.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class MissingHeaders(PyxformTestCase):

diff --git a/tests/test_bug_round_calculation.py b/tests/test_bug_round_calculation.py
@@ -2,7 +2,7 @@
 """
 Test round(number, precision) calculation.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class RoundCalculationTest(PyxformTestCase):

diff --git a/tests/test_choices_sheet.py b/tests/test_choices_sheet.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class ChoicesSheetTest(PyxformTestCase):

diff --git a/tests/test_custom_xml_namespaces.py b/tests/test_custom_xml_namespaces.py
@@ -2,7 +2,7 @@
 """
 Test custom namespaces.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 MD = """
 | survey   |                                                                                              |      |       |

diff --git a/tests/test_dynamic_default.py b/tests/test_dynamic_default.py
@@ -3,7 +3,7 @@
 Test handling dynamic default in forms
 """
 
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class DynamicDefaultTests(PyxformTestCase):

diff --git a/tests/test_external_instances.py b/tests/test_external_instances.py
@@ -7,7 +7,7 @@
 from textwrap import dedent
 
 from pyxform.errors import PyXFormError
-from tests.pyxform_test_case import PyxformTestCase, PyxformTestError
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase, PyxformTestError
 
 
 class ExternalInstanceTests(PyxformTestCase):

diff --git a/tests/test_external_instances_for_selects.py b/tests/test_external_instances_for_selects.py
@@ -10,8 +10,8 @@
 from pyxform.constants import EXTERNAL_INSTANCE_EXTENSIONS
 from pyxform.errors import PyXFormError
 from pyxform.xls2xform import get_xml_path, xls2xform_convert
-from tests.pyxform_test_case import PyxformTestCase
-from tests.test_utils.md_table import md_table_to_workbook
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.md_table import md_table_to_workbook
 from tests.utils import get_temp_dir
 
 

diff --git a/tests/test_fieldlist_labels.py b/tests/test_fieldlist_labels.py
@@ -2,7 +2,7 @@
 """
 Test field-list labels
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class FieldListLabels(PyxformTestCase):

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -2,7 +2,7 @@
 """
 Test duplicate survey question field name.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class FieldsTests(PyxformTestCase):

diff --git a/tests/test_file.py b/tests/test_file.py
@@ -2,7 +2,7 @@
 """
 Test file question type.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class FileWidgetTest(PyxformTestCase):

diff --git a/tests/test_for_loop.py b/tests/test_for_loop.py
@@ -2,7 +2,7 @@
 """
 Test loop question type.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class TestLoop(PyxformTestCase):

diff --git a/tests/test_form_name.py b/tests/test_form_name.py
@@ -2,7 +2,7 @@
 """
 Test setting form name to data.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class FormNameTest(PyxformTestCase):

diff --git a/tests/test_geo.py b/tests/test_geo.py
@@ -2,7 +2,7 @@
 """
 Test geo widgets.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class GeoWidgetsTest(PyxformTestCase):

diff --git a/tests/test_groups.py b/tests/test_groups.py
@@ -2,7 +2,7 @@
 """
 Test XForm groups.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class GroupsTests(PyxformTestCase):

diff --git a/tests/test_guidance_hint.py b/tests/test_guidance_hint.py
@@ -2,7 +2,7 @@
 """
 Guidance hint test module.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class GuidanceHintTest(PyxformTestCase):

diff --git a/tests/test_language_warnings.py b/tests/test_language_warnings.py
@@ -5,7 +5,7 @@
 import os
 import tempfile
 
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class LanguageWarningTest(PyxformTestCase):

diff --git a/tests/test_last_saved.py b/tests/test_last_saved.py
@@ -2,7 +2,7 @@
 """
 The last-saved virtual instance can be queried to get values from the last saved instance of the form being authored.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class LastSavedTest(PyxformTestCase):

diff --git a/tests/test_max_pixels.py b/tests/test_max_pixels.py
@@ -2,7 +2,7 @@
 """
 Test image max-pixel parameters.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class MaxPixelsTest(PyxformTestCase):

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -5,7 +5,7 @@
 import os
 import tempfile
 
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class MetadataTest(PyxformTestCase):

diff --git a/tests/test_osm.py b/tests/test_osm.py
@@ -2,7 +2,7 @@
 """
 Test OSM widgets.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 expected_xml_output = """
     <upload mediatype="osm/*" ref="/osm/osm_building">

diff --git a/tests/test_pyxform_test_case.py b/tests/test_pyxform_test_case.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 if TYPE_CHECKING:
     from typing import Set

diff --git a/tests/test_pyxformtestcase.py b/tests/test_pyxformtestcase.py
@@ -3,7 +3,7 @@
 Ensuring that the pyxform_test_case.PyxformTestCase class does some
 internal conversions correctly.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class PyxformTestCaseNonMarkdownSurveyAlternatives(PyxformTestCase):

diff --git a/tests/test_randomize_itemsets.py b/tests/test_randomize_itemsets.py
@@ -2,7 +2,7 @@
 """
 Test randomize itemsets.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class RandomizeItemsetsTest(PyxformTestCase):

diff --git a/tests/test_range.py b/tests/test_range.py
@@ -2,7 +2,7 @@
 """
 Test range widget.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class RangeWidgetTest(PyxformTestCase):

diff --git a/tests/test_rank.py b/tests/test_rank.py
@@ -2,7 +2,7 @@
 """
 Test rank widget.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class RangeWidgetTest(PyxformTestCase):

diff --git a/tests/test_repeat.py b/tests/test_repeat.py
@@ -2,7 +2,7 @@
 """
 Test reapeat structure.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class TestRepeat(PyxformTestCase):

diff --git a/tests/test_repeat_template.py b/tests/test_repeat_template.py
@@ -2,7 +2,7 @@
 """
 Test repeat template and instance structure.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class TestRepeatTemplate(PyxformTestCase):

diff --git a/tests/test_secondary_instance_translations.py b/tests/test_secondary_instance_translations.py
@@ -2,7 +2,7 @@
 """
 Testing inlining translation when no translation is specified.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class TestSecondaryInstanceTest(PyxformTestCase):

diff --git a/tests/test_set_geopoint.py b/tests/test_set_geopoint.py
@@ -2,7 +2,7 @@
 """
 Test setgeopoint widget.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class SetGeopointTest(PyxformTestCase):

diff --git a/tests/test_settings_auto_send_delete.py b/tests/test_settings_auto_send_delete.py
@@ -2,7 +2,7 @@
 """
 Test settins auto settings.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class SettingsAutoSendDelete(PyxformTestCase):

diff --git a/tests/test_sheet_columns.py b/tests/test_sheet_columns.py
@@ -2,7 +2,7 @@
 """
 Test XLSForm sheet names.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 from tests.utils import prep_for_xml_contains
 
 

diff --git a/tests/test_sms.py b/tests/test_sms.py
@@ -2,7 +2,7 @@
 """
 Test sms syntax.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class SMSTest(PyxformTestCase):

diff --git a/tests/test_static_defaults.py b/tests/test_static_defaults.py
@@ -1,4 +1,4 @@
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class StaticDefaultTests(PyxformTestCase):

diff --git a/tests/test_survey.py b/tests/test_survey.py
@@ -1,4 +1,4 @@
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class TestSurvey(PyxformTestCase):

diff --git a/tests/test_table_list.py b/tests/test_table_list.py
@@ -2,7 +2,7 @@
 """
 Test table list appearance syntax.
 """
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 MD = '''
 | survey  |                    |            |           |            |                   |

diff --git a/tests/test_translations.py b/tests/test_translations.py
@@ -13,7 +13,7 @@
 from pyxform.validators.pyxform.missing_translations_check import (
     format_missing_translations_msg,
 )
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 @dataclass()

diff --git a/tests/test_trigger.py b/tests/test_trigger.py
@@ -3,7 +3,7 @@
 Test handling setvalue of 'trigger' column in forms
 """
 
-from tests.pyxform_test_case import PyxformTestCase
+from pyxform.test_utils.pyxform_test_case import PyxformTestCase
 
 
 class TriggerSetvalueTests(PyxformTestCase):