fix tests

Author: smn

elasticgit/commands/avro.py

@@ -214,8 +214,10 @@ def field_class_for(self, field, field_mapping):
             return field_mapping[field_name].__name__
 
         if isinstance(field_type, dict):
+            print 'field dict', field
             return self.field_class_for_complex_type(field)
         if isinstance(field_type, list):
+            print 'field list', field
             return self.field_class_for_core_type(field_type)
 
         return self.core_mapping[field_type].__name__
@@ -227,9 +229,13 @@ def field_class_for_core_type(self, core_types):
         return self.core_mapping[not_null_type].__name__
 
     def field_class_for_complex_type(self, field):
-        field_type = field['type']
+        field_type = field['type']['type']
+        if isinstance(field_type, list):
+            [field_type] = [ft
+                            for ft in field_type
+                            if ft != "null"]
         handler = getattr(
-            self, 'field_class_for_complex_%(type)s_type' % field_type)
+            self, 'field_class_for_complex_%s_type' % (field_type,))
         return handler(field)
 
     def field_class_for_complex_record_type(self, field):
@@ -376,10 +382,10 @@ def map_ListField_type(self, field):
             'type': 'array',
             'name': field.name,
             'namespace': field.__class__.__module__,
-            'items': reduce(
+            'items': list(set(reduce(
                 lambda a, b: a + b,
                 [self.map_field_to_type(fld) for fld in field.fields],
-                []),
+                []))),
         }
 
     def map_DictField_type(self, field):

elasticgit/commands/tests/test_avro.py

@@ -59,7 +59,7 @@ class TestModel(models.Model):
         tags = self.get_field(schema, 'tags')
         field_type = tags['type']
         self.assertEqual(field_type['type'], 'array')
-        self.assertEqual(field_type['items'], ['int'])
+        self.assertEqual(set(field_type['items']), set(['null', 'int']))
 
 
 class TestLoadSchemaTool(ToolBaseTest):
@@ -139,7 +139,7 @@ def test_array_field(self):
         self.assertFieldCreation({
             'name': 'array',
             'type': {
-                'type': 'array',
+                'type': ['null', 'array'],
                 'items': ['string'],
             },
             'doc': 'The Array',
@@ -154,7 +154,7 @@ def test_dict_field(self):
                 'items': ['string'],
                 'fields': [{
                     'name': 'hello',
-                    'type': 'string',
+                    'type': ['null', 'string'],
                 }]
             },
             'doc': 'The Object',
@@ -171,7 +171,7 @@ def test_complex_field(self):
                 'items': ['string'],
                 'fields': [{
                     'name': 'foo',
-                    'type': 'string',
+                    'type': ['null', 'string'],
                 }]
             },
             'doc': 'Super Complex',
@@ -223,6 +223,7 @@ def test_two_way(self):
         schema_loader = self.mk_schema_loader()
 
         schema = schema_dumper.dump_schema(DumpAndLoadModel)
+        print 'schema', schema
 
         generated_code = schema_loader.generate_model(json.loads(schema))
 

elasticgit/templates/model_generator.py.txt

@@ -25,8 +25,8 @@ class {{model_class_for(schema.name)}}(models.Model):
         {%- if is_complex(field) -%}, fields=(
             {%- set sub_type = field['type'] %}
             {%- if sub_type['type'] == 'array' %}
-                {% for item in sub_type['items'] %}
-                    models.{{field_class_for_core_type(item)}}('{{item}}'),{%- endfor %}
+                {% for item in sub_type['items'] %}{% if item != 'null' %}
+                    models.{{field_class_for_core_type([item])}}('{{item}}'),{% endif %}{%- endfor %}
             {%- elif sub_type['type'] == 'record' %}
                 {% for field in sub_type['fields'] %}
                     models.{{field_class_for_core_type(field.type)}}('{{field.name}}', name='{{field.name}}'),{%- endfor %}