Adds test_passed_in_header_overrides_default + test_default_header_used_when_no_header_params_input

Author: spacether

modules/openapi-json-schema-generator/src/main/resources/python/api_client.handlebars

@@ -1055,15 +1055,17 @@ class ApiClient:
 
         # header parameters
         used_headers = HTTPHeaderDict(self.default_headers)
-        if headers:
-            used_headers.extend(headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path

samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/api_client.py

@@ -1056,15 +1056,17 @@ def __call_api(
 
         # header parameters
         used_headers = HTTPHeaderDict(self.default_headers)
-        if headers:
-            used_headers.extend(headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path

samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/api_client.py

@@ -1056,15 +1056,17 @@ def __call_api(
 
         # header parameters
         used_headers = HTTPHeaderDict(self.default_headers)
-        if headers:
-            used_headers.extend(headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path

samples/openapi3/client/petstore/python/petstore_api/api_client.py

@@ -1056,15 +1056,17 @@ def __call_api(
 
         # header parameters
         used_headers = HTTPHeaderDict(self.default_headers)
-        if headers:
-            used_headers.extend(headers)
         if self.cookie:
             headers['Cookie'] = self.cookie
 
         # auth setting
-        self.update_params_for_auth(headers,
+        self.update_params_for_auth(used_headers,
                                     auth_settings, resource_path, method, body)
 
+        # must happen after cookie setting and auth setting in case user is overriding those
+        if headers:
+            used_headers.update(headers)
+
         # request url
         if host is None:
             url = self.configuration.host + resource_path

samples/openapi3/client/petstore/python/tests_manual/test_paths/test_fake/__init__.py

@@ -0,0 +1,73 @@
+# coding: utf-8
+
+"""
+
+
+    Generated by: https://openapi-generator.tech
+"""
+
+import unittest
+from unittest.mock import patch
+
+import urllib3
+
+import petstore_api
+from petstore_api.paths.fake import get  # noqa: E501
+from petstore_api import configuration, schemas, api_client
+
+from ... import ApiTestMixin
+
+
+class TestFake(ApiTestMixin, unittest.TestCase):
+    """
+    Fake unit test stubs
+        To test enum parameters  # noqa: E501
+    """
+    used_api_client = api_client.ApiClient(
+        header_name='enum_header_string',
+        header_value='_abc'
+    )
+    api = get.ApiForget(api_client=used_api_client)
+
+    @patch.object(urllib3.PoolManager, 'request')
+    def test_passed_in_header_overrides_default(self, mock_request):
+        mock_request.return_value = self.response(b'')
+
+        api_response = self.api.get(header_params={'enum_header_string': '-efg'})
+        self.assert_pool_manager_request_called_with(
+            mock_request,
+            f'http://petstore.swagger.io:80/v2/fake',
+            body=None,
+            method='GET',
+            content_type=None,
+            accept_content_type=None,
+            headers={'enum_header_string': '-efg'}
+        )
+
+        assert isinstance(api_response.response, urllib3.HTTPResponse)
+        assert isinstance(api_response.body, schemas.Unset)
+        assert isinstance(api_response.headers, schemas.Unset)
+        assert api_response.response.status == 200
+
+    @patch.object(urllib3.PoolManager, 'request')
+    def test_default_header_used_when_no_header_params_input(self, mock_request):
+        mock_request.return_value = self.response(b'')
+
+        api_response = self.api.get()
+        self.assert_pool_manager_request_called_with(
+            mock_request,
+            f'http://petstore.swagger.io:80/v2/fake',
+            body=None,
+            method='GET',
+            content_type=None,
+            accept_content_type=None,
+            headers={'enum_header_string': '_abc'}
+        )
+
+        assert isinstance(api_response.response, urllib3.HTTPResponse)
+        assert isinstance(api_response.body, schemas.Unset)
+        assert isinstance(api_response.headers, schemas.Unset)
+        assert api_response.response.status == 200
+
+if __name__ == '__main__':
+    unittest.main()