move "missing headers" test into new format

pyxform/tests/bug_tests.py

@@ -229,24 +229,6 @@ def runTest(self):
                           "Found " + str(len(warnings)) + " warnings")
 
 
-class MissingHeaderColumnsTest(unittest.TestCase):
-    def test_choices_headers_missing(self):
-        filename = "no_header_on_choices_sheet.xls"
-        path_to_excel_file = os.path.join(DIR, "bug_example_xls", filename)
-        workbook_dict = pyxform.xls2json.parse_file_to_workbook_dict(
-            path_to_excel_file)
-        with self.assertRaises(pyxform.errors.PyXFormError):
-            pyxform.xls2json.workbook_to_json(workbook_dict)
-
-    def test_survey_headers_missing(self):
-        filename = "no_header_on_survey_sheet.xls"
-        path_to_excel_file = os.path.join(DIR, "bug_example_xls", filename)
-        workbook_dict = pyxform.xls2json.parse_file_to_workbook_dict(
-            path_to_excel_file)
-        with self.assertRaises(pyxform.errors.PyXFormError):
-            pyxform.xls2json.workbook_to_json(workbook_dict)
-
-
 class TestChoiceNameAsType(unittest.TestCase):
     def test_choice_name_as_type(self):
         filename = "choice_name_as_type.xls"

pyxform/tests_v1/test_bug_missing_headers.py

@@ -0,0 +1,33 @@
+from pyxform_test_case import PyxformTestCase
+
+
+class MissingHeaders(PyxformTestCase):
+    '''
+    when survey and choices columns are missing headers, it is helpful to see
+    an error message that prompts the user to include necessary headers.
+    '''
+    def test_missing_survey_headers(self):
+        self.assertPyxformXform(
+            md="""
+            | survey |                 |    |
+            |        | select_one list | S1 |
+            """,
+            errored=True,
+            error__contains=[
+                'missing important column headers',
+            ])
+
+    def test_missing_choice_headers(self):
+        self.assertPyxformXform(
+            md="""
+            | survey  |                 |          |      |
+            |         | type            | label    | name |
+            |         | select_one list | S1       | s1   |
+            | choices |                 |          |      |
+            |         | list            | option a | a    |
+            |         | list            | option b | b    |
+            """,
+            errored=True,
+            error__contains=[
+                "has columns 'list name', 'name', and 'label'",
+            ])