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

Unified Diff: mojo/bindings/js/run_js_tests.cc

Issue 193403003: Move relevent JS tests to mojo_js_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add back deps Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/bindings/js/core_unittests.js ('k') | mojo/mojo.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/bindings/js/run_js_tests.cc
diff --git a/mojo/apps/js/test/run_js_tests.cc b/mojo/bindings/js/run_js_tests.cc
similarity index 66%
rename from mojo/apps/js/test/run_js_tests.cc
rename to mojo/bindings/js/run_js_tests.cc
index 872e5e3d7fbf97d1a733af007b2f51767d1fdd8d..53608fdb51805965a236f8f20c57ada403c5a516 100644
--- a/mojo/apps/js/test/run_js_tests.cc
+++ b/mojo/bindings/js/run_js_tests.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,8 +9,6 @@
#include "gin/modules/timer.h"
#include "gin/test/file_runner.h"
#include "gin/test/gtest.h"
-#include "mojo/apps/js/bindings/monotonic_clock.h"
-#include "mojo/apps/js/bindings/threading.h"
#include "mojo/bindings/js/core.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -23,10 +21,6 @@ class TestRunnerDelegate : public gin::FileRunnerDelegate {
TestRunnerDelegate() {
AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule);
AddBuiltinModule(Core::kModuleName, Core::GetModule);
- AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule);
- AddBuiltinModule(apps::MonotonicClock::kModuleName,
- apps::MonotonicClock::GetModule);
- AddBuiltinModule(apps::Threading::kModuleName, apps::Threading::GetModule);
}
private:
@@ -37,9 +31,8 @@ void RunTest(std::string test, bool run_until_idle) {
base::FilePath path;
PathService::Get(base::DIR_SOURCE_ROOT, &path);
path = path.AppendASCII("mojo")
- .AppendASCII("apps")
- .AppendASCII("js")
.AppendASCII("bindings")
+ .AppendASCII("js")
.AppendASCII(test);
TestRunnerDelegate delegate;
gin::RunTestFromFile(path, &delegate, run_until_idle);
@@ -54,18 +47,6 @@ TEST(JSTest, codec) {
RunTest("codec_unittests.js", true);
}
-TEST(JSTest, sample_test) {
- RunTest("sample_service_unittests.js", true);
-}
-
-TEST(JSTest, connector) {
- RunTest("connector_unittests.js", true);
-}
-
-TEST(JSTest, monotonic_clock) {
- RunTest("monotonic_clock_unittests.js", false);
-}
-
} // namespace
} // namespace js
} // namespace mojo
« no previous file with comments | « mojo/bindings/js/core_unittests.js ('k') | mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698