| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "bindings/core/v8/ScriptModule.h" | 5 #include "bindings/core/v8/ScriptModule.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/V8BindingForTesting.h" | 7 #include "bindings/core/v8/V8BindingForTesting.h" |
| 8 #include "bindings/core/v8/V8PerContextData.h" | 8 #include "bindings/core/v8/V8PerContextData.h" |
| 9 #include "core/dom/ScriptModuleResolver.h" | 9 #include "core/dom/ScriptModuleResolver.h" |
| 10 #include "core/testing/DummyModulator.h" | 10 #include "core/testing/DummyModulator.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 auto requests = module.moduleRequests(scope.getScriptState()); | 140 auto requests = module.moduleRequests(scope.getScriptState()); |
| 141 EXPECT_THAT(requests, ::testing::ContainerEq<Vector<String>>({"a", "b"})); | 141 EXPECT_THAT(requests, ::testing::ContainerEq<Vector<String>>({"a", "b"})); |
| 142 } | 142 } |
| 143 | 143 |
| 144 TEST(ScriptModuleTest, instantiateNoDeps) { | 144 TEST(ScriptModuleTest, instantiateNoDeps) { |
| 145 V8TestingScope scope; | 145 V8TestingScope scope; |
| 146 | 146 |
| 147 auto modulator = new ScriptModuleTestModulator(); | 147 auto modulator = new ScriptModuleTestModulator(); |
| 148 auto resolver = modulator->testScriptModuleResolver(); | 148 auto resolver = modulator->testScriptModuleResolver(); |
| 149 | 149 |
| 150 Modulator::setModulator(&scope.frame(), modulator); | 150 Modulator::setModulator(scope.getScriptState(), modulator); |
| 151 | 151 |
| 152 ScriptModule module = ScriptModule::compile( | 152 ScriptModule module = ScriptModule::compile( |
| 153 scope.isolate(), "export const a = 42;", "foo.js", SharableCrossOrigin); | 153 scope.isolate(), "export const a = 42;", "foo.js", SharableCrossOrigin); |
| 154 ASSERT_FALSE(module.isNull()); | 154 ASSERT_FALSE(module.isNull()); |
| 155 ScriptValue exception = module.instantiate(scope.getScriptState()); | 155 ScriptValue exception = module.instantiate(scope.getScriptState()); |
| 156 ASSERT_TRUE(exception.isEmpty()); | 156 ASSERT_TRUE(exception.isEmpty()); |
| 157 | 157 |
| 158 EXPECT_EQ(0u, resolver->resolveCount()); | 158 EXPECT_EQ(0u, resolver->resolveCount()); |
| 159 } | 159 } |
| 160 | 160 |
| 161 TEST(ScriptModuleTest, instantiateWithDeps) { | 161 TEST(ScriptModuleTest, instantiateWithDeps) { |
| 162 V8TestingScope scope; | 162 V8TestingScope scope; |
| 163 | 163 |
| 164 auto modulator = new ScriptModuleTestModulator(); | 164 auto modulator = new ScriptModuleTestModulator(); |
| 165 auto resolver = modulator->testScriptModuleResolver(); | 165 auto resolver = modulator->testScriptModuleResolver(); |
| 166 | 166 |
| 167 Modulator::setModulator(&scope.frame(), modulator); | 167 Modulator::setModulator(scope.getScriptState(), modulator); |
| 168 | 168 |
| 169 ScriptModule moduleA = ScriptModule::compile( | 169 ScriptModule moduleA = ScriptModule::compile( |
| 170 scope.isolate(), "export const a = 'a';", "foo.js", SharableCrossOrigin); | 170 scope.isolate(), "export const a = 'a';", "foo.js", SharableCrossOrigin); |
| 171 ASSERT_FALSE(moduleA.isNull()); | 171 ASSERT_FALSE(moduleA.isNull()); |
| 172 resolver->pushScriptModule(moduleA); | 172 resolver->pushScriptModule(moduleA); |
| 173 | 173 |
| 174 ScriptModule moduleB = ScriptModule::compile( | 174 ScriptModule moduleB = ScriptModule::compile( |
| 175 scope.isolate(), "export const b = 'b';", "foo.js", SharableCrossOrigin); | 175 scope.isolate(), "export const b = 'b';", "foo.js", SharableCrossOrigin); |
| 176 ASSERT_FALSE(moduleB.isNull()); | 176 ASSERT_FALSE(moduleB.isNull()); |
| 177 resolver->pushScriptModule(moduleB); | 177 resolver->pushScriptModule(moduleB); |
| 178 | 178 |
| 179 ScriptModule module = ScriptModule::compile( | 179 ScriptModule module = ScriptModule::compile( |
| 180 scope.isolate(), "import 'a'; import 'b'; export const c = 123;", "c.js", | 180 scope.isolate(), "import 'a'; import 'b'; export const c = 123;", "c.js", |
| 181 SharableCrossOrigin); | 181 SharableCrossOrigin); |
| 182 ASSERT_FALSE(module.isNull()); | 182 ASSERT_FALSE(module.isNull()); |
| 183 ScriptValue exception = module.instantiate(scope.getScriptState()); | 183 ScriptValue exception = module.instantiate(scope.getScriptState()); |
| 184 ASSERT_TRUE(exception.isEmpty()); | 184 ASSERT_TRUE(exception.isEmpty()); |
| 185 | 185 |
| 186 ASSERT_EQ(2u, resolver->resolveCount()); | 186 ASSERT_EQ(2u, resolver->resolveCount()); |
| 187 EXPECT_EQ("a", resolver->specifiers()[0]); | 187 EXPECT_EQ("a", resolver->specifiers()[0]); |
| 188 EXPECT_EQ("b", resolver->specifiers()[1]); | 188 EXPECT_EQ("b", resolver->specifiers()[1]); |
| 189 } | 189 } |
| 190 | 190 |
| 191 } // namespace | 191 } // namespace |
| 192 | 192 |
| 193 } // namespace blink | 193 } // namespace blink |
| OLD | NEW |