Moving mojo/validation test into LayoutTests

BUG=647036 TBR=yzshen,dpranke,jbroman Review-Url: https://codereview.chromium.org/2853293003 Cr-Commit-Position: refs/heads/master@{#469506}
FairyWorld · May 4, 2017 · 577b29e · 577b29e
1 parent 56aabec
commit 577b29e
Show file tree

Hide file tree

Showing 8 changed files with 375 additions and 352 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -872,8 +872,8 @@ if (!is_ios) {
     data_deps = [
       ":layout_test_data_mojo_bindings",
       "//content/shell:content_shell",
+      "//mojo/public/interfaces/bindings/tests",
       "//mojo/public/interfaces/bindings/tests:test_associated_interfaces",
-      "//mojo/public/interfaces/bindings/tests:test_interfaces",
       "//third_party/WebKit/public:blink_devtools_frontend_resources_files",
       "//third_party/mesa:osmesa",
       "//tools/imagediff",

diff --git a/mojo/edk/js/tests/run_js_unittests.cc b/mojo/edk/js/tests/run_js_unittests.cc
@@ -51,10 +51,6 @@ TEST(JSTest, Core) {
   RunTest("core_unittest.js", true);
 }
 
-TEST(JSTest, Validation) {
-  RunTest("validation_unittest.js", true);
-}
-
 }  // namespace
 }  // namespace js
 }  // namespace edk

diff --git a/mojo/public/interfaces/bindings/tests/BUILD.gn b/mojo/public/interfaces/bindings/tests/BUILD.gn
@@ -4,6 +4,44 @@
 
 import("../../../tools/bindings/mojom.gni")
 
+group("tests") {
+  testonly = true
+  deps = [
+    ":test_interfaces",
+  ]
+  data_deps = [
+    ":test_data",
+    ":test_data_list",
+  ]
+}
+
+copy("test_data") {
+  testonly = true
+  sources = [
+    "data/validation",
+  ]
+  outputs = [
+    "$root_gen_dir/layout_test_data/{{source_root_relative_dir}}/{{source_file_part}}",
+  ]
+}
+
+action_foreach("test_data_list") {
+  testonly = true
+  script = "//mojo/public/tools/bindings/gen_data_files_list.py"
+  sources = [
+    "data/validation",
+  ]
+  outputs = [
+    "$root_gen_dir/layout_test_data/{{source_root_relative_dir}}/{{source_file_part}}_index.txt",
+  ]
+  args = [
+    "-d",
+    rebase_path(sources[0], root_build_dir),
+    "-o",
+    rebase_path(outputs[0], root_build_dir),
+  ]
+}
+
 mojom("test_interfaces") {
   testonly = true
   sources = [

diff --git a/mojo/public/js/BUILD.gn b/mojo/public/js/BUILD.gn
@@ -82,10 +82,7 @@ group("tests") {
   testonly = true
 
   data = [
-    "//mojo/public/interfaces/bindings/tests/data/validation/",
     "tests/core_unittest.js",
-    "tests/validation_test_input_parser.js",
-    "tests/validation_unittest.js",
   ]
 
   public_deps = [