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

Side by Side Diff: mojo/edk/js/tests/run_js_unittests.cc

Issue 2744963002: Introduce InterfaceEndpointClient(IEC), InterfaceEndpointHandle and (Closed)
Patch Set: Resolve Merge with new changes from master. Created 3 years, 9 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
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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "gin/modules/console.h" 8 #include "gin/modules/console.h"
9 #include "gin/modules/module_registry.h" 9 #include "gin/modules/module_registry.h"
10 #include "gin/modules/timer.h"
10 #include "gin/test/file_runner.h" 11 #include "gin/test/file_runner.h"
11 #include "gin/test/gtest.h" 12 #include "gin/test/gtest.h"
12 #include "mojo/edk/js/core.h" 13 #include "mojo/edk/js/core.h"
13 #include "mojo/edk/js/support.h" 14 #include "mojo/edk/js/support.h"
14 #include "mojo/edk/js/threading.h" 15 #include "mojo/edk/js/threading.h"
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 17
17 namespace mojo { 18 namespace mojo {
18 namespace edk { 19 namespace edk {
19 namespace js { 20 namespace js {
20 namespace { 21 namespace {
21 22
22 class TestRunnerDelegate : public gin::FileRunnerDelegate { 23 class TestRunnerDelegate : public gin::FileRunnerDelegate {
23 public: 24 public:
24 TestRunnerDelegate() { 25 TestRunnerDelegate() {
25 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule); 26 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule);
27 AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule);
26 AddBuiltinModule(Core::kModuleName, Core::GetModule); 28 AddBuiltinModule(Core::kModuleName, Core::GetModule);
27 AddBuiltinModule(Threading::kModuleName, Threading::GetModule); 29 AddBuiltinModule(Threading::kModuleName, Threading::GetModule);
28 AddBuiltinModule(Support::kModuleName, Support::GetModule); 30 AddBuiltinModule(Support::kModuleName, Support::GetModule);
29 } 31 }
30 32
31 private: 33 private:
32 DISALLOW_COPY_AND_ASSIGN(TestRunnerDelegate); 34 DISALLOW_COPY_AND_ASSIGN(TestRunnerDelegate);
33 }; 35 };
34 36
35 void RunTest(std::string test, bool run_until_idle) { 37 void RunTest(std::string test, bool run_until_idle) {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 } 76 }
75 77
76 TEST(JSTest, Validation) { 78 TEST(JSTest, Validation) {
77 RunTest("validation_unittest.js", true); 79 RunTest("validation_unittest.js", true);
78 } 80 }
79 81
80 } // namespace 82 } // namespace
81 } // namespace js 83 } // namespace js
82 } // namespace edk 84 } // namespace edk
83 } // namespace mojo 85 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698