[#90] Fix unflattening tests using the schema

Author: Bjwebb

flattentool/schema.py

@@ -148,7 +148,7 @@ def parse_schema_dict(self, parent_path, schema_dict, parent_id_fields=None, tit
                             raise ValueError
                     elif 'object' in type_set:
                         if title:
-                            title_lookup[title].property_name = property_name+'/0'
+                            title_lookup[title].property_name = property_name
 
                         sub_sheet_name = ('_'.join(x[:3] for x in parent_path.split('/') if x != '0') + property_name)[:31]
 

flattentool/tests/test_input_SpreadsheetInput_unflatten.py

@@ -399,7 +399,7 @@ def create_schema(root_id):
             }]
         }]
     ),
-    pytest.mark.xfail((
+    (
         'Multi item array, allow numbering',
         [{
             'ROOT_ID_TITLE': 1,
@@ -428,7 +428,7 @@ def create_schema(root_id):
             }
             ]
         }]
-    )),
+    ),
     (
         'Empty',
         [{

flattentool/tests/test_input_SpreadsheetInput_unflatten_mulitplesheets.py

@@ -144,7 +144,7 @@ def test_nested_id(self):
             {'ocid': 1, 'id': 2, 'subField': [{'id': 3, 'testA': {'id': 4}}]}
         ]
 
-    @pytest.mark.xfail()
+    @pytest.mark.xfail
     def test_missing_columns(self, recwarn):
         spreadsheet_input = ListInput(
             sheets={
@@ -158,14 +158,14 @@ def test_missing_columns(self, recwarn):
                     {
                         'ocid': 1,
                         'id': '',
-                        'subField/id': 3,
-                        'subField/testA/id': 4,
+                        'subField/0/id': 3,
+                        'subField/0/testA/id': 4,
                     },
                     {
                         'ocid': 1,
                         'id': 2,
-                        'subField/id': 3,
-                        'subField/testA': 5,
+                        'subField/0/id': 3,
+                        'subField/0/testA': 5,
                     }
                 ]
             },