Fixes more python tests

Author: spacether

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

@@ -33,13 +33,13 @@ def testArrayHoldingAnyType(self):
 
         enum_values = [True, False]
         for enum_value in enum_values:
-            inst = ArrayHoldingAnyType([enum_value])
+            inst = ArrayHoldingAnyType.validate([enum_value])
             assert isinstance(inst, ArrayHoldingAnyType)
             assert isinstance(inst, tuple)
             assert isinstance(inst[0], BoolClass)
             assert bool(inst[0]) is enum_value
 
-        inst = ArrayHoldingAnyType([None])
+        inst = ArrayHoldingAnyType.validate([None])
         assert isinstance(inst, ArrayHoldingAnyType)
         assert isinstance(inst, tuple)
         assert isinstance(inst[0], NoneClass)
@@ -55,7 +55,7 @@ def testArrayHoldingAnyType(self):
             ('hi', 'hi'),
         ]
         for input, stored_value in input_to_stored_value:
-            inst = ArrayHoldingAnyType([input])
+            inst = ArrayHoldingAnyType.validate([input])
             assert isinstance(inst, ArrayHoldingAnyType)
             assert isinstance(inst, tuple)
             assert inst[0] == stored_value

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

@@ -32,21 +32,21 @@ def testArrayWithValidationsInItems(self):
 
         valid_values = [-1, 5, 7]
         for valid_value in valid_values:
-            inst = ArrayWithValidationsInItems([valid_value])
+            inst = ArrayWithValidationsInItems.validate([valid_value])
             assert isinstance(inst, ArrayWithValidationsInItems)
             assert inst == (valid_value,)
 
         with self.assertRaisesRegex(
             exceptions.ApiValueError,
             r"Invalid value `8`, must be a value less than or equal to `7` at \('args\[0\]', 0\)"
         ):
-            ArrayWithValidationsInItems([8])
+            ArrayWithValidationsInItems.validate([8])
 
         with self.assertRaisesRegex(
             exceptions.ApiValueError,
             r"Invalid value `\(Decimal\('1'\), Decimal\('2'\), Decimal\('3'\)\)`, number of items must be less than or equal to `2` at \('args\[0\]',\)"
         ):
-            ArrayWithValidationsInItems([1, 2, 3])
+            ArrayWithValidationsInItems.validate([1, 2, 3])
 
 
 if __name__ == '__main__':

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

@@ -27,13 +27,13 @@ def tearDown(self):
 
     def test_BooleanEnum(self):
         """Test BooleanEnum"""
-        model = BooleanEnum(True)
+        model = BooleanEnum.validate(True)
         assert model is BooleanEnum.TRUE
         assert model.is_true_()
         assert model.is_false_() is False
         assert repr(model) == '<DynamicSchema: True>'
         with self.assertRaises(petstore_api.ApiValueError):
-            BooleanEnum(False)
+            BooleanEnum.validate(False)
 
 
 if __name__ == '__main__':

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

@@ -41,10 +41,10 @@ class EnumPlusPrim(IntegerEnumOneValue, IntegerMax10):
 
         # invalid value throws an exception
         with self.assertRaises(petstore_api.ApiValueError):
-            EnumPlusPrim(9)
+            EnumPlusPrim.validate(9)
 
         # valid value succeeds
-        val = EnumPlusPrim(0)
+        val = EnumPlusPrim.validate(0)
         assert val == 0
         assert isinstance(val, EnumPlusPrim)
         assert isinstance(val, Singleton)

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

@@ -30,7 +30,7 @@ def test_ComposedBool(self):
         all_values = [None, True, False, 2, 3.14, '', {}, []]
         for value in all_values:
             if isinstance(value, bool):
-                model = ComposedBool(value)
+                model = ComposedBool.validate(value)
                 if value is True:
                     self.assertTrue(bool(model))
                     self.assertTrue(model.is_true_())
@@ -41,7 +41,7 @@ def test_ComposedBool(self):
                     self.assertFalse(bool(model))
                 continue
             with self.assertRaises(petstore_api.ApiTypeError):
-                ComposedBool(value)
+                ComposedBool.validate(value)
             continue
 
 

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

@@ -33,9 +33,9 @@ def test_ComposedNone(self):
         for value in all_values:
             if value not in valid_values:
                 with self.assertRaises(petstore_api.ApiTypeError):
-                    model = ComposedNone(value)
+                    ComposedNone.validate(value)
                 continue
-            model = ComposedNone(value)
+            ComposedNone.validate(value)
 
 
 if __name__ == '__main__':

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

@@ -10,7 +10,6 @@
 """
 
 
-import sys
 import unittest
 
 import petstore_api
@@ -33,9 +32,9 @@ def test_ComposedNumber(self):
         for value in all_values:
             if value not in valid_values:
                 with self.assertRaises(petstore_api.ApiTypeError):
-                    model = ComposedNumber(value)
+                    ComposedNumber.validate(value)
                 continue
-            model = ComposedNumber(value)
+            ComposedNumber.validate(value)
 
 
 if __name__ == '__main__':

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

@@ -28,14 +28,13 @@ def tearDown(self):
 
     def test_ComposedObject(self):
         """Test ComposedObject"""
-        valid_values = [{}]
-        all_values = [None, True, False, 2, 3.14, '', {}, []]
+        all_values = (None, True, False, 2, 3.14, '', {}, [])
         for value in all_values:
-            if value not in valid_values:
+            if not isinstance(value, dict):
                 with self.assertRaises(petstore_api.ApiTypeError):
-                    model = ComposedObject(value)
+                    ComposedObject.validate(value)
                 continue
-            model = ComposedObject(value)
+            ComposedObject(value)
 
 
 if __name__ == '__main__':

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

@@ -34,32 +34,32 @@ def tearDown(self):
     def test_ComposedOneOfDifferentTypes(self):
         """Test ComposedOneOfDifferentTypes"""
         # we can make an instance that stores float data
-        inst = ComposedOneOfDifferentTypes(10.0)
+        inst = ComposedOneOfDifferentTypes.validate(10.0)
         assert isinstance(inst, NumberWithValidations)
 
         # we can make an instance that stores object (dict) data
-        inst = ComposedOneOfDifferentTypes({'className': "Cat", 'color': "black"})
+        inst = ComposedOneOfDifferentTypes.validate({'className': "Cat", 'color': "black"})
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, Animal)
         assert isinstance(inst, Cat)
         assert isinstance(inst, frozendict.frozendict)
 
         # object that holds 4 properties and is not an Animal
-        inst = ComposedOneOfDifferentTypes({'a': "a", 'b': "b", 'c': "c", 'd': "d"})
+        inst = ComposedOneOfDifferentTypes.validate({'a': "a", 'b': "b", 'c': "c", 'd': "d"})
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert not isinstance(inst, Animal)
         assert isinstance(inst, frozendict.frozendict)
 
         # None
-        inst = ComposedOneOfDifferentTypes(None)
+        inst = ComposedOneOfDifferentTypes.validate(None)
         inst.is_none_()
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, Singleton)
         assert isinstance(inst, NoneClass)
         assert inst.is_none_() is True
 
         # date
-        inst = ComposedOneOfDifferentTypes('2019-01-10')
+        inst = ComposedOneOfDifferentTypes.validate('2019-01-10')
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateSchema)
         assert isinstance(inst, str)
@@ -68,7 +68,7 @@ def test_ComposedOneOfDifferentTypes(self):
         assert inst.as_date_.day == 10
 
         # date
-        inst = ComposedOneOfDifferentTypes(date(2019, 1, 10))
+        inst = ComposedOneOfDifferentTypes.validate(date(2019, 1, 10))
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateSchema)
         assert isinstance(inst, str)
@@ -77,7 +77,7 @@ def test_ComposedOneOfDifferentTypes(self):
         assert inst.as_date_.day == 10
 
         # date-time
-        inst = ComposedOneOfDifferentTypes('2020-01-02T03:04:05Z')
+        inst = ComposedOneOfDifferentTypes.validate('2020-01-02T03:04:05Z')
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateTimeSchema)
         assert isinstance(inst, str)
@@ -91,7 +91,7 @@ def test_ComposedOneOfDifferentTypes(self):
         assert inst.as_datetime_.tzinfo == utc_tz
 
         # date-time
-        inst = ComposedOneOfDifferentTypes(datetime(2020, 1, 2, 3, 4, 5, tzinfo=timezone.utc))
+        inst = ComposedOneOfDifferentTypes.validate(datetime(2020, 1, 2, 3, 4, 5, tzinfo=timezone.utc))
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateTimeSchema)
         assert isinstance(inst, str)

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

@@ -9,8 +9,6 @@
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 
-
-import sys
 import unittest
 
 import petstore_api
@@ -33,9 +31,9 @@ def test_ComposedString(self):
         for value in all_values:
             if value not in valid_values:
                 with self.assertRaises(petstore_api.ApiTypeError):
-                    model = ComposedString(value)
+                    ComposedString.validate(value)
                 continue
-            model = ComposedString(value)
+            ComposedString.validate(value)
 
 
 if __name__ == '__main__':