improve test coverage

Author: ziirish

tests/test_fields.py

@@ -885,6 +885,14 @@ def test_list_of_raw(self):
 class WildcardFieldTest(BaseFieldTestMixin, FieldTestCase):
     field_class = partial(fields.Wildcard, fields.String)
 
+    def test_types(self):
+        with pytest.raises(fields.MarshallingError):
+            class WrongType:
+                pass
+            x = WrongType()
+            field1 = fields.Wildcard(WrongType)
+            field2 = fields.Wildcard(x)
+
     def test_defaults(self):
         field = fields.Wildcard(fields.String)
         assert not field.required
@@ -925,6 +933,9 @@ def test_wildcard(self, api):
         wild3 = fields.Wildcard(fields.String)
         wild4 = fields.Wildcard(fields.String, default='x')
         wild5 = fields.Wildcard(fields.String)
+        wild6 = fields.Wildcard(fields.Integer)
+        wild7 = fields.Wildcard(fields.String)
+        wild8 = fields.Wildcard(fields.String)
 
         mod5 = OrderedDict()
         mod5['toto'] = fields.Integer
@@ -936,35 +947,74 @@ def test_wildcard(self, api):
         wild_fields3 = api.model('WildcardModel3', {'*': wild3})
         wild_fields4 = api.model('WildcardModel4', {'*': wild4})
         wild_fields5 = api.model('WildcardModel5', mod5)
+        wild_fields6 = api.model('WildcardModel6', {
+            'nested': {'f1': fields.String(default='12'), 'f2': fields.Integer(default=13)},
+            'a*': wild6
+        })
+        wild_fields7 = api.model('WildcardModel7', {'*': wild7})
+        wild_fields8 = api.model('WildcardModel8', {'*': wild8})
 
         class Dummy(object):
             john = 12
             bob = '42'
+            alice = None
 
         class Dummy2(object):
             pass
 
+        class Dummy3(object):
+            a = None
+            b = None
+
         data = {'John': 12, 'bob': 42, 'Jane': '68'}
         data3 = Dummy()
         data4 = Dummy2()
         data5 = {'John': 12, 'bob': 42, 'Jane': '68', 'toto': '72'}
+        data6 = {'nested': {'f1': 12, 'f2': 13}, 'alice': '14'}
+        data7 = Dummy3()
+        data8 = None
         expected1 = {'John': '12', 'bob': '42', 'Jane': '68'}
         expected2 = {'John': 12, 'Jane': 68}
         expected3 = {'john': '12', 'bob': '42'}
         expected4 = {'*': 'x'}
         expected5 = {'John': '12', 'bob': 42, 'Jane': '68', 'toto': 72}
+        expected6 = {'nested': {'f1': '12', 'f2': 13}, 'alice': 14}
+        expected7 = {}
+        expected8 = {}
 
         result1 = api.marshal(data, wild_fields1)
         result2 = api.marshal(data, wild_fields2)
         result3 = api.marshal(data3, wild_fields3, skip_none=True)
         result4 = api.marshal(data4, wild_fields4)
         result5 = api.marshal(data5, wild_fields5)
+        result6 = api.marshal(data6, wild_fields6)
+        result7 = api.marshal(data7, wild_fields7, skip_none=True)
+        result8 = api.marshal(data8, wild_fields7, skip_none=True)
 
         assert expected1 == result1
         assert expected2 == result2
         assert expected3 == result3
         assert expected4 == result4
         assert expected5 == result5
+        assert expected6 == result6
+        assert expected7 == result7
+        assert expected8 == result8
+
+    def test_clone(self, api):
+        wild1 = fields.Wildcard(fields.String)
+        wild2 = wild1.clone()
+
+        wild_fields1 = api.model('cloneWildcard1', {'*': wild1})
+        wild_fields2 = api.model('cloneWildcard2', {'*': wild2})
+
+        data = {'John': 12, 'bob': 42, 'Jane': '68'}
+        expected1 = {'John': '12', 'bob': '42', 'Jane': '68'}
+
+        result1 = api.marshal(data, wild_fields1)
+        result2 = api.marshal(data, wild_fields2)
+
+        assert expected1 == result1
+        assert result2 == result1
 
 
 class ClassNameFieldTest(StringTestMixin, BaseFieldTestMixin, FieldTestCase):

tests/test_marshalling.py

@@ -47,7 +47,7 @@ def test_marshal_with_skip_none(self):
     def test_marshal_wildcard_with_skip_none(self):
         wild = fields.Wildcard(fields.String)
         model = OrderedDict([('foo', fields.Raw), ('*', wild)])
-        marshal_dict = OrderedDict([('foo', None), ('bat', None), ('baz', 'biz')])
+        marshal_dict = OrderedDict([('foo', None), ('bat', None), ('baz', 'biz'), ('bar', None)])
         output = marshal(marshal_dict, model, skip_none=True)
         assert output == {'baz': 'biz'}