Fixes 3 python tests

Author: spacether

samples/openapi3/client/petstore/python/tests_manual/test_animal.py

@@ -12,12 +12,8 @@
 
 import unittest
 
-import frozendict
-
 import petstore_api
-from petstore_api.components.schema import cat
-from petstore_api.components.schema import dog
-from petstore_api.components.schema.animal import Animal
+from petstore_api.components.schema import animal
 
 
 class TestAnimal(unittest.TestCase):
@@ -37,58 +33,46 @@ def testAnimal(self):
             r"Only the values \['Cat', 'Dog'\] are allowed at \('args\[0\]', 'className'\)"
         )
         with self.assertRaisesRegex(petstore_api.ApiValueError, regex_err):
-            Animal.validate({'className': 'Fox', 'color': 'red'})
-
-        animal = Animal.validate({'className': 'Cat', 'color': 'black'})
-        assert isinstance(animal, frozendict.frozendict)
-        assert isinstance(animal, cat.Cat)
-        assert isinstance(animal, cat._1)
-        assert isinstance(animal, Animal)
-        assert set(animal.keys()) == {'className', 'color'}
-        assert animal.className == 'Cat'
-        assert animal["color"] == 'black'
-        assert isinstance(animal["color"], str)
-        assert isinstance(animal.className, str)
+            animal.Animal.validate({'className': 'Fox', 'color': 'red'})
+
+        inst = animal.Animal.validate({'className': 'Cat', 'color': 'black'})
+        assert isinstance(inst, animal.AnimalDict)
+        assert set(inst.keys()) == {'className', 'color'}
+        assert inst.className == 'Cat'
+        assert inst["color"] == 'black'
+        assert isinstance(inst["color"], str)
+        assert isinstance(inst.className, str)
 
         # pass in optional param
-        animal = Animal.validate({'className': 'Cat', 'color': 'black', 'declawed': True})
-        assert isinstance(animal, Animal)
-        assert isinstance(animal, frozendict.frozendict)
-        assert isinstance(animal, cat.Cat)
-        assert isinstance(animal, cat._1)
-        assert set(animal.keys()) == {'className', 'color', 'declawed'}
-        assert animal.className == 'Cat'
-        assert animal["color"] == 'black'
-        assert animal["declawed"] is True
-        assert isinstance(animal["color"], str)
-        assert isinstance(animal.className, str)
-        assert isinstance(animal["declawed"], bool)
+        inst = animal.Animal.validate({'className': 'Cat', 'color': 'black', 'declawed': True})
+        assert isinstance(inst, animal.AnimalDict)
+        assert set(inst.keys()) == {'className', 'color', 'declawed'}
+        assert inst.className == 'Cat'
+        assert inst["color"] == 'black'
+        assert inst["declawed"] is True
+        assert isinstance(inst["color"], str)
+        assert isinstance(inst.className, str)
+        assert isinstance(inst["declawed"], bool)
 
         # make a Dog
-        animal = Animal.validate({'className': 'Dog', 'color': 'black'})
-        assert isinstance(animal, Animal)
-        assert isinstance(animal, frozendict.frozendict)
-        assert isinstance(animal, dog.Dog)
-        assert isinstance(animal, dog._1)
-        assert set(animal.keys()) == {'className', 'color'}
-        assert animal.className == 'Dog'
-        assert animal["color"] == 'black'
-        assert isinstance(animal["color"], str)
-        assert isinstance(animal.className, str)
+        inst = animal.Animal.validate({'className': 'Dog', 'color': 'black'})
+        assert isinstance(inst, animal.AnimalDict)
+        assert set(inst.keys()) == {'className', 'color'}
+        assert inst.className == 'Dog'
+        assert inst["color"] == 'black'
+        assert isinstance(inst["color"], str)
+        assert isinstance(inst.className, str)
 
         # pass in optional param
-        animal = Animal.validate({'className': 'Dog', 'color': 'black', 'breed':'Labrador'})
-        assert isinstance(animal, Animal)
-        assert isinstance(animal, frozendict.frozendict)
-        assert isinstance(animal, dog.Dog)
-        assert isinstance(animal, dog._1)
-        assert set(animal.keys()) == {'className', 'color', 'breed'}
-        assert animal.className == 'Dog'
-        assert animal["color"] == 'black'
-        assert animal["breed"] == 'Labrador'
-        assert isinstance(animal.className, str)
-        assert isinstance(animal["color"], str)
-        assert isinstance(animal["breed"], str)
+        inst = animal.Animal.validate({'className': 'Dog', 'color': 'black', 'breed':'Labrador'})
+        assert isinstance(inst, animal.AnimalDict)
+        assert set(inst.keys()) == {'className', 'color', 'breed'}
+        assert inst.className == 'Dog'
+        assert inst["color"] == 'black'
+        assert inst["breed"] == 'Labrador'
+        assert isinstance(inst.className, str)
+        assert isinstance(inst["color"], str)
+        assert isinstance(inst["breed"], str)
 
 
 if __name__ == '__main__':

samples/openapi3/client/petstore/python/tests_manual/test_any_type_schema.py

@@ -46,11 +46,8 @@ class Schema_:
                 )
 
         m = Model.validate({'a': 1, 'b': 'hi'})
-        assert isinstance(m, Model)
-        assert isinstance(m, AnyTypeSchema)
-        assert isinstance(m, DictSchema)
         assert isinstance(m, frozendict.frozendict)
-        assert m == frozendict.frozendict(a=Decimal(1), b='hi')
+        assert m == frozendict.frozendict(a=1, b='hi')
 
     def testListSchema(self):
         class Model(AnyTypeSchema):
@@ -63,11 +60,8 @@ class Schema_:
                 )
 
         m = Model.validate([1, 'hi'])
-        assert isinstance(m, Model)
-        assert isinstance(m, AnyTypeSchema)
-        assert isinstance(m, ListSchema)
         assert isinstance(m, tuple)
-        assert m == tuple([Decimal(1), 'hi'])
+        assert m == tuple([1, 'hi'])
 
     def testStrSchema(self):
         class Model(AnyTypeSchema):