Revert of Change apk_helper.py for apk with multi instrumentations and JUnit4

devil/devil/android/apk_helper_test.py

Index: devil/devil/android/apk_helper_test.py
diff --git a/devil/devil/android/apk_helper_test.py b/devil/devil/android/apk_helper_test.py
deleted file mode 100755
index 776d72c9f47607ac12e6b8f129a6444c01c79a18..0000000000000000000000000000000000000000
--- a/devil/devil/android/apk_helper_test.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /usr/bin/env python
-# Copyright 2017 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.
-
-from devil import base_error
-from devil import devil_env
-from devil.android import apk_helper
-from devil.utils import mock_calls
-
-with devil_env.SysPath(devil_env.PYMOCK_PATH):
-  import mock  # pylint: disable=import-error
-
-
-_MANIFEST_DUMP = """N: android=http://schemas.android.com/apk/res/android
-  E: manifest (line=1)
-    A: package="org.chromium.abc" (Raw: "org.chromium.abc")
-    A: split="random_split" (Raw: "random_split")
-    E: uses-permission (line=2)
-      A: android:name(0x01010003)="android.permission.INTERNET" (Raw: "android.permission.INTERNET")
-    E: uses-permission (line=3)
-      A: android:name(0x01010003)="android.permission.READ_EXTERNAL_STORAGE" (Raw: "android.permission.READ_EXTERNAL_STORAGE")
-    E: uses-permission (line=4)
-      A: android:name(0x01010003)="android.permission.ACCESS_FINE_LOCATION" (Raw: "android.permission.ACCESS_FINE_LOCATION")
-    E: application (line=5)
-      E: activity (line=6)
-        A: android:name(0x01010003)="org.chromium.ActivityName" (Raw: "org.chromium.ActivityName")
-        A: android:exported(0x01010010)=(type 0x12)0xffffffff
-      E: service (line=7)
-        A: android:name(0x01010001)="org.chromium.RandomService" (Raw: "org.chromium.RandomService")
-        A: android:isolatedProcess(0x01010888)=(type 0x12)0xffffffff
-    E: instrumentation (line=8)
-      A: android:label(0x01010001)="abc" (Raw: "abc")
-      A: android:name(0x01010003)="org.chromium.RandomJUnit4TestRunner" (Raw: "org.chromium.RandomJUnit4TestRunner")
-      A: android:targetPackage(0x01010021)="org.chromium.random_package" (Raw:"org.chromium.random_pacakge")
-      A: junit4=(type 0x12)0xffffffff (Raw: "true")
-    E: instrumentation (line=9)
-      A: android:label(0x01010001)="abc" (Raw: "abc")
-      A: android:name(0x01010003)="org.chromium.RandomTestRunner" (Raw: "org.chromium.RandomTestRunner")
-      A: android:targetPackage(0x01010021)="org.chromium.random_package" (Raw:"org.chromium.random_pacakge")
-"""
-
-
-class ApkHelperStandardTest(mock_calls.TestCase):
-  def setUp(self):
-    self.patcher = mock.patch(
-      'devil.android.sdk.aapt.Dump', mock.Mock(
-          side_effect=None, return_value=_MANIFEST_DUMP.split('\n')))
-    self.patcher.start()
-    self.helper_object = apk_helper.ApkHelper("")
-
-  def tearDown(self):
-    self.patcher.stop()
-
-  def testGetInstrumentationName(self):
-    with self.assertRaises(base_error.BaseError):
-      self.helper_object.GetInstrumentationName()
-
-  def testGetActivityName(self):
-    self.assertEquals(
-        self.helper_object.GetActivityName(), 'org.chromium.ActivityName')
-
-  def testGetAllInstrumentations(self):
-    all_instrumentations = self.helper_object.GetAllInstrumentations()
-    self.assertEquals(len(all_instrumentations), 2)
-    self.assertEquals(all_instrumentations[0]['android:name'],
-                      'org.chromium.RandomJUnit4TestRunner')
-    self.assertEquals(all_instrumentations[1]['android:name'],
-                      'org.chromium.RandomTestRunner')
-
-  def testGetPackageName(self):
-    self.assertEquals(self.helper_object.GetPackageName(), 'org.chromium.abc')
-
-  def testGetPermssions(self):
-    all_permissions = self.helper_object.GetPermissions()
-    self.assertEquals(len(all_permissions), 3)
-    self.assertTrue('android.permission.INTERNET' in all_permissions)
-    self.assertTrue(
-        'android.permission.READ_EXTERNAL_STORAGE' in all_permissions)
-    self.assertTrue(
-        'android.permission.ACCESS_FINE_LOCATION' in all_permissions)
-
-  def testGetSplitName(self):
-    self.assertEquals(self.helper_object.GetSplitName(), 'random_split')
-
-  def testHasIsolatedProcesses(self):
-    self.assertTrue(self.helper_object.HasIsolatedProcesses())