| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Class representing instrumentation test apk and jar.""" | 5 """Class representing instrumentation test apk and jar.""" |
| 6 | 6 |
| 7 import os | 7 import os |
| 8 | 8 |
| 9 from pylib.instrumentation import test_jar |
| 9 from pylib.utils import apk_helper | 10 from pylib.utils import apk_helper |
| 10 | 11 |
| 11 import test_jar | |
| 12 | |
| 13 | 12 |
| 14 class TestPackage(test_jar.TestJar): | 13 class TestPackage(test_jar.TestJar): |
| 15 def __init__(self, apk_path, jar_path): | 14 def __init__(self, apk_path, jar_path): |
| 16 test_jar.TestJar.__init__(self, jar_path) | 15 test_jar.TestJar.__init__(self, jar_path) |
| 17 | 16 |
| 18 if not os.path.exists(apk_path): | 17 if not os.path.exists(apk_path): |
| 19 raise Exception('%s not found, please build it' % apk_path) | 18 raise Exception('%s not found, please build it' % apk_path) |
| 20 self._apk_path = apk_path | 19 self._apk_path = apk_path |
| 21 self._apk_name = os.path.splitext(os.path.basename(apk_path))[0] | 20 self._apk_name = os.path.splitext(os.path.basename(apk_path))[0] |
| 22 self._package_name = apk_helper.GetPackageName(self._apk_path) | 21 self._package_name = apk_helper.GetPackageName(self._apk_path) |
| 23 | 22 |
| 24 def GetApkPath(self): | 23 def GetApkPath(self): |
| 25 """Returns the absolute path to the APK.""" | 24 """Returns the absolute path to the APK.""" |
| 26 return self._apk_path | 25 return self._apk_path |
| 27 | 26 |
| 28 def GetApkName(self): | 27 def GetApkName(self): |
| 29 """Returns the name of the apk without the suffix.""" | 28 """Returns the name of the apk without the suffix.""" |
| 30 return self._apk_name | 29 return self._apk_name |
| 31 | 30 |
| 32 def GetPackageName(self): | 31 def GetPackageName(self): |
| 33 """Returns the package name of this APK.""" | 32 """Returns the package name of this APK.""" |
| 34 return self._package_name | 33 return self._package_name |
| 35 | 34 |
| 36 # Override. | 35 # Override. |
| 37 def Install(self, adb): | 36 def Install(self, adb): |
| 38 adb.ManagedInstall(self.GetApkPath(), package_name=self.GetPackageName()) | 37 adb.ManagedInstall(self.GetApkPath(), package_name=self.GetPackageName()) |
| OLD | NEW |