Skip to content

Commit a1771b4

Browse files
EspenHaEspenHa
committed
First attempt to fix petstore tests
1 parent 41298bc commit a1771b4

10 files changed

Lines changed: 123 additions & 122 deletions

File tree

‎samples/openapi3/client/petstore/python-aiohttp/tests/test_model.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55

66
from datetime import date
7+
import json
78
import os
89
import time
910
import unittest
@@ -111,11 +112,11 @@ def test_oneOf(self):
111112
self.assertIn("Input should be a valid dictionary or instance of DanishPig", str(e))
112113

113114
# test to_json
114-
self.assertEqual(p.to_json(), '{"className": "BasquePig", "color": "red"}')
115+
self.assertEqual(json.loads(p.to_json()), {"className": "BasquePig", "color": "red"})
115116

116117
# test nested property
117118
nested = petstore_api.WithNestedOneOf(size = 1, nested_pig = p)
118-
self.assertEqual(nested.to_json(), '{"size": 1, "nested_pig": {"className": "BasquePig", "color": "red"}}')
119+
self.assertEqual(json.loads(nested.to_json()), {"size": 1, "nested_pig": {"className": "BasquePig", "color": "red"}})
119120

120121
nested_json = nested.to_json()
121122
nested2 = petstore_api.WithNestedOneOf.from_json(nested_json)
@@ -166,11 +167,11 @@ def test_anyOf(self):
166167
self.assertIn("Input should be a valid dictionary or instance of DanishPig", str(e))
167168

168169
# test to_json
169-
self.assertEqual(p.to_json(), '{"className": "BasquePig", "color": "red"}')
170+
self.assertEqual(json.loads(p.to_json()), {"className": "BasquePig", "color": "red"})
170171

171172
def test_inheritance(self):
172173
dog = petstore_api.Dog(breed="bulldog", className="dog", color="white")
173-
self.assertEqual(dog.to_json(), '{"className": "dog", "color": "white", "breed": "bulldog"}')
174+
self.assertEqual(json.loads(dog.to_json()), {"className": "dog", "color": "white", "breed": "bulldog"})
174175
self.assertEqual(dog.to_dict(), {'breed': 'bulldog', 'className':
175176
'dog', 'color': 'white'})
176177
dog2 = petstore_api.Dog.from_json(dog.to_json())
@@ -194,7 +195,7 @@ def test_list(self):
194195
self.assertTrue("str type expected" in str(e))
195196

196197
l = petstore_api.ListClass(**{"123-list": "bulldog"})
197-
self.assertEqual(l.to_json(), '{"123-list":"bulldog"}')
198+
self.assertEqual(json.loads(l.to_json()), {'123-list': 'bulldog'})
198199
self.assertEqual(l.to_dict(), {'123-list': 'bulldog'})
199200

200201
l2 = petstore_api.ListClass.from_json(l.to_json())
@@ -206,16 +207,15 @@ def test_enum_ref_property(self):
206207
# test enum ref property
207208
# test to_json
208209
d = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1)
209-
self.assertEqual(d.to_json(), '{"value": 1}')
210+
self.assertEqual(json.loads(d.to_json()), {"value": 1})
210211
d2 = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1, str_value=petstore_api.OuterEnum.DELIVERED)
211-
self.assertEqual(d2.to_json(), '{"str_value": "delivered", "value": 1}')
212-
212+
self.assertEqual(json.loads(d2.to_json()), {"str_value": "delivered", "value": 1})
213213
# test from_json (round trip)
214214
d3 = petstore_api.OuterObjectWithEnumProperty.from_json(d2.to_json())
215215
assert d3 is not None
216216
self.assertEqual(d3.str_value, petstore_api.OuterEnum.DELIVERED)
217217
self.assertEqual(d3.value, petstore_api.OuterEnumInteger.NUMBER_1)
218-
self.assertEqual(d3.to_json(), '{"str_value": "delivered", "value": 1}')
218+
self.assertEqual(json.loads(d3.to_json()), {"str_value": "delivered", "value": 1})
219219

220220
def test_float_strict_type(self):
221221
# assigning 123 to float shouldn't throw an exception

‎samples/openapi3/client/petstore/python-aiohttp/tests/test_pet_model.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ def test_from_to_methods(self):
8282
assert pet.category is not None
8383
self.assertEqual(pet.category.id, 1)
8484
# test to_json
85-
self.assertEqual(pet.to_json(),
86-
'{"id": 1, "category": {"id": 1, "name": "dog"}, "name": "test name", "photoUrls": ['
87-
'"string"], "tags": [{"id": 1, "name": "None"}], "status": "available"}')
85+
self.assertEqual(json.loads(pet.to_json()),
86+
{"id": 1, "category": {"id": 1, "name": "dog"}, "name": "test name", "photoUrls": ["string"],
87+
"tags": [{"id": 1, "name": "None"}], "status": "available"})
8888

8989
# test to_dict
9090
self.assertEqual(pet.to_dict(),
@@ -109,13 +109,13 @@ def test_unpack_operator(self):
109109
id=123,
110110
photoUrls=["https://a.com", "https://b.com"],
111111
)
112-
self.assertEqual(pet.to_json(), '{"id": 123, "name": "required name", "photoUrls": ["https://a.com", "https://b.com"]}')
112+
self.assertEqual(json.loads(pet.to_json()), {"id": 123, "name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
113113
self.assertEqual(pet.to_dict(), {"id": 123, "name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
114114
def test_optional_fields(self):
115115
pet = petstore_api.Pet(name="required name",
116116
photoUrls=["https://a.com",
117117
"https://b.com"])
118-
self.assertEqual(pet.to_json(), '{"name": "required name", "photoUrls": ["https://a.com", "https://b.com"]}')
118+
self.assertEqual(json.loads(pet.to_json()), {"name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
119119
self.assertEqual(pet.to_dict(), {"name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
120120

121121

‎samples/openapi3/client/petstore/python-httpx/tests/test_model.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55

66
from datetime import date
7+
import json
78
import os
89
import time
910
import unittest
@@ -111,11 +112,11 @@ def test_oneOf(self):
111112
self.assertIn("Input should be a valid dictionary or instance of DanishPig", str(e))
112113

113114
# test to_json
114-
self.assertEqual(p.to_json(), '{"className": "BasquePig", "color": "red"}')
115+
self.assertEqual(json.loads(p.to_json()), {"className": "BasquePig", "color": "red"})
115116

116117
# test nested property
117118
nested = petstore_api.WithNestedOneOf(size = 1, nested_pig = p)
118-
self.assertEqual(nested.to_json(), '{"size": 1, "nested_pig": {"className": "BasquePig", "color": "red"}}')
119+
self.assertEqual(json.loads(nested.to_json()), {"size": 1, "nested_pig": {"className": "BasquePig", "color": "red"}})
119120

120121
nested_json = nested.to_json()
121122
nested2 = petstore_api.WithNestedOneOf.from_json(nested_json)
@@ -166,11 +167,11 @@ def test_anyOf(self):
166167
self.assertIn("Input should be a valid dictionary or instance of DanishPig", str(e))
167168

168169
# test to_json
169-
self.assertEqual(p.to_json(), '{"className": "BasquePig", "color": "red"}')
170+
self.assertEqual(json.loads(p.to_json()), {"className": "BasquePig", "color": "red"})
170171

171172
def test_inheritance(self):
172173
dog = petstore_api.Dog(breed="bulldog", className="dog", color="white")
173-
self.assertEqual(dog.to_json(), '{"className": "dog", "color": "white", "breed": "bulldog"}')
174+
self.assertEqual(json.loads(dog.to_json()), {"className": "dog", "color": "white", "breed": "bulldog"})
174175
self.assertEqual(dog.to_dict(), {'breed': 'bulldog', 'className':
175176
'dog', 'color': 'white'})
176177
dog2 = petstore_api.Dog.from_json(dog.to_json())
@@ -194,7 +195,7 @@ def test_list(self):
194195
self.assertTrue("str type expected" in str(e))
195196

196197
l = petstore_api.ListClass(**{"123-list": "bulldog"})
197-
self.assertEqual(l.to_json(), '{"123-list":"bulldog"}')
198+
self.assertEqual(json.loads(l.to_json()), {'123-list': 'bulldog'})
198199
self.assertEqual(l.to_dict(), {'123-list': 'bulldog'})
199200

200201
l2 = petstore_api.ListClass.from_json(l.to_json())
@@ -206,16 +207,15 @@ def test_enum_ref_property(self):
206207
# test enum ref property
207208
# test to_json
208209
d = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1)
209-
self.assertEqual(d.to_json(), '{"value": 1}')
210+
self.assertEqual(json.loads(d.to_json()), {"value": 1})
210211
d2 = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1, str_value=petstore_api.OuterEnum.DELIVERED)
211-
self.assertEqual(d2.to_json(), '{"str_value": "delivered", "value": 1}')
212-
212+
self.assertEqual(json.loads(d2.to_json()), {"str_value": "delivered", "value": 1})
213213
# test from_json (round trip)
214214
d3 = petstore_api.OuterObjectWithEnumProperty.from_json(d2.to_json())
215215
assert d3 is not None
216216
self.assertEqual(d3.str_value, petstore_api.OuterEnum.DELIVERED)
217217
self.assertEqual(d3.value, petstore_api.OuterEnumInteger.NUMBER_1)
218-
self.assertEqual(d3.to_json(), '{"str_value": "delivered", "value": 1}')
218+
self.assertEqual(json.loads(d3.to_json()), {"str_value": "delivered", "value": 1})
219219

220220
def test_float_strict_type(self):
221221
# assigning 123 to float shouldn't throw an exception

‎samples/openapi3/client/petstore/python-httpx/tests/test_pet_model.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ def test_from_to_methods(self):
8282
assert pet.category is not None
8383
self.assertEqual(pet.category.id, 1)
8484
# test to_json
85-
self.assertEqual(pet.to_json(),
86-
'{"id": 1, "category": {"id": 1, "name": "dog"}, "name": "test name", "photoUrls": ['
87-
'"string"], "tags": [{"id": 1, "name": "None"}], "status": "available"}')
85+
self.assertEqual(json.loads(pet.to_json()),
86+
{"id": 1, "category": {"id": 1, "name": "dog"}, "name": "test name", "photoUrls": ["string"],
87+
"tags": [{"id": 1, "name": "None"}], "status": "available"})
8888

8989
# test to_dict
9090
self.assertEqual(pet.to_dict(),
@@ -109,13 +109,13 @@ def test_unpack_operator(self):
109109
id=123,
110110
photoUrls=["https://a.com", "https://b.com"],
111111
)
112-
self.assertEqual(pet.to_json(), '{"id": 123, "name": "required name", "photoUrls": ["https://a.com", "https://b.com"]}')
112+
self.assertEqual(json.loads(pet.to_json()), {"id": 123, "name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
113113
self.assertEqual(pet.to_dict(), {"id": 123, "name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
114114
def test_optional_fields(self):
115115
pet = petstore_api.Pet(name="required name",
116116
photoUrls=["https://a.com",
117117
"https://b.com"])
118-
self.assertEqual(pet.to_json(), '{"name": "required name", "photoUrls": ["https://a.com", "https://b.com"]}')
118+
self.assertEqual(json.loads(pet.to_json()), {"name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
119119
self.assertEqual(pet.to_dict(), {"name": "required name", "photoUrls": ["https://a.com", "https://b.com"]})
120120

121121

0 commit comments

Comments
 (0)