From 49cf3fdcf8f56a57bad8ba41d4c8120eb2b42167 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Wed, 31 Jul 2024 22:44:18 +0200
Subject: [PATCH] TST (string dtype): replace string_storage fixture with
 explicit storage/na_value keyword arguments for dtype creation (#59375)

---
 pandas/conftest.py                         | 18 ++++++++++++++++++
 pandas/tests/arrays/string_/test_string.py |  7 ++++---
 pandas/tests/extension/test_string.py      |  5 +++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pandas/conftest.py b/pandas/conftest.py
index a502152780a27..39d4e25e4cbfd 100644
--- a/pandas/conftest.py
+++ b/pandas/conftest.py
@@ -1262,6 +1262,24 @@ def string_storage(request):
     return request.param
 
 
+@pytest.fixture(
+    params=[
+        ("python", pd.NA),
+        pytest.param(("pyarrow", pd.NA), marks=td.skip_if_no("pyarrow")),
+        pytest.param(("pyarrow", np.nan), marks=td.skip_if_no("pyarrow")),
+    ]
+)
+def string_dtype_arguments(request):
+    """
+    Parametrized fixture for StringDtype storage and na_value.
+
+    * 'python' + pd.NA
+    * 'pyarrow' + pd.NA
+    * 'pyarrow' + np.nan
+    """
+    return request.param
+
+
 @pytest.fixture(
     params=[
         "numpy_nullable",
diff --git a/pandas/tests/arrays/string_/test_string.py b/pandas/tests/arrays/string_/test_string.py
index 1c55c1d8f3e2e..b1c5f4338a4ed 100644
--- a/pandas/tests/arrays/string_/test_string.py
+++ b/pandas/tests/arrays/string_/test_string.py
@@ -22,9 +22,10 @@
 
 
 @pytest.fixture
-def dtype(string_storage):
-    """Fixture giving StringDtype from parametrized 'string_storage'"""
-    return pd.StringDtype(storage=string_storage)
+def dtype(string_dtype_arguments):
+    """Fixture giving StringDtype from parametrized storage and na_value arguments"""
+    storage, na_value = string_dtype_arguments
+    return pd.StringDtype(storage=storage, na_value=na_value)
 
 
 @pytest.fixture
diff --git a/pandas/tests/extension/test_string.py b/pandas/tests/extension/test_string.py
index 895640d9fbeaa..1102d9d941663 100644
--- a/pandas/tests/extension/test_string.py
+++ b/pandas/tests/extension/test_string.py
@@ -58,8 +58,9 @@ def chunked(request):
 
 
 @pytest.fixture
-def dtype(string_storage):
-    return StringDtype(storage=string_storage)
+def dtype(string_dtype_arguments):
+    storage, na_value = string_dtype_arguments
+    return StringDtype(storage=storage, na_value=na_value)
 
 
 @pytest.fixture