Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(498)

Side by Side Diff: mojo/public/js/bindings/tests/run_js_tests.cc

Issue 411553003: Validate incoming JS Message Headers: test message parser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restored parser comment changes Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #include "base/file_util.h"
6 #include "base/files/file_path.h"
7 #include "base/path_service.h" 5 #include "base/path_service.h"
8 #include "gin/modules/console.h" 6 #include "gin/modules/console.h"
9 #include "gin/modules/module_registry.h" 7 #include "gin/modules/module_registry.h"
10 #include "gin/modules/timer.h" 8 #include "gin/modules/timer.h"
11 #include "gin/test/file_runner.h" 9 #include "gin/test/file_runner.h"
12 #include "gin/test/gtest.h" 10 #include "gin/test/gtest.h"
13 #include "mojo/bindings/js/core.h" 11 #include "mojo/bindings/js/core.h"
14 #include "mojo/common/test/test_utils.h"
15 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
16 13
17 namespace mojo { 14 namespace mojo {
18 namespace js { 15 namespace js {
19 namespace { 16 namespace {
20 17
21 class TestRunnerDelegate : public gin::FileRunnerDelegate { 18 class TestRunnerDelegate : public gin::FileRunnerDelegate {
22 public: 19 public:
23 TestRunnerDelegate() { 20 TestRunnerDelegate() {
24 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule); 21 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule);
25 AddBuiltinModule(Core::kModuleName, Core::GetModule); 22 AddBuiltinModule(Core::kModuleName, Core::GetModule);
26 } 23 }
27 24
28 private: 25 private:
29 DISALLOW_COPY_AND_ASSIGN(TestRunnerDelegate); 26 DISALLOW_COPY_AND_ASSIGN(TestRunnerDelegate);
30 }; 27 };
31 28
32 void RunTest(std::string test, bool run_until_idle) { 29 void RunTest(std::string test, bool run_until_idle) {
33 base::FilePath path; 30 base::FilePath path;
34 PathService::Get(base::DIR_SOURCE_ROOT, &path); 31 PathService::Get(base::DIR_SOURCE_ROOT, &path);
35 path = path.AppendASCII("mojo") 32 path = path.AppendASCII("mojo")
33 .AppendASCII("public")
34 .AppendASCII("js")
36 .AppendASCII("bindings") 35 .AppendASCII("bindings")
37 .AppendASCII("js")
38 .AppendASCII(test); 36 .AppendASCII(test);
39 TestRunnerDelegate delegate; 37 TestRunnerDelegate delegate;
40 gin::RunTestFromFile(path, &delegate, run_until_idle); 38 gin::RunTestFromFile(path, &delegate, run_until_idle);
41 } 39 }
42 40
43 // TODO(abarth): Should we autogenerate these stubs from GYP? 41 // TODO(abarth): Should we autogenerate these stubs from GYP?
44 TEST(JSTest, core) { 42 TEST(JSTest, core) {
45 RunTest("core_unittests.js", true); 43 RunTest("core_unittests.js", true);
46 } 44 }
47 45
48 TEST(JSTest, codec) { 46 TEST(JSTest, codec) {
49 // TODO(yzshen): Remove this check once isolated tests are supported on the 47 RunTest("codec_unittests.js", true);
50 // Chromium waterfall. (http://crbug.com/351214) 48 }
51 const base::FilePath test_file_path(
52 test::GetFilePathForJSResource(
53 "mojo/public/interfaces/bindings/tests/sample_service.mojom"));
54 if (!base::PathExists(test_file_path)) {
55 LOG(WARNING) << "Mojom binding files don't exist. Skipping the test.";
56 return;
57 }
58 49
59 RunTest("codec_unittests.js", true); 50 TEST(JSTest, validation) {
51 RunTest("validation_unittests.js", true);
60 } 52 }
61 53
62 } // namespace 54 } // namespace
63 } // namespace js 55 } // namespace js
64 } // namespace mojo 56 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698