From 2942362269e74634c7022c4d4c0709dfe1abcad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Garc=C3=ADa=20de=20Bustos?= Date: Tue, 21 May 2024 13:35:30 +0100 Subject: [PATCH] Updated tests --- tests/basic_test.py | 15 ++++++++------- tests/requirements.txt | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/basic_test.py b/tests/basic_test.py index ea116c5..024be02 100644 --- a/tests/basic_test.py +++ b/tests/basic_test.py @@ -5,9 +5,10 @@ import requests import pytest from openapi_spec_validator import ( - openapi_v2_spec_validator, - openapi_v30_spec_validator, - openapi_v31_spec_validator, + validate, + OpenAPIV2SpecValidator, + OpenAPIV30SpecValidator, + OpenAPIV31SpecValidator ) from openapi_spec_validator.validation.exceptions import OpenAPIValidationError @@ -44,7 +45,7 @@ NOT_A_DATE_MSG = "is not a 'date'" VALUE_ERROR_MISSING = "missing" VALUE_ERROR_DATE = "date_from_datetime_parsing" -VALUE_ERROR_DATETIME = "datetime_parsing" +VALUE_ERROR_DATETIME = "datetime_from_date_parsing" def _get_request(url): @@ -86,7 +87,7 @@ def test_get_swagger_json_is_valid_openapi_v3_1(): """Verify that /api/swagger.json file complies with OpenAPI v3.1""" response = _get_request(ROOT_URL + SWAGGER_JSON_PATH) spec_dict = loads(response.text) - openapi_v31_spec_validator.validate(spec_dict) + validate(spec_dict, cls=OpenAPIV31SpecValidator) assert response.status_code == HTTPStatus.OK @@ -95,7 +96,7 @@ def test_get_swagger_json_is_not_valid_openapi_v3_0(): response = _get_request(ROOT_URL + SWAGGER_JSON_PATH) spec_dict = loads(response.text) with pytest.raises(OpenAPIValidationError): - openapi_v30_spec_validator.validate(spec_dict) + validate(spec_dict, cls=OpenAPIV30SpecValidator) assert response.status_code == HTTPStatus.OK @@ -104,7 +105,7 @@ def test_get_swagger_json_is_not_valid_openapi_v2(): response = _get_request(ROOT_URL + SWAGGER_JSON_PATH) spec_dict = loads(response.text) with pytest.raises(OpenAPIValidationError): - openapi_v2_spec_validator.validate(spec_dict) + validate(spec_dict, cls=OpenAPIV2SpecValidator) assert response.status_code == HTTPStatus.OK diff --git a/tests/requirements.txt b/tests/requirements.txt index a01804a..94c560d 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ -pytest==8.0.0 -requests==2.31.0 +pytest==8.2.1 +requests==2.32.1 openapi_spec_validator==0.7.1