commit 6e8784ac487710700d427e874e650aa06facde40
author Shao-Chuan Lee <shaochuan@chromium.org> Thu May 13 09:34:46 2021 +0900
committer Commit Bot <commit-bot@chromium.org> Tue May 18 07:39:20 2021 +0000
tree 0f16d1ab644eb3afa96888fa97b186338a6f87b2
parent eb834a31ae219a3c2686e04382b93a20064e9d40

api: android.GetLatestBuild: support querying by Android package

BUG=b:187888777
TEST=run_tests
TEST=api/compile_build_api_proto

Cq-Depend: chromium:2892299
Change-Id: I31d4177784183f4ca17ec03f03cb4e286a581c08
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2891125
Commit-Queue: Shao-Chuan Lee <shaochuan@chromium.org>
Tested-by: Shao-Chuan Lee <shaochuan@chromium.org>
Reviewed-by: LaMont Jones <lamontjones@chromium.org>

api/controller/android_unittest.py

diff --git a/api/controller/android_unittest.py b/api/controller/android_unittest.py
index 790fb4e..8cb0eae 100644
--- a/api/controller/android_unittest.py
+++ b/api/controller/android_unittest.py
@@ -27,36 +27,62 @@
   def setUp(self):
     self._mock = self.PatchObject(service_android, 'GetLatestBuild')
     self._mock.return_value = ('7123456', {})
-    self._input_proto = android_pb2.GetLatestBuildRequest()
-    self._input_proto.android_build_branch = 'git_rvc-arc'
+    self._mock_branch_for_package = self.PatchObject(
+        service_android, 'GetAndroidBranchForPackage',
+        return_value='android-branch-for-package')
     self._output_proto = android_pb2.GetLatestBuildResponse()
 
+  def _GetRequest(self, android_build_branch=None, android_package=None):
+    req = android_pb2.GetLatestBuildRequest()
+    if android_build_branch is not None:
+      req.android_build_branch = android_build_branch
+    if android_package is not None:
+      req.android_package = android_package
+    return req
+
   def testValidateOnly(self):
     """Test that a validate only call does not execute any logic."""
-    android.GetLatestBuild(self._input_proto, self._output_proto,
-                           self.validate_only_config)
+    req = self._GetRequest(android_package='android-package')
+    android.GetLatestBuild(req, self._output_proto, self.validate_only_config)
     self._mock.assert_not_called()
 
   def testMockCall(self):
     """Test that a mock call does not execute logic, returns mocked value."""
-    android.GetLatestBuild(self._input_proto, self._output_proto,
-                           self.mock_call_config)
+    req = self._GetRequest(android_package='android-package')
+    android.GetLatestBuild(req, self._output_proto, self.mock_call_config)
     self._mock.assert_not_called()
     self.assertEqual(self._output_proto.android_version, '7123456')
 
-  def testFailsIfAndroidBuildBranchMissing(self):
-    """Fails if package_name is missing."""
-    self._input_proto.android_build_branch = ''
+  def testFailsIfBranchAndPackageMissing(self):
+    """Fails if both android_build_branch and android_package are missing."""
+    req = self._GetRequest()
     with self.assertRaises(cros_build_lib.DieSystemExit):
-      android.GetLatestBuild(self._input_proto, self._output_proto,
-                             self.api_config)
+      android.GetLatestBuild(req, self._output_proto, self.api_config)
     self._mock.assert_not_called()
 
-  def testActualCall(self):
-    """Test that the underlying method is being called in the usual case."""
-    android.GetLatestBuild(self._input_proto, self._output_proto,
-                           self.api_config)
-    self._mock.assert_called_once_with('git_rvc-arc')
+  def testBranchSpecified(self):
+    """Test calling with Android branch specified."""
+    req = self._GetRequest(android_build_branch='android-branch')
+    android.GetLatestBuild(req, self._output_proto, self.api_config)
+    self._mock.assert_called_once_with('android-branch')
+    self._mock_branch_for_package.assert_not_called()
+    self.assertEqual(self._output_proto.android_version, '7123456')
+
+  def testPackageSpecified(self):
+    """Test calling with Android package specified."""
+    req = self._GetRequest(android_package='android-package')
+    android.GetLatestBuild(req, self._output_proto, self.api_config)
+    self._mock.assert_called_once_with('android-branch-for-package')
+    self._mock_branch_for_package.assert_called_once_with('android-package')
+    self.assertEqual(self._output_proto.android_version, '7123456')
+
+  def testBranchAndPackageSpecified(self):
+    """Test calling with both Android branch and package specified."""
+    req = self._GetRequest(android_build_branch='android-branch',
+                           android_package='android-package')
+    android.GetLatestBuild(req, self._output_proto, self.api_config)
+    self._mock.assert_called_once_with('android-branch')
+    self._mock_branch_for_package.assert_not_called()
     self.assertEqual(self._output_proto.android_version, '7123456')