Merge 83db81d001 into 1d434dec47

tests/test_tutorial/test_path_params/test_tutorial004.py

@@ -1,3 +1,4 @@
+import pytest
 from fastapi.testclient import TestClient
 
 from docs_src.path_params.tutorial004 import app
@@ -5,18 +6,18 @@ from docs_src.path_params.tutorial004 import app
 client = TestClient(app)
 
 
-def test_file_path():
+test_data = [
-    response = client.get("/files/home/johndoe/myfile.txt")
+    ("/files/data/monthly-2024.csv", {"file_path": "data/monthly-2024.csv"}),
-    print(response.content)
+    ("/files/home/johndoe/myfile.txt", {"file_path": "home/johndoe/myfile.txt"}),
-    assert response.status_code == 200, response.text
+    ("/files//home/johndoe/myfile.txt", {"file_path": "/home/johndoe/myfile.txt"}),
-    assert response.json() == {"file_path": "home/johndoe/myfile.txt"}
+]
 
 
-def test_root_file_path():
+@pytest.mark.parametrize("url_path, expected_response", test_data)
-    response = client.get("/files//home/johndoe/myfile.txt")
+def test_file_paths(url_path, expected_response):
-    print(response.content)
+    response = client.get(url_path)
-    assert response.status_code == 200, response.text
+    assert response.status_code == 200
-    assert response.json() == {"file_path": "/home/johndoe/myfile.txt"}
+    assert response.json() == expected_response
 
 
 def test_openapi_schema():

tests/test_tutorial/test_path_params/test_tutorial005.py

@@ -1,3 +1,4 @@
+import pytest
 from dirty_equals import IsDict
 from fastapi.testclient import TestClient
 
@@ -6,22 +7,18 @@ from docs_src.path_params.tutorial005 import app
 client = TestClient(app)
 
 
-def test_get_enums_alexnet():
+test_data = [
-    response = client.get("/models/alexnet")
+    ("/models/alexnet", {"model_name": "alexnet", "message": "Deep Learning FTW!"}),
-    assert response.status_code == 200
+    ("/models/lenet", {"model_name": "lenet", "message": "LeCNN all the images"}),
-    assert response.json() == {"model_name": "alexnet", "message": "Deep Learning FTW!"}
+    ("/models/resnet", {"model_name": "resnet", "message": "Have some residuals"}),
-
+]
-
-def test_get_enums_lenet():
-    response = client.get("/models/lenet")
-    assert response.status_code == 200
-    assert response.json() == {"model_name": "lenet", "message": "LeCNN all the images"}
 
 
-def test_get_enums_resnet():
+@pytest.mark.parametrize("url_path, expected_response", test_data)
-    response = client.get("/models/resnet")
+def test_get_enums(url_path, expected_response):
+    response = client.get(url_path)
     assert response.status_code == 200
-    assert response.json() == {"model_name": "resnet", "message": "Have some residuals"}
+    assert response.json() == expected_response
 
 
 def test_get_enums_invalid():