GN: Side-load dex files as well as native code in incremental installs

build/android/devil/android/device_utils_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=protected-access
@@ skipping 587 matching lines @@
       self.device.Install(
           '/fake/test/app.apk', retries=0, permissions=['p1', 'p2'])
 
   def testInstall_priorInstall(self):
     APK_PATH = '/fake/test/app.apk'
     with self.assertCalls(
         (mock.call.devil.android.apk_helper.GetPackageName(APK_PATH),
          'test.package'),
         (self.call.device._GetApplicationPathsInternal('test.package'),
          ['/fake/data/app/test.package.apk']),
-        self.call.adb.Uninstall('test.package', False),
+        self.call.device.Uninstall('test.package'),
         self.call.adb.Install('/fake/test/app.apk', reinstall=False)):
       self.device.Install('/fake/test/app.apk', retries=0, permissions=[])
 
   def testInstall_differentPriorInstall_reinstall(self):
     with self.assertCalls(
         (mock.call.devil.android.apk_helper.GetPackageName(
             '/fake/test/app.apk'),
          'test.package'),
         (self.call.device._GetApplicationPathsInternal('test.package'),
          ['/fake/data/app/test.package.apk']),
@@ skipping 64 matching lines @@
                                             ['base.apk', 'split2.apk']),
          (['split2.apk'], None)),
         (self.call.adb.InstallMultiple(
             ['split2.apk'], partial='test.package', reinstall=True))):
       self.device.InstallSplitApk('base.apk',
                                   ['split1.apk', 'split2.apk', 'split3.apk'],
                                   reinstall=True, permissions=[], retries=0)
 
 
 class DeviceUtilsUninstallTest(DeviceUtilsTest):
-
   def testUninstall_callsThrough(self):
     with self.assertCalls(
+        (self.call.device._GetApplicationPathsInternal('test.package'),
+         ['/path.apk']),
         self.call.adb.Uninstall('test.package', True)):
       self.device.Uninstall('test.package', True)
 
+  def testUninstall_noop(self):
+    with self.assertCalls(
+        (self.call.device._GetApplicationPathsInternal('test.package'), [])):
+      self.device.Uninstall('test.package', True)
+
 
 class DeviceUtilsSuTest(DeviceUtilsTest):
   def testSu_preM(self):
     with self.patch_call(
         self.call.device.build_version_sdk,
         return_value=version_codes.LOLLIPOP_MR1):
       self.assertEquals('su -c foo', self.device._Su('foo'))
 
   def testSu_mAndAbove(self):
     with self.patch_call(
@@ skipping 1413 matching lines @@
   def testGrantPermissions_BlackList(self):
     with self.patch_call(
         self.call.device.build_version_sdk, return_value=23):
         self.device.GrantPermissions(
             'package', ['android.permission.ACCESS_MOCK_LOCATION'])
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)