[formrecognizer] use kwargs where we don't record tests

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py

@@ -20,13 +20,17 @@
 class TestDACAnalyzeCustomModel(FormRecognizerTest):
 
     @FormRecognizerPreparer()
-    def test_analyze_document_none_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    def test_analyze_document_none_model_id(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             client.begin_analyze_document(model=None, document=b"xx")
 
     @FormRecognizerPreparer()
-    def test_analyze_document_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    def test_analyze_document_empty_model_id(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             client.begin_analyze_document(model="", document=b"xx")

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py

@@ -24,14 +24,18 @@
 class TestDACAnalyzeCustomModelAsync(AsyncFormRecognizerTest):
 
     @FormRecognizerPreparer()
-    async def test_analyze_document_none_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    async def test_analyze_document_none_model_id(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             async with client:
                 await client.begin_analyze_document(model=None, document=b"xx")
 
     @FormRecognizerPreparer()
-    async def test_analyze_document_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    async def test_analyze_document_empty_model_id(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             async with client:

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py

@@ -20,13 +20,17 @@
 class TestDACAnalyzeCustomModelFromUrl(FormRecognizerTest):
 
     @FormRecognizerPreparer()
-    def test_document_analysis_none_model(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    def test_document_analysis_none_model(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             client.begin_analyze_document_from_url(model=None, document_url="https://badurl.jpg")
 
     @FormRecognizerPreparer()
-    def test_document_analysis_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    def test_document_analysis_empty_model_id(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             client.begin_analyze_document_from_url(model="", document_url="https://badurl.jpg")

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py

@@ -22,14 +22,18 @@
 class TestDACAnalyzeCustomModelFromUrlAsync(AsyncFormRecognizerTest):
 
     @FormRecognizerPreparer()
-    async def test_document_analysis_none_model(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    async def test_document_analysis_none_model(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             async with client:
                 await client.begin_analyze_document_from_url(model=None, document_url="https://badurl.jpg")
 
     @FormRecognizerPreparer()
-    async def test_document_analysis_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs):
+    async def test_document_analysis_empty_model_id(self, **kwargs):
+        formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint")
+        formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key")
         client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key))
         with pytest.raises(ValueError):
             async with client:

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts.py

@@ -217,7 +217,8 @@ def test_invoice_jpg(self, client):
 
     @FormRecognizerPreparer()
     @DocumentAnalysisClientPreparer()
-    def test_fail_passing_content_type(self, client):
+    def test_fail_passing_content_type(self, **kwargs):
+        client = kwargs.pop("client")
         with open(self.receipt_png, "rb") as fd:
             myfile = fd.read()
         with pytest.raises(TypeError):
@@ -486,7 +487,8 @@ def callback(raw_response, _, headers):
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentAnalysisClientPreparer()
-    def test_receipt_continuation_token(self, client):
+    def test_receipt_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
 
         with open(self.receipt_jpg, "rb") as fd:
             receipt = fd.read()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_async.py

@@ -66,7 +66,8 @@ async def test_blank_page(self, client):
 
     @FormRecognizerPreparer()
     @DocumentAnalysisClientPreparer()
-    async def test_passing_unsupported_url_content_type(self, client, **kwargs):
+    async def test_passing_unsupported_url_content_type(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(TypeError):
             async with client:
                 poller = await client.begin_analyze_document("prebuilt-receipt", "https://badurl.jpg", content_type="application/json")
@@ -283,7 +284,8 @@ def callback(raw_response, _, headers):
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentAnalysisClientPreparer()
-    async def test_receipt_continuation_token(self, client):
+    async def test_receipt_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
 
         with open(self.receipt_jpg, "rb") as fd:
             receipt = fd.read()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url.py

@@ -355,7 +355,8 @@ def callback(raw_response, _, headers):
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentAnalysisClientPreparer()
-    def test_receipt_continuation_token(self, client):
+    def test_receipt_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
 
         initial_poller = client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg)
         cont_token = initial_poller.continuation_token()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url_async.py

@@ -390,7 +390,8 @@ def callback(raw_response, _, headers):
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentAnalysisClientPreparer()
-    async def test_receipt_continuation_token(self, client):
+    async def test_receipt_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
 
         async with client:
             initial_poller = await client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg)

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py

@@ -84,8 +84,9 @@ def callback(response, _, headers):
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    def test_compose_continuation_token(self, client, formrecognizer_storage_container_sas_url):
-
+    def test_compose_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
+        formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url")
         poller = client.begin_build_model(formrecognizer_storage_container_sas_url)
         model_1 = poller.result()
 

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py

@@ -87,8 +87,9 @@ def callback(response, _, headers):
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    async def test_compose_continuation_token(self, client, formrecognizer_storage_container_sas_url):
-
+    async def test_compose_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
+        formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url")
         async with client:
             poller = await client.begin_build_model(formrecognizer_storage_container_sas_url)
             model_1 = await poller.result()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py

@@ -178,8 +178,9 @@ def test_copy_model_with_composed_model(self, client, formrecognizer_storage_con
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
     @pytest.mark.skip()
-    def test_copy_continuation_token(self, client, formrecognizer_storage_container_sas_url):
-
+    def test_copy_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
+        formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url")
         poller = client.begin_build_model(formrecognizer_storage_container_sas_url)
         model = poller.result()
 

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py

@@ -180,7 +180,9 @@ async def test_copy_model_with_composed_model(self, client, formrecognizer_stora
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
     @pytest.mark.skip()
-    async def test_copy_continuation_token(self, client, formrecognizer_storage_container_sas_url):
+    async def test_copy_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
+        formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url")
         async with client:
             poller = await client.begin_build_model(formrecognizer_storage_container_sas_url)
             model = await poller.result()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py

@@ -44,25 +44,29 @@ def test_dmac_auth_bad_key(self, formrecognizer_test_endpoint, formrecognizer_te
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    def test_get_model_empty_model_id(self, client):
+    def test_get_model_empty_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             result = client.get_model("")
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    def test_get_model_none_model_id(self, client):
+    def test_get_model_none_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             result = client.get_model(None)
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    def test_delete_model_none_model_id(self, client):
+    def test_delete_model_none_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             result = client.delete_model(None)
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    def test_delete_model_empty_model_id(self, client):
+    def test_delete_model_empty_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             result = client.delete_model("")
 
@@ -177,7 +181,8 @@ def test_get_list_operations(self, client):
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    def test_get_operation_bad_model_id(self, client):
+    def test_get_operation_bad_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             client.get_operation("")
         with pytest.raises(ValueError):

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py

@@ -47,28 +47,32 @@ async def test_dmac_auth_bad_key(self, formrecognizer_test_endpoint, formrecogni
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    async def test_get_model_empty_model_id(self, client):
+    async def test_get_model_empty_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             async with client:
                 result = await client.get_model("")
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    async def test_get_model_none_model_id(self, client):
+    async def test_get_model_none_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             async with client:
                 result = await client.get_model(None)
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    async def test_delete_model_none_model_id(self, client):
+    async def test_delete_model_none_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             async with client:
                 result = await client.delete_model(None)
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    async def test_delete_model_empty_model_id(self, client):
+    async def test_delete_model_empty_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             async with client:
                 result = await client.delete_model("")
@@ -187,7 +191,8 @@ async def test_get_list_operations(self, client):
 
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    async def test_get_operation_bad_model_id(self, client):
+    async def test_get_operation_bad_model_id(self, **kwargs):
+        client = kwargs.pop("client")
         with pytest.raises(ValueError):
             await client.get_operation("")
         with pytest.raises(ValueError):

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py

@@ -214,8 +214,9 @@ def test_build_model_azure_blob_path_filter(self, client, formrecognizer_storage
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    def test_build_model_continuation_token(self, client, formrecognizer_storage_container_sas_url):
-
+    def test_build_model_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
+        formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url")
         initial_poller = client.begin_build_model(formrecognizer_storage_container_sas_url)
         cont_token = initial_poller.continuation_token()
         poller = client.begin_build_model(None, continuation_token=cont_token)

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py

@@ -224,7 +224,9 @@ async def test_build_model_azure_blob_path_filter(self, client, formrecognizer_s
     @pytest.mark.live_test_only
     @FormRecognizerPreparer()
     @DocumentModelAdministrationClientPreparer()
-    async def test_build_model_continuation_token(self, client, formrecognizer_storage_container_sas_url):
+    async def test_build_model_continuation_token(self, **kwargs):
+        client = kwargs.pop("client")
+        formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url")
         async with client:
             initial_poller = await client.begin_build_model(formrecognizer_storage_container_sas_url)
             cont_token = initial_poller.continuation_token()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card.py

@@ -36,7 +36,8 @@ def test_passing_enum_content_type(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer()
-    def test_damaged_file_bytes_fails_autodetect_content_type(self, client):
+    def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs):
+        client = kwargs.pop("client")
         damaged_pdf = b"\x50\x44\x46\x55\x55\x55"  # doesn't match any magic file numbers
         with pytest.raises(ValueError):
             poller = client.begin_recognize_business_cards(
@@ -45,7 +46,8 @@ def test_damaged_file_bytes_fails_autodetect_content_type(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer()
-    def test_damaged_file_bytes_io_fails_autodetect(self, client):
+    def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs):
+        client = kwargs.pop("client")
         damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55")  # doesn't match any magic file numbers
         with pytest.raises(ValueError):
             poller = client.begin_recognize_business_cards(
@@ -54,7 +56,8 @@ def test_damaged_file_bytes_io_fails_autodetect(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer()
-    def test_passing_bad_content_type_param_passed(self, client):
+    def test_passing_bad_content_type_param_passed(self, **kwargs):
+        client = kwargs.pop("client")
         with open(self.business_card_jpg, "rb") as fd:
             myfile = fd.read()
         with pytest.raises(ValueError):
@@ -181,7 +184,8 @@ def test_business_card_jpg_include_field_elements(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0})
-    def test_business_card_v2(self, client):
+    def test_business_card_v2(self, **kwargs):
+        client = kwargs.pop("client")
 
         with open(self.business_card_jpg, "rb") as fd:
             business_card = fd.read()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_async.py

@@ -36,7 +36,8 @@ async def test_passing_enum_content_type(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer()
-    async def test_damaged_file_bytes_fails_autodetect_content_type(self, client):
+    async def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs):
+        client = kwargs.pop("client")
         damaged_pdf = b"\x50\x44\x46\x55\x55\x55"  # doesn't match any magic file numbers
         with pytest.raises(ValueError):
             async with client:
@@ -46,7 +47,8 @@ async def test_damaged_file_bytes_fails_autodetect_content_type(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer()
-    async def test_damaged_file_bytes_io_fails_autodetect(self, client):
+    async def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs):
+        client = kwargs.pop("client")
         damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55")  # doesn't match any magic file numbers
         with pytest.raises(ValueError):
             async with client:
@@ -57,7 +59,8 @@ async def test_damaged_file_bytes_io_fails_autodetect(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer()
-    async def test_passing_bad_content_type_param_passed(self, client):
+    async def test_passing_bad_content_type_param_passed(self, **kwargs):
+        client = kwargs.pop("client")
         with open(self.business_card_jpg, "rb") as fd:
             myfile = fd.read()
         with pytest.raises(ValueError):
@@ -122,7 +125,8 @@ async def test_business_card_jpg_include_field_elements(self, client):
 
     @FormRecognizerPreparer()
     @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0})
-    async def test_business_card_v2(self, client):
+    async def test_business_card_v2(self, **kwargs):
+        client = kwargs.pop("client")
         with open(self.business_card_jpg, "rb") as fd:
             business_card = fd.read()
         with pytest.raises(ValueError) as e: