android-env 1.2.2__py3-none-any.whl → 1.2.3__py3-none-any.whl

android_env/components/adb_call_parser_test.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-# Copyright 2023 DeepMind Technologies Limited.
+# Copyright 2024 DeepMind Technologies Limited.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,12 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Tests for adb_call_parser."""
-
 import builtins
 import os
 import subprocess
 import sys
+import tempfile
 from unittest import mock
 
 from absl.testing import absltest
@@ -31,31 +30,32 @@ from android_env.proto import adb_pb2
 class AdbCallParserTest(parameterized.TestCase):
 
   def test_unknown_command(self):
+    """Gets UNKNOWN_COMMAND for an empty request."""
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     response = parser.parse(request)
-    self.assertEqual(response.status,
-                     adb_pb2.AdbResponse.Status.UNKNOWN_COMMAND)
+    self.assertEqual(
+        response.status, adb_pb2.AdbResponse.Status.UNKNOWN_COMMAND
+    )
 
   def test_invalid_timeout(self):
     """AdbRequest.timeout_sec must be positive."""
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.tap.x = 123
     request.timeout_sec = -5
     response = parser.parse(request)
-    self.assertEqual(response.status,
-                     adb_pb2.AdbResponse.Status.FAILED_PRECONDITION)
+    self.assertEqual(
+        response.status, adb_pb2.AdbResponse.Status.FAILED_PRECONDITION
+    )
 
   @mock.patch.object(os.path, 'exists', autospec=True)
   def test_install_apk_file_not_found(self, mock_exists):
+    """Should fail installing APK when it is not found."""
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.install_apk.filesystem.path = '/my/home/game.apk'
     mock_exists.return_value = False
@@ -67,9 +67,9 @@ class AdbCallParserTest(parameterized.TestCase):
 
   @mock.patch.object(os.path, 'exists', autospec=True)
   def test_install_apk_successful(self, mock_exists):
+    """Should succeed installing an arbitrary APK."""
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.install_apk.filesystem.path = '/my/home/game.apk'
     mock_exists.return_value = True
@@ -80,10 +80,41 @@ class AdbCallParserTest(parameterized.TestCase):
     adb.execute_command.assert_called_once_with(
         ['install', '-r', '-t', '-g', '/my/home/game.apk'], None)
 
+  @mock.patch.object(tempfile, 'NamedTemporaryFile', autospec=True)
+  def test_install_apk_from_blob(self, mock_tempfile):
+    """Should succeed installing APK from blob."""
+    adb = mock.create_autospec(adb_controller.AdbController)
+    parser = adb_call_parser.AdbCallParser(adb)
+    request = adb_pb2.AdbRequest()
+    blob_content = b'A fake blob content'
+    request.install_apk.blob.contents = blob_content
+    mock_tempfile.return_value.__enter__.return_value.name = '/my/home/test.apk'
+    mock_tempfile.return_value.__enter__.return_value.write.return_value = None
+
+    response = parser.parse(request)
+    self.assertEqual(response.status, adb_pb2.AdbResponse.Status.OK)
+    self.assertEmpty(response.error_message)
+    adb.execute_command.assert_called_once_with(
+        ['install', '-r', '-t', '-g', '/my/home/test.apk'], None
+    )
+    # pytype: disable=attribute-error
+    expected_tempfile_kwargs = (
+        {'suffix': '.apk', 'delete_on_close': False}
+        if sys.version_info > (3, 12)
+        else {'suffix': '.apk'}
+    )
+    mock_tempfile.assert_has_calls([
+        mock.call(**expected_tempfile_kwargs),  # Constructor
+        mock.call().__enter__(),  # Enter context
+        mock.call().__enter__().write(blob_content),  # Call write function
+        mock.call().__exit__(None, None, None),  # Exit context
+    ])
+    # pytype: enable=attribute-error
+
   def test_start_activity_empty_full_activity(self):
+    """A start_activity command should always have a nonempty activity."""
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_activity.extra_args.extend(['blah'])
     response = parser.parse(request)
@@ -96,8 +127,7 @@ class AdbCallParserTest(parameterized.TestCase):
     command_output = (b'Stopping: my.project.SplashActivity\n'
                       b'Starting: Intent { cmp=my.project.SplashActivity }\n')
     adb.execute_command.return_value = command_output
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_activity.full_activity = 'my.project.SplashActivity'
     request.start_activity.extra_args.extend(['blah'])
@@ -118,8 +148,7 @@ class AdbCallParserTest(parameterized.TestCase):
     command_output = (b'Stopping: my.project.SplashActivity\n'
                       b'Starting: Intent { cmp=my.project.SplashActivity }\n')
     adb.execute_command.return_value = command_output
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_activity.full_activity = 'my.project.SplashActivity'
     request.start_activity.extra_args.extend(['blah'])
@@ -141,8 +170,7 @@ class AdbCallParserTest(parameterized.TestCase):
                       b'Starting: Intent { cmp=my.project.SplashActivity }\n'
                       b'Error: Activity not started, unknown error code 101\n')
     adb.execute_command.return_value = command_output
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_activity.full_activity = 'my.project.SplashActivity'
     request.start_activity.extra_args.extend(['blah'])
@@ -154,8 +182,7 @@ class AdbCallParserTest(parameterized.TestCase):
 
   def test_force_stop(self):
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.force_stop.package_name = 'my.project'
     response = parser.parse(request)
@@ -166,8 +193,7 @@ class AdbCallParserTest(parameterized.TestCase):
 
   def test_grant_permissions_empty_package_name(self):
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.package_manager.grant.permissions.extend(['perm1', 'perm2'])
     response = parser.parse(request)
@@ -177,8 +203,7 @@ class AdbCallParserTest(parameterized.TestCase):
 
   def test_grant_permissions_empty_permissions(self):
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.package_manager.grant.package_name = 'my.project'
     response = parser.parse(request)
@@ -189,8 +214,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_grant_permissions_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.package_manager.grant.package_name = 'my.project'
     request.package_manager.grant.permissions.extend(['perm1', 'perm2'])
@@ -204,8 +228,7 @@ class AdbCallParserTest(parameterized.TestCase):
 
   def test_press_button_invalid_button(self):
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.press_button.button = 99999
     response = parser.parse(request)
@@ -216,8 +239,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_press_button_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b''
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     # HOME.
     request = adb_pb2.AdbRequest()
     request.press_button.button = adb_pb2.AdbRequest.PressButton.Button.HOME
@@ -248,8 +270,7 @@ class AdbCallParserTest(parameterized.TestCase):
     adb.execute_command.return_value = (
         b'  taskId=12345: my.project.AnotherActivity visible=true'
         b'  topActivity=ComponentInfo{my.project.AnotherActivity}')
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_screen_pinning.full_activity = 'my.project.AmazingActivity'
     response = parser.parse(request)
@@ -263,8 +284,7 @@ class AdbCallParserTest(parameterized.TestCase):
     adb.execute_command.return_value = (
         b'  taskId=12345: my.project.AmazingActivity visible=true'
         b'  topActivity=ComponentInfo{my.project.AmazingActivity}')
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_screen_pinning.full_activity = 'my.project.AmazingActivity'
     response = parser.parse(request)
@@ -280,8 +300,7 @@ class AdbCallParserTest(parameterized.TestCase):
     adb.execute_command.return_value = (
         b'  taskId=12345: my.project.MainActivity visible=true'
         b'  topActivity=ComponentInfo{my.project.TopActivity}')
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_screen_pinning.full_activity = 'my.project.MainActivity'
     response = parser.parse(request)
@@ -297,8 +316,7 @@ class AdbCallParserTest(parameterized.TestCase):
     adb.execute_command.return_value = (
         b'  taskId=12345: my.project.MainActivity visible=true'
         b'  topActivity=ComponentInfo{my.project.TopActivity}')
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.start_screen_pinning.full_activity = 'my.project.TopActivity'
     response = parser.parse(request)
@@ -311,8 +329,7 @@ class AdbCallParserTest(parameterized.TestCase):
 
   def test_send_broadcast_empty_action(self):
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         send_broadcast=adb_pb2.AdbRequest.SendBroadcast())
     response = parser.parse(request)
@@ -322,18 +339,26 @@ class AdbCallParserTest(parameterized.TestCase):
 
   def test_send_broadcast_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
+    request = adb_pb2.AdbRequest()
+    request.send_broadcast.action = 'SOME-ACTION'
+    response = parser.parse(request)
+    self.assertEqual(response.status, adb_pb2.AdbResponse.Status.OK)
+    self.assertEmpty(response.error_message)
+
+  def test_send_broadcast_with_component_successful(self):
+    adb = mock.create_autospec(adb_controller.AdbController)
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.send_broadcast.action = 'SOME-ACTION'
+    request.send_broadcast.component = 'SOME-COMPONENT'
     response = parser.parse(request)
     self.assertEqual(response.status, adb_pb2.AdbResponse.Status.OK)
     self.assertEmpty(response.error_message)
 
   def test_uninstall_package_empty_package_name(self):
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.uninstall_package.package_name = ''
     response = parser.parse(request)
@@ -344,8 +369,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_uninstall_package_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'package:my.package'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest()
     request.uninstall_package.package_name = 'my.package'
     response = parser.parse(request)
@@ -355,8 +379,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_get_current_activity_no_visible_task(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = None
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         get_current_activity=adb_pb2.AdbRequest.GetCurrentActivity())
     response = parser.parse(request)
@@ -372,8 +395,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_get_orientation_empty_dumpsys(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b''
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         get_orientation=adb_pb2.AdbRequest.GetOrientationRequest())
     response = parser.parse(request)
@@ -385,8 +407,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_get_orientation_invalid_device_no_surface_orientation(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b' PhysicalWidth: -123px'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         get_orientation=adb_pb2.AdbRequest.GetOrientationRequest())
     response = parser.parse(request)
@@ -396,21 +417,26 @@ class AdbCallParserTest(parameterized.TestCase):
                                                 None)
 
   @parameterized.named_parameters(
-      ('rotation_0', b'0', 0),
-      ('rotation_90', b'1', 1),
-      ('rotation_180', b'2', 2),
-      ('rotation_270', b'3', 3),
+      ('rotation_0', b""" SurfaceOrientation: 0""", 0),
+      ('rotation_90', b""" SurfaceOrientation: 1""", 1),
+      ('rotation_180', b""" SurfaceOrientation: 2""", 2),
+      ('rotation_270', b""" SurfaceOrientation: 3""", 3),
+      ('rotation_0_new', b""" InputDeviceOrientation: 0""", 0),
+      ('rotation_90_new', b""" InputDeviceOrientation: 1""", 1),
+      ('rotation_180_new', b""" InputDeviceOrientation: 2""", 2),
+      ('rotation_270_new', b""" InputDeviceOrientation: 3""", 3),
   )
-  def test_get_orientation_success(self, orientation, expected_orientation):
+  def test_get_orientation_success(
+      self, orientation: bytes, expected_orientation: int
+  ):
     adb = mock.create_autospec(adb_controller.AdbController)
-    adb.execute_command.return_value = b"""
-    SomeRandomKey: 12345
-    SurfaceOrientation: """ + orientation + b"""
+    adb.execute_command.return_value = (
+        b"""SomeRandomKey: 12345\n""" + orientation + b"""
     MoreRandomStuff: awesome_value
 """
+    )
 
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         get_orientation=adb_pb2.AdbRequest.GetOrientationRequest())
     response = parser.parse(request)
@@ -423,8 +449,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_get_current_activity_no_matches(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         get_current_activity=adb_pb2.AdbRequest.GetCurrentActivity())
     for platform in ['win32', 'linux']:
@@ -445,8 +470,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_get_current_activity_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'{MyAwesomeActivity}'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         get_current_activity=adb_pb2.AdbRequest.GetCurrentActivity())
     for platform in ['win32', 'linux']:
@@ -465,8 +489,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_push_no_path(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         push=adb_pb2.AdbRequest.Push(content=b'Has content but no path'))
     response = parser.parse(request)
@@ -478,8 +501,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_push_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         push=adb_pb2.AdbRequest.Push(
             content=b'My text.', path='/sdcard/my_file.txt'))
@@ -501,8 +523,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_pull_no_path(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(pull=adb_pb2.AdbRequest.Pull())
     response = parser.parse(request)
     self.assertEqual(response.status,
@@ -516,8 +537,7 @@ class AdbCallParserTest(parameterized.TestCase):
     adb.execute_command.return_value = b'whatever'
     mock_open.return_value.__enter__ = mock_open
     mock_open.return_value.read.return_value = b'S3cR3t. dO nOt TeLl ANYONE'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         pull=adb_pb2.AdbRequest.Pull(path='/sdcard/my_file.txt'))
 
@@ -539,8 +559,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_input_text_no_text(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(input_text=adb_pb2.AdbRequest.InputText())
     response = parser.parse(request)
     self.assertEqual(response.status,
@@ -551,8 +570,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_input_text_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         input_text=adb_pb2.AdbRequest.InputText(
             text='The Greatest Text of All Time'))
@@ -573,8 +591,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_tap_failed(self, request: adb_pb2.AdbRequest):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     response = parser.parse(request)
     self.assertEqual(response.status,
                      adb_pb2.AdbResponse.Status.FAILED_PRECONDITION)
@@ -584,8 +601,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_tap_successful(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(tap=adb_pb2.AdbRequest.Tap(x=135, y=246))
     response = parser.parse(request)
     self.assertEqual(response.status, adb_pb2.AdbResponse.Status.OK)
@@ -622,8 +638,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_settings_failures(self, request):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(settings=request)
     response = parser.parse(request)
     self.assertEqual(response.status,
@@ -634,8 +649,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_settings_success_get(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'here it is!'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest.SettingsRequest(
         name_space=adb_pb2.AdbRequest.SettingsRequest.Namespace.SYSTEM,
@@ -652,8 +666,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_settings_success_put(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'Done for ya!'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest.SettingsRequest(
         name_space=adb_pb2.AdbRequest.SettingsRequest.Namespace.SECURE,
@@ -670,8 +683,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_settings_success_delete(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'Key deleted.'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest.SettingsRequest(
         name_space=adb_pb2.AdbRequest.SettingsRequest.Namespace.GLOBAL,
@@ -712,8 +724,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_settings_success_reset(self, mode, package_name, expected_arg):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'Pkg reset.'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest.SettingsRequest(
         name_space=adb_pb2.AdbRequest.SettingsRequest.Namespace.GLOBAL,
@@ -731,8 +742,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_settings_success_list(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'volume_ring=5\nvolume_system=7'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest.SettingsRequest(
         name_space=adb_pb2.AdbRequest.SettingsRequest.Namespace.SYSTEM,
@@ -752,8 +762,7 @@ class AdbCallParserTest(parameterized.TestCase):
     expected_output = b'generic_output'
     args = ['shell', 'am', 'broadcast', '-n', 'receiver', '-a', 'action']
     adb.execute_command.return_value = expected_output
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     generic_request = adb_pb2.AdbRequest.GenericRequest(args=args)
     request = adb_pb2.AdbRequest(generic=generic_request)
@@ -769,8 +778,7 @@ class AdbCallParserTest(parameterized.TestCase):
     args = ['shell', 'am', 'broadcast', '-n', 'receiver', '-a', 'action']
     adb.execute_command.side_effect = subprocess.CalledProcessError(
         cmd='cmd', output='adb_error', returncode=-1)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     generic_request = adb_pb2.AdbRequest.GenericRequest(args=args)
     request = adb_pb2.AdbRequest(generic=generic_request)
@@ -786,8 +794,7 @@ class AdbCallParserTest(parameterized.TestCase):
     args = ['shell', 'am', 'broadcast', '-n', 'receiver', '-a', 'action']
     adb.execute_command.side_effect = subprocess.TimeoutExpired(
         cmd='cmd', timeout=10)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     generic_request = adb_pb2.AdbRequest.GenericRequest(args=args)
     request = adb_pb2.AdbRequest(generic=generic_request)
@@ -821,8 +828,7 @@ class AdbCallParserTest(parameterized.TestCase):
   def test_package_manager_list_bad_output(self, request):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b"""Something irrelevant."""
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     response = parser.parse(request)
     response.package_manager.output = b"""Something irrelevant."""
     self.assertEmpty(response.package_manager.list.items)
@@ -842,8 +848,7 @@ feature:android.software.backup
 feature:android.software.webview
 """
     adb.execute_command.return_value = output
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         package_manager=adb_pb2.AdbRequest.PackageManagerRequest(
             list=adb_pb2.AdbRequest.PackageManagerRequest.List(
@@ -887,8 +892,7 @@ library:javax.obex
 library:org.apache.http.legacy
 """
     adb.execute_command.return_value = output
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         package_manager=adb_pb2.AdbRequest.PackageManagerRequest(
             list=adb_pb2.AdbRequest.PackageManagerRequest.List(
@@ -928,8 +932,7 @@ package:com.awesome.company
 package:com.another.great.thingie
 """
     adb.execute_command.return_value = output
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         package_manager=adb_pb2.AdbRequest.PackageManagerRequest(
             list=adb_pb2.AdbRequest.PackageManagerRequest.List(
@@ -950,8 +953,7 @@ package:com.another.great.thingie
   def test_package_manager_clear_no_package_name(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b"""Something irrelevant."""
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest(
         package_manager=adb_pb2.AdbRequest.PackageManagerRequest(
@@ -968,8 +970,7 @@ package:com.another.great.thingie
   def test_package_manager_clear_successful_no_user_id(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b"""Some successful message."""
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest(
         package_manager=adb_pb2.AdbRequest.PackageManagerRequest(
@@ -987,8 +988,7 @@ package:com.another.great.thingie
   def test_package_manager_clear_successful_with_user_id(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b"""Some successful message."""
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     request = adb_pb2.AdbRequest(
         package_manager=adb_pb2.AdbRequest.PackageManagerRequest(
@@ -1007,8 +1007,7 @@ package:com.another.great.thingie
     """An empty `DumpsysRequest` is a valid request."""
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(dumpsys=adb_pb2.AdbRequest.DumpsysRequest())
 
     response = parser.parse(request)
@@ -1029,8 +1028,7 @@ package:com.another.great.thingie
   def test_dumpsys_negative_timeouts(self, request):
     """`DumpsysRequest.timeout_{sec, ms}` if passed, should be positive."""
     adb = mock.create_autospec(adb_controller.AdbController)
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
 
     response = parser.parse(request)
 
@@ -1048,8 +1046,7 @@ package:com.another.great.thingie
   def test_dumpsys_timeout_successful(self, timeout_sec, timeout_ms, expected):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(
             timeout_sec=timeout_sec, timeout_ms=timeout_ms))
@@ -1076,8 +1073,7 @@ package:com.another.great.thingie
   def test_dumpsys_priority_timeout_successful(self, priority, expected):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(priority=priority))
 
@@ -1087,38 +1083,49 @@ package:com.another.great.thingie
     self.assertEmpty(response.error_message)
     adb.execute_command.assert_called_once_with(expected, timeout=None)
 
-  def test_dumpsys_list_only_cannot_be_combined(self):
-    """When passing `-l`, the request cannot contain a few fields."""
+  @parameterized.named_parameters(
+      (
+          'window_service',
+          adb_pb2.AdbRequest.DumpsysRequest(list_only=True, service='window'),
+      ),
+      (
+          'arbitrary_args',
+          adb_pb2.AdbRequest.DumpsysRequest(
+              list_only=True, args=['myoption', 'anotheroption']
+          ),
+      ),
+      (
+          'skip_usb',
+          adb_pb2.AdbRequest.DumpsysRequest(
+              list_only=True, skip_services=['usb']
+          ),
+      ),
+  )
+  def test_dumpsys_list_only_cannot_be_combined(
+      self, dumpsys_request: adb_pb2.AdbRequest.DumpsysRequest
+  ):
+    """When `list_only==True`, the request cannot contain a few fields."""
+
+    # Arrange.
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
-    for d in [
-        {
-            'service': 'window'
-        },
-        {
-            'args': ['myoption', 'anotheroption']
-        },
-        {
-            'skip_services': 'usb'
-        },
-    ]:
-      request = adb_pb2.AdbRequest(
-          dumpsys=adb_pb2.AdbRequest.DumpsysRequest(list_only=True, **d))
-
-      response = parser.parse(request)
-
-      self.assertEqual(response.status,
-                       adb_pb2.AdbResponse.Status.FAILED_PRECONDITION)
-      self.assertNotEmpty(response.error_message)
-      adb.execute_command.assert_not_called()
+    parser = adb_call_parser.AdbCallParser(adb)
+    request = adb_pb2.AdbRequest(dumpsys=dumpsys_request)
+
+    # Act.
+    response = parser.parse(request)
+
+    # Assert.
+    self.assertEqual(
+        response.status, adb_pb2.AdbResponse.Status.FAILED_PRECONDITION
+    )
+    self.assertNotEmpty(response.error_message)
+    adb.execute_command.assert_not_called()
 
   def test_dumpsys_list_only_success(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(list_only=True))
 
@@ -1133,8 +1140,7 @@ package:com.another.great.thingie
     """When using `DumpsysRequest.skip_service`, it cannot contain `.service`."""
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(
             service='wifi', skip_services=['window', 'usb']))
@@ -1149,8 +1155,7 @@ package:com.another.great.thingie
   def test_dumpsys_skip_services(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(
             skip_services=['window', 'usb']))
@@ -1165,8 +1170,7 @@ package:com.another.great.thingie
   def test_dumpsys_single_service(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(service='window'))
 
@@ -1180,8 +1184,7 @@ package:com.another.great.thingie
   def test_dumpsys_single_service_with_args(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'whatever'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(
             service='window', args=['arg1', 'arg2']))
@@ -1196,8 +1199,7 @@ package:com.another.great.thingie
   def test_dumpsys_single_service_with_proto(self):
     adb = mock.create_autospec(adb_controller.AdbController)
     adb.execute_command.return_value = b'some binary output'
-    parser = adb_call_parser.AdbCallParser(
-        adb, tmp_dir=absltest.get_default_test_tmpdir())
+    parser = adb_call_parser.AdbCallParser(adb)
     request = adb_pb2.AdbRequest(
         dumpsys=adb_pb2.AdbRequest.DumpsysRequest(service='window', proto=True))