Standardize mock_response_factory usage in active_zone_minutes tests

jpstroop · jpstroop · commit ed7fb8900e8b · 2025-03-10T16:36:26.000-07:00
diff --git a/standardize_mock_responses.py b/standardize_mock_responses.py
@@ -114,6 +114,15 @@ def fix_mock_response_usage(match):
         return test_func
 
     content = re.sub(pattern5, fix_mock_response_usage, content, flags=re.DOTALL)
+    
+    # Pattern 6: Replace assert result == mock_response.json.return_value with assert result == expected_data
+    pattern6 = r'([ \t]*assert\s+.*?==\s*)mock_response\.json\.return_value'
+    
+    def fix_assertions(match):
+        before_part = match.group(1)
+        return f"{before_part}mock_response.json()"
+    
+    content = re.sub(pattern6, fix_assertions, content)
 
     # If no changes were made, return False
     if content == original_content:
@@ -130,37 +139,68 @@ def fix_mock_response_usage(match):
 def find_files_to_transform() -> List[Tuple[str, bool]]:
     """Find all test files that need to be transformed."""
     test_dir = Path("tests")
+    # Allow specifying a subdirectory
+    if len(sys.argv) > 1 and not sys.argv[1].startswith("--"):
+        test_dir = Path(sys.argv[1])
+        print(f"Searching in directory: {test_dir}")
+    
     result = []
-
+    verbose = "--verbose" in sys.argv
+    
     for root, _, files in os.walk(test_dir):
         for file in files:
             if file.endswith(".py") and file.startswith("test_"):
                 file_path = os.path.join(root, file)
-
-                # Check if file uses mock_response directly
+                
+                # First check for any mention of mock_response
+                has_mock_response = bool(find_pattern_in_file(file_path, r"mock_response"))
+                
+                if not has_mock_response:
+                    continue
+                
+                # More detailed patterns
+                # Check if file uses mock_response directly as parameter
                 uses_mock_response = bool(
                     find_pattern_in_file(
                         file_path, r"def\s+test_\w+\([^)]*,\s*mock_response\s*[,)]"
                     )
                 )
-
+                
                 # Check if file directly manipulates mock_response
                 manipulates_mock_response = bool(
                     find_pattern_in_file(
                         file_path, r"mock_response\.(json\.return_value|status_code)\s*="
                     )
                 )
-
+                
+                # Check if file uses mock_response.json.return_value in assertions
+                uses_return_value_in_assertions = bool(
+                    find_pattern_in_file(
+                        file_path, r"assert\s+.*?=.*?mock_response\.json\.return_value"
+                    )
+                )
+                
                 # Check if file uses mock_response_factory
                 uses_factory = bool(
                     find_pattern_in_file(file_path, r"mock_response\s*=\s*mock_response_factory")
                 )
-
+                
                 # Determine if file needs transformation
-                needs_transform = (
-                    uses_mock_response or manipulates_mock_response
-                ) and not uses_factory
-
+                needs_transform = (uses_mock_response or manipulates_mock_response) and not uses_factory
+                
+                # Also flag files that use factory but still use mock_response.json.return_value in assertions
+                if uses_factory and uses_return_value_in_assertions and not needs_transform:
+                    needs_transform = True
+                
+                if verbose or needs_transform:
+                    print(f"File: {file_path}")
+                    print(f"  Has mock_response: {has_mock_response}")
+                    print(f"  Uses as parameter: {uses_mock_response}")
+                    print(f"  Manipulates: {manipulates_mock_response}")
+                    print(f"  Uses in assertions: {uses_return_value_in_assertions}")
+                    print(f"  Uses factory: {uses_factory}")
+                    print(f"  Needs transform: {needs_transform}")
+                
                 if needs_transform:
                     result.append((file_path, needs_transform))
 
diff --git a/tests/fitbit_client/resources/active_zone_minutes/test_get_azm_timeseries.py b/tests/fitbit_client/resources/active_zone_minutes/test_get_azm_timeseries.py
@@ -5,10 +5,11 @@
 
 def test_get_azm_timeseries_with_today_date(azm_resource, mock_response_factory):
     """Test using 'today' as the date parameter"""
-    mock_response = mock_response_factory(200, {"activities-active-zone-minutes": []})
+    expected_data = {"activities-active-zone-minutes": []}
+    mock_response = mock_response_factory(200, expected_data)
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_date(date="today")
-    assert result == mock_response.json.return_value
+    assert result == expected_data
     azm_resource.oauth.request.assert_called_once_with(
         "GET",
         "https://api.fitbit.com/1/user/-/activities/active-zone-minutes/date/today/1d.json",
diff --git a/tests/fitbit_client/resources/active_zone_minutes/test_get_azm_timeseries_by_date.py b/tests/fitbit_client/resources/active_zone_minutes/test_get_azm_timeseries_by_date.py
@@ -15,25 +15,23 @@
 
 def test_get_azm_timeseries_by_date_success(azm_resource, mock_response_factory):
     """Test successful retrieval of AZM time series by date with default period"""
-    mock_response = mock_response_factory(
-        200,
-        {
-            "activities-active-zone-minutes": [
-                {
-                    "dateTime": "2025-02-01",
-                    "value": {
-                        "activeZoneMinutes": 102,
-                        "fatBurnActiveZoneMinutes": 90,
-                        "cardioActiveZoneMinutes": 8,
-                        "peakActiveZoneMinutes": 4,
-                    },
-                }
-            ]
-        },
-    )
+    expected_data = {
+        "activities-active-zone-minutes": [
+            {
+                "dateTime": "2025-02-01",
+                "value": {
+                    "activeZoneMinutes": 102,
+                    "fatBurnActiveZoneMinutes": 90,
+                    "cardioActiveZoneMinutes": 8,
+                    "peakActiveZoneMinutes": 4,
+                },
+            }
+        ]
+    }
+    mock_response = mock_response_factory(200, expected_data)
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_date(date="2025-02-01")
-    assert result == mock_response.json.return_value
+    assert result == expected_data
     azm_resource.oauth.request.assert_called_once_with(
         "GET",
         "https://api.fitbit.com/1/user/-/activities/active-zone-minutes/date/2025-02-01/1d.json",
@@ -46,10 +44,11 @@ def test_get_azm_timeseries_by_date_success(azm_resource, mock_response_factory)
 
 def test_get_azm_timeseries_by_date_explicit_period(azm_resource, mock_response_factory):
     """Test successful retrieval of AZM time series by date with explicit ONE_DAY period"""
-    mock_response = mock_response_factory(200, {"activities-active-zone-minutes": []})
+    expected_data = {"activities-active-zone-minutes": []}
+    mock_response = mock_response_factory(200, expected_data)
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_date(date="2025-02-01", period=Period.ONE_DAY)
-    assert result == mock_response.json.return_value
+    assert result == expected_data
     azm_resource.oauth.request.assert_called_once_with(
         "GET",
         "https://api.fitbit.com/1/user/-/activities/active-zone-minutes/date/2025-02-01/1d.json",
@@ -62,10 +61,11 @@ def test_get_azm_timeseries_by_date_explicit_period(azm_resource, mock_response_
 
 def test_get_azm_timeseries_by_date_with_user_id(azm_resource, mock_response_factory):
     """Test getting AZM time series for a specific user"""
-    mock_response = mock_response_factory(200, {"activities-active-zone-minutes": []})
+    expected_data = {"activities-active-zone-minutes": []}
+    mock_response = mock_response_factory(200, expected_data)
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_date(date="2025-02-01", user_id="123ABC")
-    assert result == mock_response.json.return_value
+    assert result == expected_data
     azm_resource.oauth.request.assert_called_once_with(
         "GET",
         "https://api.fitbit.com/1/user/123ABC/activities/active-zone-minutes/date/2025-02-01/1d.json",
diff --git a/tests/fitbit_client/resources/active_zone_minutes/test_get_azm_timeseries_by_interval.py b/tests/fitbit_client/resources/active_zone_minutes/test_get_azm_timeseries_by_interval.py
@@ -18,35 +18,33 @@
 
 def test_get_azm_timeseries_by_interval_success(azm_resource, mock_response_factory):
     """Test successful retrieval of AZM time series by date range"""
-    mock_response = mock_response_factory(
-        200,
-        {
-            "activities-active-zone-minutes": [
-                {
-                    "dateTime": "2025-02-01",
-                    "value": {
-                        "activeZoneMinutes": 102,
-                        "fatBurnActiveZoneMinutes": 90,
-                        "cardioActiveZoneMinutes": 8,
-                        "peakActiveZoneMinutes": 4,
-                    },
+    expected_data = {
+        "activities-active-zone-minutes": [
+            {
+                "dateTime": "2025-02-01",
+                "value": {
+                    "activeZoneMinutes": 102,
+                    "fatBurnActiveZoneMinutes": 90,
+                    "cardioActiveZoneMinutes": 8,
+                    "peakActiveZoneMinutes": 4,
                 },
-                {
-                    "dateTime": "2025-02-02",
-                    "value": {
-                        "activeZoneMinutes": 47,
-                        "fatBurnActiveZoneMinutes": 43,
-                        "cardioActiveZoneMinutes": 4,
-                    },
+            },
+            {
+                "dateTime": "2025-02-02",
+                "value": {
+                    "activeZoneMinutes": 47,
+                    "fatBurnActiveZoneMinutes": 43,
+                    "cardioActiveZoneMinutes": 4,
                 },
-            ]
-        },
-    )
+            },
+        ]
+    }
+    mock_response = mock_response_factory(200, expected_data)
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_interval(
         start_date="2025-02-01", end_date="2025-02-02"
     )
-    assert result == mock_response.json.return_value
+    assert result == expected_data
     azm_resource.oauth.request.assert_called_once_with(
         "GET",
         "https://api.fitbit.com/1/user/-/activities/active-zone-minutes/date/2025-02-01/2025-02-02.json",
@@ -59,12 +57,13 @@ def test_get_azm_timeseries_by_interval_success(azm_resource, mock_response_fact
 
 def test_get_azm_timeseries_by_interval_with_user_id(azm_resource, mock_response_factory):
     """Test getting AZM time series by date range for a specific user"""
-    mock_response = mock_response_factory(200, {"activities-active-zone-minutes": []})
+    expected_data = {"activities-active-zone-minutes": []}
+    mock_response = mock_response_factory(200, expected_data)
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_interval(
         start_date="2025-02-01", end_date="2025-02-02", user_id="123ABC"
     )
-    assert result == mock_response.json.return_value
+    assert result == expected_data
     azm_resource.oauth.request.assert_called_once_with(
         "GET",
         "https://api.fitbit.com/1/user/123ABC/activities/active-zone-minutes/date/2025-02-01/2025-02-02.json",
