Reland allow JUnit3/4 tests within the same apk to be run by test_runner

build/android/pylib/utils/dexdump_test.py

Index: build/android/pylib/utils/dexdump_test.py
diff --git a/build/android/pylib/utils/dexdump_test.py b/build/android/pylib/utils/dexdump_test.py
index b8b796449c0b2963da58ae6b003f7d6d56904af4..6b2c4542f2b15c2c7e5d570e52a7ccfdfca0f39c 100755
--- a/build/android/pylib/utils/dexdump_test.py
+++ b/build/android/pylib/utils/dexdump_test.py
@@ -78,9 +78,11 @@ class DexdumpXMLParseTest(unittest.TestCase):
         'classes': {
           'Class1': {
             'methods': ['class1Method1', 'class1Method2'],
+            'superclass': 'java.lang.Object',
           },
           'Class2': {
             'methods': ['class2Method1'],
+            'superclass': 'java.lang.Object',
           }
         },
       },
@@ -92,9 +94,9 @@ class DexdumpXMLParseTest(unittest.TestCase):
   def testParsePackageNode(self):
     example_xml_string = (
         '<package name="com.foo.bar">'
-        '<class name="Class1">'
+        '<class name="Class1" extends="java.lang.Object">'
         '</class>'
-        '<class name="Class2">'
+        '<class name="Class2" extends="java.lang.Object">'
         '</class>'
         '</package>')
 
@@ -106,9 +108,11 @@ class DexdumpXMLParseTest(unittest.TestCase):
       'classes': {
         'Class1': {
           'methods': [],
+          'superclass': 'java.lang.Object',
         },
         'Class2': {
           'methods': [],
+          'superclass': 'java.lang.Object',
         },
       },
     }
@@ -116,7 +120,7 @@ class DexdumpXMLParseTest(unittest.TestCase):
 
   def testParseClassNode(self):
     example_xml_string = (
-        '<class name="Class1">'
+        '<class name="Class1" extends="java.lang.Object">'
         '<method name="method1">'
         '</method>'
         '<method name="method2">'
@@ -128,6 +132,7 @@ class DexdumpXMLParseTest(unittest.TestCase):
 
     expected = {
       'methods': ['method1', 'method2'],
+      'superclass': 'java.lang.Object',
     }
     self.assertEquals(expected, actual)