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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/extensions/messaging_utils_unittest.cc

Issue 359413004: Add support for using AMD modules from extensions modules. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cross-context tests Created 6 years, 5 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 | « chrome/renderer/extensions/json_schema_unittest.cc ('k') | chrome/renderer/extensions/module_system_unittest.cc » ('j') | chrome/renderer/extensions/module_system_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/messaging_utils_unittest.cc
diff --git a/chrome/renderer/extensions/messaging_utils_unittest.cc b/chrome/renderer/extensions/messaging_utils_unittest.cc
index 4a53bbd2c0878abd35e9b5cd27765f8436a4ee14..67062281ad37188088fce1e6df43faa30da7fa71 100644
--- a/chrome/renderer/extensions/messaging_utils_unittest.cc
+++ b/chrome/renderer/extensions/messaging_utils_unittest.cc
@@ -12,19 +12,21 @@ namespace {
class MessagingUtilsUnittest : public ModuleSystemTest {
protected:
void RegisterTestModule(const char* code) {
- RegisterModule("test", base::StringPrintf(
- "var assert = requireNative('assert');\n"
- "var AssertTrue = assert.AssertTrue;\n"
- "var AssertFalse = assert.AssertFalse;\n"
- "var messagingUtils = require('messaging_utils');\n"
- "%s", code));
+ env_.RegisterModule("test",
+ base::StringPrintf(
+ "var assert = requireNative('assert');\n"
+ "var AssertTrue = assert.AssertTrue;\n"
+ "var AssertFalse = assert.AssertFalse;\n"
+ "var messagingUtils = require('messaging_utils');\n"
+ "%s",
+ code));
}
private:
virtual void SetUp() OVERRIDE {
ModuleSystemTest::SetUp();
- RegisterModule("messaging_utils", IDR_MESSAGING_UTILS_JS);
+ env_.RegisterModule("messaging_utils", IDR_MESSAGING_UTILS_JS);
}
};
@@ -34,66 +36,59 @@ TEST_F(MessagingUtilsUnittest, TestNothing) {
}
TEST_F(MessagingUtilsUnittest, NoArguments) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments();\n"
"AssertTrue(args === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, ZeroArguments) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments([]);"
"AssertTrue(args === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, TooManyArgumentsNoOptions) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments(\n"
" ['a', 'b', 'c', 'd']);\n"
"AssertTrue(args === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, TooManyArgumentsWithOptions) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments(\n"
" ['a', 'b', 'c', 'd', 'e'], true);\n"
"AssertTrue(args === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, FinalArgumentIsNotAFunctionNoOptions) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments(\n"
" ['a', 'b', 'c']);\n"
"AssertTrue(args === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, FinalArgumentIsNotAFunctionWithOptions) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments(\n"
" ['a', 'b', 'c', 'd'], true);\n"
"AssertTrue(args === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, OneStringArgument) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
// Because the request argument is required, a single argument must get
// mapped to it rather than to the optional targetId argument.
RegisterTestModule(
@@ -102,12 +97,11 @@ TEST_F(MessagingUtilsUnittest, OneStringArgument) {
"AssertTrue(args[0] === null);\n"
"AssertTrue(args[1] == 'a');\n"
"AssertTrue(args[2] === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, OneStringAndOneNullArgument) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
// Explicitly specifying null as the request is allowed.
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments(['a', null]);\n"
@@ -115,24 +109,22 @@ TEST_F(MessagingUtilsUnittest, OneStringAndOneNullArgument) {
"AssertTrue(args[0] == 'a');\n"
"AssertTrue(args[1] === null);\n"
"AssertTrue(args[2] === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, OneNullAndOneStringArgument) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
RegisterTestModule(
"var args = messagingUtils.alignSendMessageArguments([null, 'a']);\n"
"AssertTrue(args.length == 3);\n"
"AssertTrue(args[0] === null);\n"
"AssertTrue(args[1] == 'a');\n"
"AssertTrue(args[2] === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, OneStringAndOneFunctionArgument) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
// When the arguments are a string and a function, the function is
// unambiguously the responseCallback. Because the request argument is
// required, the remaining argument must get mapped to it rather than to the
@@ -144,12 +136,11 @@ TEST_F(MessagingUtilsUnittest, OneStringAndOneFunctionArgument) {
"AssertTrue(args[0] === null);\n"
"AssertTrue(args[1] == 'a');\n"
"AssertTrue(args[2] == cb);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, OneStringAndOneObjectArgument) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
// This tests an ambiguous set of arguments when options are present:
// chrome.runtime.sendMessage('target', {'msg': 'this is a message'});
// vs.
@@ -168,12 +159,11 @@ TEST_F(MessagingUtilsUnittest, OneStringAndOneObjectArgument) {
"AssertTrue(args[1] == obj);\n"
"AssertTrue(args[2] === null);\n"
"AssertTrue(args[3] === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(MessagingUtilsUnittest, TwoObjectArguments) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
// When two non-string arguments are provided and options are present, the
// two arguments must match request and options, respectively, because
// targetId must be a string.
@@ -187,7 +177,7 @@ TEST_F(MessagingUtilsUnittest, TwoObjectArguments) {
"AssertTrue(args[1] == obj1);\n"
"AssertTrue(args[2] == obj2);\n"
"AssertTrue(args[3] === null);");
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
} // namespace
« no previous file with comments | « chrome/renderer/extensions/json_schema_unittest.cc ('k') | chrome/renderer/extensions/module_system_unittest.cc » ('j') | chrome/renderer/extensions/module_system_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698