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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptModuleTest.cpp

Issue 2795593006: Abstract out Modulator from V8PerContextData (Closed)
Patch Set: Fix tests Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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
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 auto contextData = V8PerContextData::from(scope.context()); 150 Modulator::setModulator(&scope.frame(), modulator);
151 contextData->setModulator(modulator);
152 151
153 ScriptModule module = ScriptModule::compile( 152 ScriptModule module = ScriptModule::compile(
154 scope.isolate(), "export const a = 42;", "foo.js", SharableCrossOrigin); 153 scope.isolate(), "export const a = 42;", "foo.js", SharableCrossOrigin);
155 ASSERT_FALSE(module.isNull()); 154 ASSERT_FALSE(module.isNull());
156 ScriptValue exception = module.instantiate(scope.getScriptState()); 155 ScriptValue exception = module.instantiate(scope.getScriptState());
157 ASSERT_TRUE(exception.isEmpty()); 156 ASSERT_TRUE(exception.isEmpty());
158 157
159 EXPECT_EQ(0u, resolver->resolveCount()); 158 EXPECT_EQ(0u, resolver->resolveCount());
160 } 159 }
161 160
162 TEST(ScriptModuleTest, instantiateWithDeps) { 161 TEST(ScriptModuleTest, instantiateWithDeps) {
163 V8TestingScope scope; 162 V8TestingScope scope;
164 163
165 auto modulator = new ScriptModuleTestModulator(); 164 auto modulator = new ScriptModuleTestModulator();
166 auto resolver = modulator->testScriptModuleResolver(); 165 auto resolver = modulator->testScriptModuleResolver();
167 166
168 auto contextData = V8PerContextData::from(scope.context()); 167 Modulator::setModulator(&scope.frame(), modulator);
169 contextData->setModulator(modulator);
170 168
171 ScriptModule moduleA = ScriptModule::compile( 169 ScriptModule moduleA = ScriptModule::compile(
172 scope.isolate(), "export const a = 'a';", "foo.js", SharableCrossOrigin); 170 scope.isolate(), "export const a = 'a';", "foo.js", SharableCrossOrigin);
173 ASSERT_FALSE(moduleA.isNull()); 171 ASSERT_FALSE(moduleA.isNull());
174 resolver->pushScriptModule(moduleA); 172 resolver->pushScriptModule(moduleA);
175 173
176 ScriptModule moduleB = ScriptModule::compile( 174 ScriptModule moduleB = ScriptModule::compile(
177 scope.isolate(), "export const b = 'b';", "foo.js", SharableCrossOrigin); 175 scope.isolate(), "export const b = 'b';", "foo.js", SharableCrossOrigin);
178 ASSERT_FALSE(moduleB.isNull()); 176 ASSERT_FALSE(moduleB.isNull());
179 resolver->pushScriptModule(moduleB); 177 resolver->pushScriptModule(moduleB);
180 178
181 ScriptModule module = ScriptModule::compile( 179 ScriptModule module = ScriptModule::compile(
182 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",
183 SharableCrossOrigin); 181 SharableCrossOrigin);
184 ASSERT_FALSE(module.isNull()); 182 ASSERT_FALSE(module.isNull());
185 ScriptValue exception = module.instantiate(scope.getScriptState()); 183 ScriptValue exception = module.instantiate(scope.getScriptState());
186 ASSERT_TRUE(exception.isEmpty()); 184 ASSERT_TRUE(exception.isEmpty());
187 185
188 ASSERT_EQ(2u, resolver->resolveCount()); 186 ASSERT_EQ(2u, resolver->resolveCount());
189 EXPECT_EQ("a", resolver->specifiers()[0]); 187 EXPECT_EQ("a", resolver->specifiers()[0]);
190 EXPECT_EQ("b", resolver->specifiers()[1]); 188 EXPECT_EQ("b", resolver->specifiers()[1]);
191 } 189 }
192 190
193 } // namespace 191 } // namespace
194 192
195 } // namespace blink 193 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698