| 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/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "gin/modules/console.h" | 7 #include "gin/modules/console.h" |
| 8 #include "gin/modules/module_registry.h" | 8 #include "gin/modules/module_registry.h" |
| 9 #include "gin/modules/timer.h" | 9 #include "gin/modules/timer.h" |
| 10 #include "gin/test/file_runner.h" | 10 #include "gin/test/file_runner.h" |
| 11 #include "gin/test/gtest.h" | 11 #include "gin/test/gtest.h" |
| 12 #include "mojo/edk/js/core.h" |
| 13 #include "mojo/edk/js/support.h" |
| 14 #include "mojo/edk/js/threading.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 13 #include "third_party/mojo/src/mojo/edk/js/core.h" | |
| 14 #include "third_party/mojo/src/mojo/edk/js/support.h" | |
| 15 #include "third_party/mojo/src/mojo/edk/js/threading.h" | |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 namespace js { | 18 namespace edk { |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 class TestRunnerDelegate : public gin::FileRunnerDelegate { | 21 class TestRunnerDelegate : public gin::FileRunnerDelegate { |
| 22 public: | 22 public: |
| 23 TestRunnerDelegate() { | 23 TestRunnerDelegate() { |
| 24 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule); | 24 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule); |
| 25 AddBuiltinModule(Core::kModuleName, Core::GetModule); | 25 AddBuiltinModule(Core::kModuleName, Core::GetModule); |
| 26 AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule); | 26 AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule); |
| 27 AddBuiltinModule(Threading::kModuleName, Threading::GetModule); | 27 AddBuiltinModule(Threading::kModuleName, Threading::GetModule); |
| 28 } | 28 } |
| (...skipping 17 matching lines...) Expand all Loading... |
| 46 | 46 |
| 47 TEST(JSTest, connection) { | 47 TEST(JSTest, connection) { |
| 48 RunTest("connection_tests.js", false); | 48 RunTest("connection_tests.js", false); |
| 49 } | 49 } |
| 50 | 50 |
| 51 TEST(JSTest, sample_service) { | 51 TEST(JSTest, sample_service) { |
| 52 RunTest("sample_service_tests.js", true); | 52 RunTest("sample_service_tests.js", true); |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace | 55 } // namespace |
| 56 } // namespace js | 56 } // namespace edk |
| 57 } // namespace mojo | 57 } // namespace mojo |
| OLD | NEW |