Convert mus apptests to shelltests

components/mus/ws/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 
 source_set("lib") {
@@ skipping 114 matching lines @@
     "//components/mus/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings:bindings",
     "//ui/mojo/geometry:interfaces",
   ]
 }
 
 group("tests") {
   testonly = true
   deps = [
-    ":apptests",
     ":window_manager_unittests",
   ]
   if (!is_android) {
-    deps +=
-        [ "//components/mus/public/cpp/tests:mojo_view_manager_lib_unittests" ]
+    deps += [
+      ":window_manager_shelltests",
+      "//components/mus/public/cpp/tests:mojo_view_manager_lib_unittests",
+    ]
   }
 }
 
 test("window_manager_unittests") {
   sources = [
     "display_unittest.cc",
     "event_dispatcher_unittest.cc",
     "focus_controller_unittest.cc",
     "server_window_drawn_tracker_unittest.cc",
     "server_window_surface_manager_test_api.cc",
@@ skipping 34 matching lines @@
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/mojo/geometry:interfaces",
   ]
 
   if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
     deps += [ "//third_party/mesa:osmesa" ]
   }
 }
 
-mojo_native_application("apptests") {
-  output_name = "mus_apptests"
-  testonly = true
-
+test("window_manager_shelltests") {

[Ben Goodger (Google), 2016/03/08 18:07:23]

rather than calling these out as a separate test suite, I think you can just
merge these files into window_manager_unittests.

window_manager_unittests should probably be called mus_ws_unittests

   sources = [
-    "window_manager_client_apptest.cc",
-    "window_tree_apptest.cc",
+    "window_manager_client_shelltest.cc",
+    "window_tree_shelltest.cc",
   ]
 
   deps = [
-    ":manifest",
     ":test_support",
+    ":window_manager_shelltests_manifest",
     "//base",
     "//base/test:test_config",
     "//components/mus/common:mus_common",
     "//components/mus/public/cpp",
     "//components/mus/public/cpp/tests:test_support",
     "//components/mus/public/interfaces",
     "//mojo/converters/geometry",
+    "//mojo/shell/public/cpp:shell_test_support",
     "//mojo/shell/public/cpp:sources",
     "//mojo/shell/public/cpp:test_support",
+    "//mojo/shell/public/cpp/test:run_all_shelltests",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
+    "//ui/gl",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
 
-  data_deps = [
-    ":lib",
-  ]
-
   if (use_x11) {
     deps += [ "//tools/xdisplaycheck" ]
   }
 }
 
-mojo_application_manifest("manifest") {
-  application_name = "mus_apptests"
-  source = "apptest_manifest.json"
+mojo_application_manifest("window_manager_shelltests_manifest") {
+  application_name = "window_manager_shelltests_app"
+  source = "window_manager_shelltests_app_manifest.json"
 }