OLD | NEW |
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/modules/timer.h" |
11 #include "gin/test/file_runner.h" | 11 #include "gin/test/file_runner.h" |
12 #include "gin/test/gtest.h" | 12 #include "gin/test/gtest.h" |
13 #include "mojo/edk/js/core.h" | 13 #include "mojo/edk/js/core.h" |
14 #include "mojo/edk/js/support.h" | 14 #include "mojo/edk/js/support.h" |
15 #include "mojo/edk/js/threading.h" | 15 #include "mojo/edk/js/threading.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
17 | 17 |
18 namespace mojo { | 18 namespace mojo { |
19 namespace edk { | 19 namespace edk { |
| 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); |
26 AddBuiltinModule(Core::kModuleName, Core::GetModule); | 27 AddBuiltinModule(Core::kModuleName, Core::GetModule); |
27 AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule); | 28 AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule); |
28 AddBuiltinModule(Threading::kModuleName, Threading::GetModule); | 29 AddBuiltinModule(Threading::kModuleName, Threading::GetModule); |
29 AddBuiltinModule(Support::kModuleName, Support::GetModule); | 30 AddBuiltinModule(Support::kModuleName, Support::GetModule); |
(...skipping 16 matching lines...) Expand all Loading... |
46 | 47 |
47 TEST(JSTest, connection) { | 48 TEST(JSTest, connection) { |
48 RunTest("connection_tests.js"); | 49 RunTest("connection_tests.js"); |
49 } | 50 } |
50 | 51 |
51 TEST(JSTest, sample_service) { | 52 TEST(JSTest, sample_service) { |
52 RunTest("sample_service_tests.js"); | 53 RunTest("sample_service_tests.js"); |
53 } | 54 } |
54 | 55 |
55 } // namespace | 56 } // namespace |
| 57 } // namespace js |
56 } // namespace edk | 58 } // namespace edk |
57 } // namespace mojo | 59 } // namespace mojo |
OLD | NEW |