Create an apptesting framework for dart.

mojo/tools/apptest_runner.py

 #!/usr/bin/env python
 # 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.
 
 """A test runner for gtest application tests."""
 
 import argparse
 import ast
 import logging
 import sys
 
 _logging = logging.getLogger()
 
 from mopy import android
+from mopy import dart_apptest
 from mopy import gtest
+from mopy import test_util
 from mopy.background_app_group import BackgroundAppGroup
 from mopy.config import Config
 from mopy.gn import ConfigForGNArgs, ParseGNConfig
 from mopy.paths import Paths
 
 
 def main():
   logging.basicConfig()
   # Uncomment to debug:
   #_logging.setLevel(logging.DEBUG)
@@ skipping 28 matching lines @@
     apptest = apptest_dict["test"]
     test_args = apptest_dict.get("test-args", [])
     shell_args = apptest_dict.get("shell-args", [])
     if android_origin_argument:
       shell_args.append(android_origin_argument)
     launched_services = apptest_dict.get("launched-services", [])
 
     print "Running " + apptest + "...",
     sys.stdout.flush()
 
-    # List the apptest fixtures so they can be run independently for isolation.
-    # TODO(msw): Run some apptests without fixture isolation?
-    fixtures = gtest.get_fixtures(config, shell_args, apptest)
-
-    if not fixtures:
-      print "Failed with no tests found."
-      exit_code = 1
-      continue
-
-    if any(not mojo_paths.IsValidAppUrl(url) for url in launched_services):
-      print "Failed with malformed launched-services: %r" % launched_services
-      exit_code = 1
-      continue
-
-    apptest_result = "Succeeded"
-    for fixture in fixtures:
-      apptest_args = test_args + ["--gtest_filter=%s" % fixture]
-      if launched_services:
-        success = RunApptestInLauncher(config, mojo_paths, apptest,
-                                       apptest_args, shell_args,
-                                       launched_services)
-      else:
-        success = RunApptestInShell(config, apptest, apptest_args, shell_args)
-
+    if apptest_dict.get("type", "gtest") == "dart":
+      # TODO(erg): Support android and external and fixture isolation.

[msw, 2015/03/04 21:04:31]

nit: s/external/launched services/

+      apptest_result = "Succeeded"
+      success = dart_apptest.run_test(config, shell_args, {apptest: test_args})
       if not success:
         apptest_result = "Failed test(s) in %r" % apptest_dict
         exit_code = 1
+    else:

[msw, 2015/03/04 21:04:31]

nit: maybe this could be extracted to a gtest.py function, like
run_test_with_fixture_isolation... same args as dart_apptest.run_test, plus
launched_services... that might be reasonable to punt for now.

[Elliot Glaysher, 2015/03/04 22:20:59]

Done. Moves this (and code only called from this chunk) into gtest.py

+      # List the apptest fixtures so they can be run independently for
+      # isolation.  TODO(msw): Run some apptests without fixture isolation?
+      fixtures = gtest.get_fixtures(config, shell_args, apptest)
+
+      if not fixtures:
+        print "Failed with no tests found."
+        exit_code = 1
+        continue
+
+      if any(not mojo_paths.IsValidAppUrl(url) for url in launched_services):
+        print "Failed with malformed launched-services: %r" % launched_services
+        exit_code = 1
+        continue
+
+      apptest_result = "Succeeded"
+      for fixture in fixtures:
+        apptest_args = test_args + ["--gtest_filter=%s" % fixture]
+        if launched_services:
+          success = RunApptestInLauncher(config, mojo_paths, apptest,
+                                         apptest_args, shell_args,
+                                         launched_services)
+        else:
+          success = RunApptestInShell(config, apptest, apptest_args, shell_args)
+
+        if not success:
+          apptest_result = "Failed test(s) in %r" % apptest_dict
+          exit_code = 1
 
     print apptest_result
 
   return exit_code
 
 
 def RunApptestInShell(config, application, application_args, shell_args):
   return gtest.run_test(config, shell_args, {application: application_args})
 
 
 def RunApptestInLauncher(config, mojo_paths, application, application_args,
                          shell_args, launched_services):
   with BackgroundAppGroup(
       mojo_paths, launched_services,
-      gtest.build_shell_arguments(shell_args)) as apps:
+      test_util.build_shell_arguments(shell_args)) as apps:
     launcher_args = [
         '--shell-path=' + apps.socket_path,
         '--app-url=' + application,
         '--app-path=' + mojo_paths.FileFromUrl(application),
         '--app-args=' + " ".join(application_args)]
     return gtest.run_test(config, launcher_args, run_launcher=True)
 
 
 if __name__ == '__main__':
   sys.exit(main())