| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import json | 5 import json |
| 6 import os | 6 import os |
| 7 import tempfile | 7 import tempfile |
| 8 | 8 |
| 9 from devil.utils import cmd_helper | 9 from devil.utils import cmd_helper |
| 10 from pylib import constants | 10 from pylib import constants |
| 11 from pylib.base import base_test_result | |
| 12 from pylib.results import json_results | 11 from pylib.results import json_results |
| 13 | 12 |
| 14 class JavaTestRunner(object): | 13 class JavaTestRunner(object): |
| 15 """Runs java tests on the host.""" | 14 """Runs java tests on the host.""" |
| 16 | 15 |
| 17 def __init__(self, args): | 16 def __init__(self, args): |
| 18 self._package_filter = args.package_filter | 17 self._package_filter = args.package_filter |
| 19 self._runner_filter = args.runner_filter | 18 self._runner_filter = args.runner_filter |
| 20 self._sdk_version = args.sdk_version | 19 self._sdk_version = args.sdk_version |
| 21 self._test_filter = args.test_filter | 20 self._test_filter = args.test_filter |
| (...skipping 19 matching lines...) Expand all Loading... |
| 41 if self._sdk_version: | 40 if self._sdk_version: |
| 42 command.extend(['-sdk-version', self._sdk_version]) | 41 command.extend(['-sdk-version', self._sdk_version]) |
| 43 return_code = cmd_helper.RunCmd(command) | 42 return_code = cmd_helper.RunCmd(command) |
| 44 results_list = json_results.ParseResultsFromJson( | 43 results_list = json_results.ParseResultsFromJson( |
| 45 json.loads(json_file.read())) | 44 json.loads(json_file.read())) |
| 46 return (results_list, return_code) | 45 return (results_list, return_code) |
| 47 | 46 |
| 48 def TearDown(self): | 47 def TearDown(self): |
| 49 pass | 48 pass |
| 50 | 49 |
| OLD | NEW |