Expose resources in Robolectric/JUnit tests.

build/android/pylib/local/machine/local_machine_junit_test_run.py

 # Copyright 2016 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.
 
 import json
 import os
 import tempfile
 
 from devil.utils import cmd_helper
 from pylib import constants
@@ skipping 28 matching lines @@
       if self._test_instance.test_filter:
         jar_args.extend(['-gtest-filter', self._test_instance.test_filter])
       if self._test_instance.package_filter:
         jar_args.extend(['-package-filter',
                          self._test_instance.package_filter])
       if self._test_instance.runner_filter:
         jar_args.extend(['-runner-filter', self._test_instance.runner_filter])
       command.extend(['--jar-args', '"%s"' % ' '.join(jar_args)])
 
       # Add JVM arguments.
-      jvm_args = []
-      # TODO(mikecase): Add a --robolectric-dep-dir arg to test runner.
-      # Have this arg set by GN in the generated test runner scripts.
-      jvm_args += [
-          '-Drobolectric.dependency.dir=%s' %
-          os.path.join(constants.GetOutDirectory(),
-              'lib.java', 'third_party', 'robolectric')]
+      jvm_args = ['-Drobolectric.dependency.dir=%s' %
+                  self._test_instance.robolectric_runtime_deps_dir]
+
+      if self._test_instance.android_manifest_path:
+        jvm_args += ['-Dchromium.robolectric.manifest=%s' %
+                     self._test_instance.android_manifest_path]
+
+      if self._test_instance.package_name:
+        jvm_args += ['-Dchromium.robolectric.package.name=%s' %
+                     self._test_instance.package_name]
+
+      if self._test_instance.resource_dir:
+        jvm_args += ['-Dchromium.robolectric.resource.dir=%s' %
+                     self._test_instance.resource_dir]
+
       if self._test_instance.coverage_dir:
         if not os.path.exists(self._test_instance.coverage_dir):
           os.makedirs(self._test_instance.coverage_dir)
         elif not os.path.isdir(self._test_instance.coverage_dir):
           raise Exception('--coverage-dir takes a directory, not file path.')
         jvm_args.append('-Demma.coverage.out.file=%s' % os.path.join(
             self._test_instance.coverage_dir,
             '%s.ec' % self._test_instance.suite))
+
       if jvm_args:
         command.extend(['--jvm-args', '"%s"' % ' '.join(jvm_args)])
 
       cmd_helper.RunCmd(command)
       results_list = json_results.ParseResultsFromJson(
           json.loads(json_file.read()))
 
       test_run_results = base_test_result.TestRunResults()
       test_run_results.AddResults(results_list)
 
       return [test_run_results]
 
   #override
   def TearDown(self):
     pass