[Android] Run java unit tests on the android tester bots.

scripts/slave/recipes/android/tester.py

 # 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.
 
 DEPS = [
     'adb',
     'bot_update',
     'chromium',
     'chromium_android',
     'filter',
@@ skipping 60 matching lines @@
   [ 'media_unittests', None ],
   [ 'net_unittests', None ],
   [ 'sandbox_linux_unittests', None ],
   [ 'sql_unittests', None ],
   [ 'sync_unit_tests', None ],
   [ 'ui_unittests', None ],
   [ 'unit_tests', None ],
   [ 'webkit_unit_tests', None ],
 ]
 
+JAVA_UNIT_TESTS = [
+  'junit_unit_tests',
+]
+
 TELEMETRY_UNIT_TESTS = [
   [ 'telemetry_unittests', None ],
   [ 'telemetry_perf_unittests', None ],
 ]
 
 BUILDERS = {
   'tryserver.chromium.linux': {
     'android_dbg_tests_recipe': {
       'config': 'main_builder',
       'instrumentation_tests': INSTRUMENTATION_TESTS,
       'unittests': UNIT_TESTS,
+      'java_unittests': JAVA_UNIT_TESTS,
       'target': 'Debug',
       'try': True,
     },
     'android_rel_tests_recipe': {
       'config': 'main_builder',
       'instrumentation_tests': INSTRUMENTATION_TESTS,
       'unittests': TELEMETRY_UNIT_TESTS,
+      'java_unittests': JAVA_UNIT_TESTS,
       'target': 'Release',
       'try': True,
     },
   }
 }
 
 def GenSteps(api):
   # Required for us to be able to use filter.
   api.chromium_android.set_config('base_config')
 
@@ skipping 12 matching lines @@
   api.gclient.apply_config('android')
   api.gclient.apply_config('chrome_internal')
 
   api.bot_update.ensure_checkout()
   api.chromium_android.clean_local_files()
   api.chromium_android.runhooks()
 
   compile_targets = None
   instrumentation_tests = bot_config.get('instrumentation_tests', [])
   unittests = bot_config.get('unittests', [])
+  java_unittests = bot_config.get('java_unittests', [])
   is_trybot = bot_config.get('try', False)
   if is_trybot:
     api.tryserver.maybe_apply_issue()
 
     # Early out if we haven't changed any relevant code.
     test_names = []
     test_names.extend([suite['gyp_target'] for suite in instrumentation_tests])
     test_names.extend([suite for suite, _ in unittests])
+    test_names.extend(java_unittests)
 
     compile_targets = api.chromium.c.compile_py.default_targets
     api.filter.does_patch_require_compile(
         exes=test_names,
         compile_targets=compile_targets,
         additional_name='chromium',
         config_file_name='trybot_analyze_config.json')
     if not api.filter.result:
       return
     compile_targets = list(set(compile_targets) &
                                  set(api.filter.compile_targets)) if \
         compile_targets else api.filter.compile_targets
     instrumentation_tests = [i for i in instrumentation_tests if \
         i['gyp_target'] in api.filter.matching_exes]
     unittests = [i for i in unittests if i[0] in api.filter.matching_exes]
+    java_unittests = [i for i in java_unittests
+                      if i in api.filter.matching_exes]
 
   api.chromium_android.run_tree_truth()
   api.chromium_android.compile(targets=compile_targets)
 
-  if not instrumentation_tests and not unittests:
+  if not instrumentation_tests and not unittests and not java_unittests:
     return
 
   api.adb.root_devices()
 
   api.chromium_android.spawn_logcat_monitor()
   api.chromium_android.detect_and_setup_devices()
 
   with api.step.defer_results():
     for suite in instrumentation_tests:
       api.chromium_android.run_instrumentation_suite(
           suite['test'], verbose=True, **suite.get('kwargs', {}))
 
     for suite, isolate_path in unittests:
       if isolate_path:
         isolate_path = api.path['checkout'].join(*isolate_path)
       api.chromium_android.run_test_suite(
           suite,
           isolate_file_path=isolate_path)
 
+    for suite in java_unittests:
+      api.chromium_android.run_java_unit_test_suite(suite)
+
     api.chromium_android.logcat_dump(gs_bucket='chromium-android')
     api.chromium_android.stack_tool_steps()
     api.chromium_android.test_report()
 
 def GenTests(api):
   for mastername in BUILDERS:
     for buildername in BUILDERS[mastername]:
       yield (
           api.test(buildername) +
           api.properties.generic(
               revision='4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00',
               parent_buildername='parent_buildername',
               parent_buildnumber='1729',
               mastername=mastername,
               buildername=buildername,
               slavename='slavename',
               buildnumber='1337') +
           api.override_step_data(
               'analyze',
               api.json.output({'status': 'Found dependency',
                                'targets': ['breakpad_unittests',
-                                           'chrome_shell_test_apk'],
+                                           'chrome_shell_test_apk',
+                                           'junit_unit_tests'],
                                'build_targets': ['breakpad_unittests',
-                                                 'chrome_shell_test_apk']}))
+                                                 'chrome_shell_test_apk',
+                                                 'junit_unit_tests']}))
       )
 
   yield (
       api.test('android_dbg_tests_recipe__content_browsertests_failure') +
       api.properties.generic(
           mastername='tryserver.chromium.linux',
           buildername='android_dbg_tests_recipe',
           slavename='slavename') +
       api.override_step_data(
           'analyze',
@@ skipping 20 matching lines @@
   yield (
       api.test('no_compile_because_of_analyze') +
       api.properties.generic(
           mastername='tryserver.chromium.linux',
           buildername='android_dbg_tests_recipe',
           slavename='slavename') +
       api.override_step_data(
           'analyze',
           api.json.output({'status': 'No compile necessary'}))
   )