| OLD | NEW | 
|---|
|  | (Empty) | 
| 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 |  | 
| 3 // found in the LICENSE file. |  | 
| 4 |  | 
| 5 #include "base/files/file_path.h" |  | 
| 6 #include "base/path_service.h" |  | 
| 7 #include "gin/modules/console.h" |  | 
| 8 #include "gin/modules/module_registry.h" |  | 
| 9 #include "gin/modules/timer.h" |  | 
| 10 #include "gin/test/file_runner.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" |  | 
| 15 #include "testing/gtest/include/gtest/gtest.h" |  | 
| 16 |  | 
| 17 namespace mojo { |  | 
| 18 namespace js { |  | 
| 19 namespace { |  | 
| 20 |  | 
| 21 class TestRunnerDelegate : public gin::FileRunnerDelegate { |  | 
| 22  public: |  | 
| 23   TestRunnerDelegate() { |  | 
| 24     AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule); |  | 
| 25     AddBuiltinModule(Core::kModuleName, Core::GetModule); |  | 
| 26     AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule); |  | 
| 27     AddBuiltinModule(Threading::kModuleName, Threading::GetModule); |  | 
| 28   } |  | 
| 29  private: |  | 
| 30   DISALLOW_COPY_AND_ASSIGN(TestRunnerDelegate); |  | 
| 31 }; |  | 
| 32 |  | 
| 33 void RunTest(std::string test, bool addSupportModule) { |  | 
| 34   base::FilePath path; |  | 
| 35   PathService::Get(base::DIR_SOURCE_ROOT, &path); |  | 
| 36   path = path.AppendASCII("mojo") |  | 
| 37              .AppendASCII("edk") |  | 
| 38              .AppendASCII("js") |  | 
| 39              .AppendASCII("tests") |  | 
| 40              .AppendASCII(test); |  | 
| 41   TestRunnerDelegate delegate; |  | 
| 42   if (addSupportModule) |  | 
| 43     delegate.AddBuiltinModule(Support::kModuleName, Support::GetModule); |  | 
| 44   gin::RunTestFromFile(path, &delegate, true); |  | 
| 45 } |  | 
| 46 |  | 
| 47 TEST(JSTest, connection) { |  | 
| 48   RunTest("connection_tests.js", false); |  | 
| 49 } |  | 
| 50 |  | 
| 51 TEST(JSTest, sample_service) { |  | 
| 52   RunTest("sample_service_tests.js", true); |  | 
| 53 } |  | 
| 54 |  | 
| 55 }  // namespace |  | 
| 56 }  // namespace js |  | 
| 57 }  // namespace mojo |  | 
| OLD | NEW | 
|---|