Skip to content

Commit 8dbcd64

Browse files
tiangolotiangolo
authored
✅ Update tests, remove conditionals for Pydantic v1 (#1702)
1 parent 2cc11da commit 8dbcd64

12 files changed

Lines changed: 230 additions & 584 deletions

File tree

‎tests/test_tutorial/test_fastapi/test_delete/test_tutorial001.py‎

Lines changed: 20 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from types import ModuleType
33

44
import pytest
5-
from dirty_equals import IsDict
65
from fastapi.testclient import TestClient
76
from sqlmodel import create_engine
87
from sqlmodel.pool import StaticPool
@@ -300,16 +299,10 @@ def test_tutorial(module: ModuleType):
300299
"properties": {
301300
"name": {"title": "Name", "type": "string"},
302301
"secret_name": {"title": "Secret Name", "type": "string"},
303-
"age": IsDict(
304-
{
305-
"title": "Age",
306-
"anyOf": [{"type": "integer"}, {"type": "null"}],
307-
}
308-
)
309-
| IsDict(
310-
# TODO: remove when deprecating Pydantic v1
311-
{"title": "Age", "type": "integer"}
312-
),
302+
"age": {
303+
"title": "Age",
304+
"anyOf": [{"type": "integer"}, {"type": "null"}],
305+
},
313306
},
314307
},
315308
"HeroPublic": {
@@ -319,53 +312,29 @@ def test_tutorial(module: ModuleType):
319312
"properties": {
320313
"name": {"title": "Name", "type": "string"},
321314
"secret_name": {"title": "Secret Name", "type": "string"},
322-
"age": IsDict(
323-
{
324-
"title": "Age",
325-
"anyOf": [{"type": "integer"}, {"type": "null"}],
326-
}
327-
)
328-
| IsDict(
329-
# TODO: remove when deprecating Pydantic v1
330-
{"title": "Age", "type": "integer"}
331-
),
315+
"age": {
316+
"title": "Age",
317+
"anyOf": [{"type": "integer"}, {"type": "null"}],
318+
},
332319
"id": {"title": "Id", "type": "integer"},
333320
},
334321
},
335322
"HeroUpdate": {
336323
"title": "HeroUpdate",
337324
"type": "object",
338325
"properties": {
339-
"name": IsDict(
340-
{
341-
"title": "Name",
342-
"anyOf": [{"type": "string"}, {"type": "null"}],
343-
}
344-
)
345-
| IsDict(
346-
# TODO: remove when deprecating Pydantic v1
347-
{"title": "Name", "type": "string"}
348-
),
349-
"secret_name": IsDict(
350-
{
351-
"title": "Secret Name",
352-
"anyOf": [{"type": "string"}, {"type": "null"}],
353-
}
354-
)
355-
| IsDict(
356-
# TODO: remove when deprecating Pydantic v1
357-
{"title": "Secret Name", "type": "string"}
358-
),
359-
"age": IsDict(
360-
{
361-
"title": "Age",
362-
"anyOf": [{"type": "integer"}, {"type": "null"}],
363-
}
364-
)
365-
| IsDict(
366-
# TODO: remove when deprecating Pydantic v1
367-
{"title": "Age", "type": "integer"}
368-
),
326+
"name": {
327+
"title": "Name",
328+
"anyOf": [{"type": "string"}, {"type": "null"}],
329+
},
330+
"secret_name": {
331+
"title": "Secret Name",
332+
"anyOf": [{"type": "string"}, {"type": "null"}],
333+
},
334+
"age": {
335+
"title": "Age",
336+
"anyOf": [{"type": "integer"}, {"type": "null"}],
337+
},
369338
},
370339
},
371340
"ValidationError": {

‎tests/test_tutorial/test_fastapi/test_limit_and_offset/test_tutorial001.py‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from types import ModuleType
33

44
import pytest
5-
from dirty_equals import IsDict
65
from fastapi.testclient import TestClient
76
from sqlmodel import create_engine
87
from sqlmodel.pool import StaticPool
@@ -235,16 +234,10 @@ def test_tutorial(module: ModuleType):
235234
"properties": {
236235
"name": {"title": "Name", "type": "string"},
237236
"secret_name": {"title": "Secret Name", "type": "string"},
238-
"age": IsDict(
239-
{
240-
"title": "Age",
241-
"anyOf": [{"type": "integer"}, {"type": "null"}],
242-
}
243-
)
244-
| IsDict(
245-
# TODO: remove when deprecating Pydantic v1
246-
{"title": "Age", "type": "integer"}
247-
),
237+
"age": {
238+
"title": "Age",
239+
"anyOf": [{"type": "integer"}, {"type": "null"}],
240+
},
248241
},
249242
},
250243
"HeroPublic": {
@@ -254,16 +247,10 @@ def test_tutorial(module: ModuleType):
254247
"properties": {
255248
"name": {"title": "Name", "type": "string"},
256249
"secret_name": {"title": "Secret Name", "type": "string"},
257-
"age": IsDict(
258-
{
259-
"title": "Age",
260-
"anyOf": [{"type": "integer"}, {"type": "null"}],
261-
}
262-
)
263-
| IsDict(
264-
# TODO: remove when deprecating Pydantic v1
265-
{"title": "Age", "type": "integer"}
266-
),
250+
"age": {
251+
"title": "Age",
252+
"anyOf": [{"type": "integer"}, {"type": "null"}],
253+
},
267254
"id": {"title": "Id", "type": "integer"},
268255
},
269256
},

‎tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001.py‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from types import ModuleType
33

44
import pytest
5-
from dirty_equals import IsDict
65
from fastapi.testclient import TestClient
76
from sqlalchemy import inspect
87
from sqlalchemy.engine.reflection import Inspector
@@ -159,16 +158,10 @@ def test_tutorial(module: ModuleType):
159158
"properties": {
160159
"name": {"title": "Name", "type": "string"},
161160
"secret_name": {"title": "Secret Name", "type": "string"},
162-
"age": IsDict(
163-
{
164-
"title": "Age",
165-
"anyOf": [{"type": "integer"}, {"type": "null"}],
166-
}
167-
)
168-
| IsDict(
169-
# TODO: remove when deprecating Pydantic v1
170-
{"title": "Age", "type": "integer"}
171-
),
161+
"age": {
162+
"title": "Age",
163+
"anyOf": [{"type": "integer"}, {"type": "null"}],
164+
},
172165
},
173166
},
174167
"HeroPublic": {
@@ -179,16 +172,10 @@ def test_tutorial(module: ModuleType):
179172
"id": {"title": "Id", "type": "integer"},
180173
"name": {"title": "Name", "type": "string"},
181174
"secret_name": {"title": "Secret Name", "type": "string"},
182-
"age": IsDict(
183-
{
184-
"title": "Age",
185-
"anyOf": [{"type": "integer"}, {"type": "null"}],
186-
}
187-
)
188-
| IsDict(
189-
# TODO: remove when deprecating Pydantic v1
190-
{"title": "Age", "type": "integer"}
191-
),
175+
"age": {
176+
"title": "Age",
177+
"anyOf": [{"type": "integer"}, {"type": "null"}],
178+
},
192179
},
193180
},
194181
"ValidationError": {

‎tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial002.py‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from types import ModuleType
33

44
import pytest
5-
from dirty_equals import IsDict
65
from fastapi.testclient import TestClient
76
from sqlalchemy import inspect
87
from sqlalchemy.engine.reflection import Inspector
@@ -159,16 +158,10 @@ def test_tutorial(module: ModuleType):
159158
"properties": {
160159
"name": {"title": "Name", "type": "string"},
161160
"secret_name": {"title": "Secret Name", "type": "string"},
162-
"age": IsDict(
163-
{
164-
"title": "Age",
165-
"anyOf": [{"type": "integer"}, {"type": "null"}],
166-
}
167-
)
168-
| IsDict(
169-
# TODO: remove when deprecating Pydantic v1
170-
{"title": "Age", "type": "integer"}
171-
),
161+
"age": {
162+
"title": "Age",
163+
"anyOf": [{"type": "integer"}, {"type": "null"}],
164+
},
172165
},
173166
},
174167
"HeroPublic": {
@@ -178,16 +171,10 @@ def test_tutorial(module: ModuleType):
178171
"properties": {
179172
"name": {"title": "Name", "type": "string"},
180173
"secret_name": {"title": "Secret Name", "type": "string"},
181-
"age": IsDict(
182-
{
183-
"title": "Age",
184-
"anyOf": [{"type": "integer"}, {"type": "null"}],
185-
}
186-
)
187-
| IsDict(
188-
# TODO: remove when deprecating Pydantic v1
189-
{"title": "Age", "type": "integer"}
190-
),
174+
"age": {
175+
"title": "Age",
176+
"anyOf": [{"type": "integer"}, {"type": "null"}],
177+
},
191178
"id": {"title": "Id", "type": "integer"},
192179
},
193180
},

‎tests/test_tutorial/test_fastapi/test_read_one/test_tutorial001.py‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from types import ModuleType
33

44
import pytest
5-
from dirty_equals import IsDict
65
from fastapi.testclient import TestClient
76
from sqlmodel import create_engine
87
from sqlmodel.pool import StaticPool
@@ -178,16 +177,10 @@ def test_tutorial(module: ModuleType):
178177
"properties": {
179178
"name": {"title": "Name", "type": "string"},
180179
"secret_name": {"title": "Secret Name", "type": "string"},
181-
"age": IsDict(
182-
{
183-
"title": "Age",
184-
"anyOf": [{"type": "integer"}, {"type": "null"}],
185-
}
186-
)
187-
| IsDict(
188-
# TODO: remove when deprecating Pydantic v1
189-
{"title": "Age", "type": "integer"}
190-
),
180+
"age": {
181+
"title": "Age",
182+
"anyOf": [{"type": "integer"}, {"type": "null"}],
183+
},
191184
},
192185
},
193186
"HeroPublic": {
@@ -197,16 +190,10 @@ def test_tutorial(module: ModuleType):
197190
"properties": {
198191
"name": {"title": "Name", "type": "string"},
199192
"secret_name": {"title": "Secret Name", "type": "string"},
200-
"age": IsDict(
201-
{
202-
"title": "Age",
203-
"anyOf": [{"type": "integer"}, {"type": "null"}],
204-
}
205-
)
206-
| IsDict(
207-
# TODO: remove when deprecating Pydantic v1
208-
{"title": "Age", "type": "integer"}
209-
),
193+
"age": {
194+
"title": "Age",
195+
"anyOf": [{"type": "integer"}, {"type": "null"}],
196+
},
210197
"id": {"title": "Id", "type": "integer"},
211198
},
212199
},

0 commit comments

Comments
 (0)