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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/extensions/module_system_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/messaging_utils_unittest.cc ('k') | chrome/renderer/extensions/safe_builtins_unittest.cc » ('j') | chrome/test/base/module_system_test.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/module_system_unittest.cc
diff --git a/chrome/renderer/extensions/module_system_unittest.cc b/chrome/renderer/extensions/module_system_unittest.cc
index 84ccd7fc1dd0da957e85d4a3c23b710fef643885..5a6fbfdaf79b803fdcf3ed94d582135540032d49 100644
--- a/chrome/renderer/extensions/module_system_unittest.cc
+++ b/chrome/renderer/extensions/module_system_unittest.cc
@@ -5,6 +5,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/test/base/module_system_test.h"
#include "extensions/renderer/module_system.h"
+#include "gin/modules/module_registry.h"
// TODO(cduvall/kalman): Put this file in extensions namespace.
using extensions::ModuleSystem;
@@ -50,226 +51,420 @@ class TestExceptionHandler : public ModuleSystem::ExceptionHandler {
};
TEST_F(ModuleSystemTest, TestExceptionHandling) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
TestExceptionHandler* handler = new TestExceptionHandler;
scoped_ptr<ModuleSystem::ExceptionHandler> scoped_handler(handler);
ASSERT_FALSE(handler->handled_exception());
- context_->module_system()->SetExceptionHandlerForTest(scoped_handler.Pass());
+ env_.module_system()->SetExceptionHandlerForTest(scoped_handler.Pass());
- RegisterModule("test", "throw 'hi';");
- context_->module_system()->Require("test");
+ env_.RegisterModule("test", "throw 'hi';");
+ env_.module_system()->Require("test");
ASSERT_TRUE(handler->handled_exception());
ExpectNoAssertionsMade();
}
TEST_F(ModuleSystemTest, TestRequire) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- RegisterModule("add", "exports.Add = function(x, y) { return x + y; };");
- RegisterModule("test",
- "var Add = require('add').Add;"
- "requireNative('assert').AssertTrue(Add(3, 5) == 8);");
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("add", "exports.Add = function(x, y) { return x + y; };");
+ env_.RegisterModule("test",
+ "var Add = require('add').Add;"
+ "requireNative('assert').AssertTrue(Add(3, 5) == 8);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestNestedRequire) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- RegisterModule("add", "exports.Add = function(x, y) { return x + y; };");
- RegisterModule("double",
- "var Add = require('add').Add;"
- "exports.Double = function(x) { return Add(x, x); };");
- RegisterModule("test",
- "var Double = require('double').Double;"
- "requireNative('assert').AssertTrue(Double(3) == 6);");
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("add", "exports.Add = function(x, y) { return x + y; };");
+ env_.RegisterModule("double",
+ "var Add = require('add').Add;"
+ "exports.Double = function(x) { return Add(x, x); };");
+ env_.RegisterModule("test",
+ "var Double = require('double').Double;"
+ "requireNative('assert').AssertTrue(Double(3) == 6);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestModuleInsulation) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- RegisterModule("x",
- "var x = 10;"
- "exports.X = function() { return x; };");
- RegisterModule("y",
- "var x = 15;"
- "require('x');"
- "exports.Y = function() { return x; };");
- RegisterModule("test",
- "var Y = require('y').Y;"
- "var X = require('x').X;"
- "var assert = requireNative('assert');"
- "assert.AssertTrue(!this.hasOwnProperty('x'));"
- "assert.AssertTrue(Y() == 15);"
- "assert.AssertTrue(X() == 10);");
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("x",
+ "var x = 10;"
+ "exports.X = function() { return x; };");
+ env_.RegisterModule("y",
+ "var x = 15;"
+ "require('x');"
+ "exports.Y = function() { return x; };");
+ env_.RegisterModule("test",
+ "var Y = require('y').Y;"
+ "var X = require('x').X;"
+ "var assert = requireNative('assert');"
+ "assert.AssertTrue(!this.hasOwnProperty('x'));"
+ "assert.AssertTrue(Y() == 15);"
+ "assert.AssertTrue(X() == 10);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestNativesAreDisabledOutsideANativesEnabledScope) {
- RegisterModule("test",
- "var assert;"
- "try {"
- " assert = requireNative('assert');"
- "} catch (e) {"
- " var caught = true;"
- "}"
- "if (assert) {"
- " assert.AssertTrue(true);"
- "}");
- context_->module_system()->Require("test");
+ env_.RegisterModule("test",
+ "var assert;"
+ "try {"
+ " assert = requireNative('assert');"
+ "} catch (e) {"
+ " var caught = true;"
+ "}"
+ "if (assert) {"
+ " assert.AssertTrue(true);"
+ "}");
+ env_.module_system()->Require("test");
ExpectNoAssertionsMade();
}
TEST_F(ModuleSystemTest, TestNativesAreEnabledWithinANativesEnabledScope) {
- RegisterModule("test",
- "var assert = requireNative('assert');"
- "assert.AssertTrue(true);");
+ env_.RegisterModule("test",
+ "var assert = requireNative('assert');"
+ "assert.AssertTrue(true);");
{
- ModuleSystem::NativesEnabledScope natives_enabled(
- context_->module_system());
+ ModuleSystem::NativesEnabledScope natives_enabled(env_.module_system());
{
ModuleSystem::NativesEnabledScope natives_enabled_inner(
- context_->module_system());
+ env_.module_system());
}
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
}
TEST_F(ModuleSystemTest, TestLazyField) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- RegisterModule("lazy",
- "exports.x = 5;");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("lazy", "exports.x = 5;");
- v8::Handle<v8::Object> object = CreateGlobal("object");
+ v8::Handle<v8::Object> object = env_.CreateGlobal("object");
- context_->module_system()->SetLazyField(object, "blah", "lazy", "x");
+ env_.module_system()->SetLazyField(object, "blah", "lazy", "x");
- RegisterModule("test",
- "var assert = requireNative('assert');"
- "assert.AssertTrue(object.blah == 5);");
- context_->module_system()->Require("test");
+ env_.RegisterModule("test",
+ "var assert = requireNative('assert');"
+ "assert.AssertTrue(object.blah == 5);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestLazyFieldYieldingObject) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- RegisterModule("lazy",
- "var object = {};"
- "object.__defineGetter__('z', function() { return 1; });"
- "object.x = 5;"
- "object.y = function() { return 10; };"
- "exports.object = object;");
-
- v8::Handle<v8::Object> object = CreateGlobal("object");
-
- context_->module_system()->SetLazyField(object, "thing", "lazy", "object");
-
- RegisterModule("test",
- "var assert = requireNative('assert');"
- "assert.AssertTrue(object.thing.x == 5);"
- "assert.AssertTrue(object.thing.y() == 10);"
- "assert.AssertTrue(object.thing.z == 1);"
- );
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("lazy",
+ "var object = {};"
+ "object.__defineGetter__('z', function() { return 1; });"
+ "object.x = 5;"
+ "object.y = function() { return 10; };"
+ "exports.object = object;");
+
+ v8::Handle<v8::Object> object = env_.CreateGlobal("object");
+
+ env_.module_system()->SetLazyField(object, "thing", "lazy", "object");
+
+ env_.RegisterModule("test",
+ "var assert = requireNative('assert');"
+ "assert.AssertTrue(object.thing.x == 5);"
+ "assert.AssertTrue(object.thing.y() == 10);"
+ "assert.AssertTrue(object.thing.z == 1);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestLazyFieldIsOnlyEvaledOnce) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- context_->module_system()->RegisterNativeHandler(
- "counter",
- scoped_ptr<NativeHandler>(new CounterNatives(context_.get())));
- RegisterModule("lazy",
- "requireNative('counter').Increment();"
- "exports.x = 5;");
-
- v8::Handle<v8::Object> object = CreateGlobal("object");
-
- context_->module_system()->SetLazyField(object, "x", "lazy", "x");
-
- RegisterModule("test",
- "var assert = requireNative('assert');"
- "var counter = requireNative('counter');"
- "assert.AssertTrue(counter.Get() == 0);"
- "object.x;"
- "assert.AssertTrue(counter.Get() == 1);"
- "object.x;"
- "assert.AssertTrue(counter.Get() == 1);");
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.module_system()->RegisterNativeHandler(
+ "counter", scoped_ptr<NativeHandler>(new CounterNatives(env_.context())));
+ env_.RegisterModule("lazy",
+ "requireNative('counter').Increment();"
+ "exports.x = 5;");
+
+ v8::Handle<v8::Object> object = env_.CreateGlobal("object");
+
+ env_.module_system()->SetLazyField(object, "x", "lazy", "x");
+
+ env_.RegisterModule("test",
+ "var assert = requireNative('assert');"
+ "var counter = requireNative('counter');"
+ "assert.AssertTrue(counter.Get() == 0);"
+ "object.x;"
+ "assert.AssertTrue(counter.Get() == 1);"
+ "object.x;"
+ "assert.AssertTrue(counter.Get() == 1);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestRequireNativesAfterLazyEvaluation) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- RegisterModule("lazy",
- "exports.x = 5;");
- v8::Handle<v8::Object> object = CreateGlobal("object");
-
- context_->module_system()->SetLazyField(object, "x", "lazy", "x");
- RegisterModule("test",
- "object.x;"
- "requireNative('assert').AssertTrue(true);");
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("lazy", "exports.x = 5;");
+ v8::Handle<v8::Object> object = env_.CreateGlobal("object");
+
+ env_.module_system()->SetLazyField(object, "x", "lazy", "x");
+ env_.RegisterModule("test",
+ "object.x;"
+ "requireNative('assert').AssertTrue(true);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestTransitiveRequire) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- RegisterModule("dependency",
- "exports.x = 5;");
- RegisterModule("lazy",
- "exports.output = require('dependency');");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("dependency", "exports.x = 5;");
+ env_.RegisterModule("lazy", "exports.output = require('dependency');");
- v8::Handle<v8::Object> object = CreateGlobal("object");
+ v8::Handle<v8::Object> object = env_.CreateGlobal("object");
- context_->module_system()->SetLazyField(object, "thing", "lazy", "output");
+ env_.module_system()->SetLazyField(object, "thing", "lazy", "output");
- RegisterModule("test",
- "var assert = requireNative('assert');"
- "assert.AssertTrue(object.thing.x == 5);");
- context_->module_system()->Require("test");
+ env_.RegisterModule("test",
+ "var assert = requireNative('assert');"
+ "assert.AssertTrue(object.thing.x == 5);");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestModulesOnlyGetEvaledOnce) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- context_->module_system()->RegisterNativeHandler(
- "counter",
- scoped_ptr<NativeHandler>(new CounterNatives(context_.get())));
-
- RegisterModule("incrementsWhenEvaled",
- "requireNative('counter').Increment();");
- RegisterModule("test",
- "var assert = requireNative('assert');"
- "var counter = requireNative('counter');"
- "assert.AssertTrue(counter.Get() == 0);"
- "require('incrementsWhenEvaled');"
- "assert.AssertTrue(counter.Get() == 1);"
- "require('incrementsWhenEvaled');"
- "assert.AssertTrue(counter.Get() == 1);");
-
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.module_system()->RegisterNativeHandler(
+ "counter", scoped_ptr<NativeHandler>(new CounterNatives(env_.context())));
+
+ env_.RegisterModule("incrementsWhenEvaled",
+ "requireNative('counter').Increment();");
+ env_.RegisterModule("test",
+ "var assert = requireNative('assert');"
+ "var counter = requireNative('counter');"
+ "assert.AssertTrue(counter.Get() == 0);"
+ "require('incrementsWhenEvaled');"
+ "assert.AssertTrue(counter.Get() == 1);"
+ "require('incrementsWhenEvaled');"
+ "assert.AssertTrue(counter.Get() == 1);");
+
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestOverrideNativeHandler) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- OverrideNativeHandler("assert", "exports.AssertTrue = function() {};");
- RegisterModule("test", "requireNative('assert').AssertTrue(true);");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.OverrideNativeHandler("assert", "exports.AssertTrue = function() {};");
+ env_.RegisterModule("test", "requireNative('assert').AssertTrue(true);");
ExpectNoAssertionsMade();
- context_->module_system()->Require("test");
+ env_.module_system()->Require("test");
}
TEST_F(ModuleSystemTest, TestOverrideNonExistentNativeHandler) {
- ModuleSystem::NativesEnabledScope natives_enabled_scope(
- context_->module_system());
- OverrideNativeHandler("thing", "exports.x = 5;");
- RegisterModule("test",
- "var assert = requireNative('assert');"
- "assert.AssertTrue(requireNative('thing').x == 5);");
- context_->module_system()->Require("test");
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.OverrideNativeHandler("thing", "exports.x = 5;");
+ env_.RegisterModule("test",
+ "var assert = requireNative('assert');"
+ "assert.AssertTrue(requireNative('thing').x == 5);");
+ env_.module_system()->Require("test");
+}
+
+TEST_F(ModuleSystemTest, TestRequireAsync) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("add",
+ "define('add', [], function() {"
+ " return { Add: function(x, y) { return x + y; } };"
+ "});");
+ env_.RegisterModule("math",
+ "define('math', ['add'], function(add) {"
+ " return { Add: add.Add };"
+ "});");
+ env_.RegisterModule(
+ "test",
+ "requireAsync('math').then(function(math) {"
+ " requireNative('assert').AssertTrue(math.Add(3, 5) == 8);"
+ "});");
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestRequireAsyncInParallel) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("add",
+ "define('add', [], function() {"
+ " return { Add: function(x, y) { return x + y; } };"
+ "});");
+ env_.RegisterModule("subtract",
+ "define('subtract', [], function() {"
+ " return { Subtract: function(x, y) { return x - y; } };"
+ "});");
+ env_.RegisterModule("math",
+ "exports.AddAndSubtract = function(x, y, z) {"
+ " return Promise.all([requireAsync('add'),"
+ " requireAsync('subtract')"
+ " ]).then(function(modules) {"
+ " return modules[1].Subtract(modules[0].Add(x, y), z);"
+ " });"
+ "};");
+ env_.RegisterModule("test",
+ "var AddAndSubtract = require('math').AddAndSubtract;"
+ "AddAndSubtract(3, 5, 2).then(function(result) {"
+ " requireNative('assert').AssertTrue(result == 6);"
+ "});");
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestNestedRequireAsyncs) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("first",
+ "define('first', [], function() {"
+ " return { next: 'second' };"
+ "});");
+ env_.RegisterModule("second",
+ "define('second', [], function() {"
+ " return { next: '' };"
+ "});");
+ env_.RegisterModule(
+ "test",
+ "requireAsync('first').then(function(module) {"
+ " return requireAsync(module.next)"
+ "}).then(function(module) {"
+ " requireNative('assert').AssertTrue(module.next === '');"
+ "});");
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestRequireFromAMDModule) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("add", "exports.Add = function(x, y) { return x + y; };");
+ env_.RegisterModule("math",
+ "define('math', [], function() {"
+ " var add = require('add');"
+ " return { Add: add.Add };"
+ "});");
+ env_.RegisterModule(
+ "test",
+ "requireAsync('math').then(function(math) {"
+ " requireNative('assert').AssertTrue(math.Add(3, 5) == 8);"
+ "});");
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestRequireAsyncFromAMDModule) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("add",
+ "define('add', [], function() {"
+ " return { Add: function(x, y) { return x + y; } };"
+ "});");
+ env_.RegisterModule("math",
+ "define('math', [], function() {"
+ " function Add(x, y) {"
+ " return requireAsync('add').then(function(add) {"
+ " return add.Add(x, y);"
+ " });"
+ " }"
+ " return { Add: Add };"
+ "});");
+ env_.RegisterModule("test",
+ "requireAsync('math').then(function(math) {"
+ " return math.Add(3, 6);"
+ "}).then(function(result) {"
+ " requireNative('assert').AssertTrue(result == 9);"
+ "});");
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestRequireAsyncFromAnotherContext) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule(
+ "test",
+ "requireAsync('natives').then(function(natives) {"
+ " natives.requireAsync('ping').then(function(ping) {"
+ " return ping();"
+ " }).then(function(result) {"
+ " requireNative('assert').AssertTrue(result == 'pong');"
+ " });"
+ "});");
+ ModuleSystemTestEnvironment other_env(&isolate_holder_);
+ other_env.RegisterModule("ping",
+ "define('ping', ['natives'], function(natives) {"
+ " return function() {"
+ " return 'pong';"
+ " }"
+ "});");
+ gin::ModuleRegistry::From(env_.context()->v8_context())
+ ->AddBuiltinModule(v8::Isolate::GetCurrent(),
+ "natives",
+ other_env.module_system()->NewInstance());
+ gin::ModuleRegistry::From(other_env.context()->v8_context())
+ ->AddBuiltinModule(v8::Isolate::GetCurrent(),
+ "natives",
+ env_.module_system()->NewInstance());
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestRequireAsyncBetweenContexts) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("pong",
+ "define('pong', [], function() {"
+ " return function() { return 'done'; };"
+ "});");
+ env_.RegisterModule(
+ "test",
+ "requireAsync('natives').then(function(natives) {"
+ " natives.requireAsync('ping').then(function(ping) {"
+ " return ping();"
+ " }).then(function(pong) {"
+ " return pong();"
+ " }).then(function(result) {"
+ " requireNative('assert').AssertTrue(result == 'done');"
+ " });"
+ "});");
+ ModuleSystemTestEnvironment other_env(&isolate_holder_);
+ other_env.RegisterModule("ping",
+ "define('ping', ['natives'], function(natives) {"
+ " return function() {"
+ " return natives.requireAsync('pong');"
+ " }"
+ "});");
+ gin::ModuleRegistry::From(env_.context()->v8_context())
+ ->AddBuiltinModule(v8::Isolate::GetCurrent(),
not at google - send to devlin 2014/07/07 23:18:50 put an isolate() property on env and use that?
Sam McNally 2014/07/08 00:07:04 Done.
+ "natives",
+ other_env.module_system()->NewInstance());
+ gin::ModuleRegistry::From(other_env.context()->v8_context())
+ ->AddBuiltinModule(v8::Isolate::GetCurrent(),
+ "natives",
+ env_.module_system()->NewInstance());
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestRequireAsyncFromContextWithNoModuleRegistry) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("test",
+ "requireAsync('natives').then(function(natives) {"
+ " var AssertTrue = requireNative('assert').AssertTrue;"
+ " natives.requireAsync('foo').then(function() {"
+ " AssertTrue(false);"
+ " }).catch(function(error) {"
+ " AssertTrue(error.message == "
+ " 'Extension view no longer exists');"
+ " });"
+ "});");
+ ModuleSystemTestEnvironment other_env(&isolate_holder_);
+ gin::ModuleRegistry::From(env_.context()->v8_context())
+ ->AddBuiltinModule(v8::Isolate::GetCurrent(),
+ "natives",
+ other_env.module_system()->NewInstance());
+ other_env.DeleteContextHolder();
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
+}
+
+TEST_F(ModuleSystemTest, TestRequireAsyncFromContextWithNoModuleSystem) {
+ ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
+ env_.RegisterModule("test",
+ "requireAsync('natives').then(function(natives) {"
+ " requireNative('assert').AssertTrue("
+ " natives.requireAsync('foo') === undefined);"
+ "});");
+ ModuleSystemTestEnvironment other_env(&isolate_holder_);
+ gin::ModuleRegistry::From(env_.context()->v8_context())
+ ->AddBuiltinModule(v8::Isolate::GetCurrent(),
+ "natives",
+ other_env.module_system()->NewInstance());
+ other_env.DeleteModuleSystem();
+ env_.module_system()->Require("test");
+ RunResolvedPromises();
}
« no previous file with comments | « chrome/renderer/extensions/messaging_utils_unittest.cc ('k') | chrome/renderer/extensions/safe_builtins_unittest.cc » ('j') | chrome/test/base/module_system_test.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698