refactor tests: replace list method with list_avds in AVD management tests and integrations

Author: allnes

tests/android/installer/test_avd.py

@@ -137,15 +137,15 @@ def test_list_empty(self, mock_run):
         """Test listing AVDs when none exist."""
         mock_run.return_value = Mock(returncode=0, stdout="")
 
-        avds = self.manager.list()
+        avds = self.manager.list_avds()
         assert avds == []
 
     @patch.object(AvdManager, "_run_avdmanager")
     def test_list_with_avds(self, mock_run):
         """Test listing AVDs."""
         mock_run.return_value = Mock(returncode=0, stdout="test_avd1\ntest_avd2\ntest_avd3\n")
 
-        avds = self.manager.list()
+        avds = self.manager.list_avds()
         assert len(avds) == 3
         assert "test_avd1" in avds
         assert "test_avd2" in avds
@@ -156,11 +156,11 @@ def test_list_error(self, mock_run):
         """Test listing AVDs with error."""
         mock_run.side_effect = AvdManagerError("list", "avd", "error")
 
-        avds = self.manager.list()
+        avds = self.manager.list_avds()
         assert avds == []
 
     @patch.object(AvdManager, "_run_avdmanager")
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     def test_create_new_avd(self, mock_list, mock_run):
         """Test creating a new AVD."""
         # AVD doesn't exist initially
@@ -184,7 +184,7 @@ def test_create_new_avd(self, mock_list, mock_run):
         assert "-f" in args
 
     @patch.object(AvdManager, "_run_avdmanager")
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     @patch.object(AvdManager, "delete")
     def test_create_existing_avd_with_force(self, mock_delete, mock_list, mock_run):
         """Test creating an AVD that already exists with force."""
@@ -201,7 +201,7 @@ def test_create_existing_avd_with_force(self, mock_delete, mock_list, mock_run):
         mock_delete.assert_called_once_with("test_avd")
         mock_run.assert_called_once()
 
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     def test_create_existing_avd_without_force(self, mock_list):
         """Test creating an AVD that already exists without force."""
         # AVD exists
@@ -214,7 +214,7 @@ def test_create_existing_avd_without_force(self, mock_list):
         assert result is True  # Should return True without creating
 
     @patch.object(AvdManager, "_run_avdmanager")
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     def test_create_with_custom_device(self, mock_list, mock_run):
         """Test creating AVD with custom device profile."""
         mock_list.side_effect = [[], ["test_avd"]]
@@ -232,7 +232,7 @@ def test_create_with_custom_device(self, mock_list, mock_run):
         assert args[device_index + 1] == "pixel_7"
 
     @patch.object(AvdManager, "_run_avdmanager")
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     def test_create_failure(self, mock_list, mock_run):
         """Test AVD creation failure."""
         mock_list.side_effect = [[], []]  # AVD not created
@@ -242,7 +242,7 @@ def test_create_failure(self, mock_list, mock_run):
             self.manager.create(name="test_avd", api=30, target="google_atd", arch="arm64-v8a")
 
     @patch.object(AvdManager, "_run_avdmanager")
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     def test_delete_existing_avd(self, mock_list, mock_run):
         """Test deleting an existing AVD."""
         mock_list.return_value = ["test_avd"]
@@ -253,7 +253,7 @@ def test_delete_existing_avd(self, mock_list, mock_run):
         assert result is True
         mock_run.assert_called_once_with(["delete", "avd", "-n", "test_avd"])
 
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     def test_delete_nonexistent_avd(self, mock_list):
         """Test deleting a non-existent AVD."""
         mock_list.return_value = []
@@ -263,7 +263,7 @@ def test_delete_nonexistent_avd(self, mock_list):
         assert result is True  # Should return True even if doesn't exist
 
     @patch.object(AvdManager, "_run_avdmanager")
-    @patch.object(AvdManager, "list")
+    @patch.object(AvdManager, "list_avds")
     def test_delete_failure(self, mock_list, mock_run):
         """Test AVD deletion failure."""
         mock_list.return_value = ["test_avd"]

tests/android/installer/test_core.py

@@ -214,7 +214,7 @@ def test_verify(self):
         (self.sdk_root / "emulator" / "emulator").touch()
 
         with patch.object(self.installer.ndk, "list_installed") as mock_ndk_list:
-            with patch.object(self.installer.avd, "list") as mock_avd_list:
+            with patch.object(self.installer.avd, "list_avds") as mock_avd_list:
                 with patch.object(self.installer.sdk, "list_installed") as mock_sdk_list:
                     mock_ndk_list.return_value = [("r26d", Path("/opt/ndk"))]
                     mock_avd_list.return_value = ["test_avd"]
@@ -237,7 +237,7 @@ def test_verify_nothing_installed(self):
 
         shutil.rmtree(self.sdk_root)
 
-        with patch.object(self.installer.avd, "list") as mock_avd_list:
+        with patch.object(self.installer.avd, "list_avds") as mock_avd_list:
             with patch.object(self.installer.sdk, "list_installed") as mock_sdk_list:
                 mock_avd_list.return_value = []
                 mock_sdk_list.return_value = []

tests/android/installer/test_integration.py

@@ -104,7 +104,7 @@ def test_verify_complete_installation(self):
         installer = AndroidInstaller(self.sdk_root)
 
         # Mock AVD list
-        with patch.object(installer.avd, "list") as mock_avd_list:
+        with patch.object(installer.avd, "list_avds") as mock_avd_list:
             with patch.object(installer.sdk, "list_installed") as mock_sdk_list:
                 mock_avd_list.return_value = ["test_avd"]
                 mock_sdk_list.return_value = []

tests/test_config_loader.py

@@ -34,7 +34,7 @@ def test_load_yaml_success(self, mock_yaml_load, mock_file, mock_exists):
         result = load_yaml(path)
 
         assert result == {"key": "value"}
-        mock_file.assert_called_once_with(path, "r")
+        mock_file.assert_called_once_with(path)
         mock_yaml_load.assert_called_once()
 
     @patch("pathlib.Path.exists")