diff options
author | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-03-01 08:58:05 -0800 |
---|---|---|
committer | Ali Sheikh <ofrobots@lemonhope.roam.corp.google.com> | 2016-03-03 20:35:20 -0800 |
commit | 069e02ab47656b3efd1b6829c65856b2e1c2d1db (patch) | |
tree | eb643e0a2e88fd64bb9fc927423458d2ae96c2db /deps/v8/test/cctest/test-global-object.cc | |
parent | 8938355398c79f583a468284b768652d12ba9bc9 (diff) | |
download | node-new-069e02ab47656b3efd1b6829c65856b2e1c2d1db.tar.gz |
deps: upgrade to V8 4.9.385.18
Pick up the current branch head for V8 4.9
https://github.com/v8/v8/commit/1ecba0f
PR-URL: https://github.com/nodejs/node/pull/4722
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaƫl Zasso <mic.besace@gmail.com>
Diffstat (limited to 'deps/v8/test/cctest/test-global-object.cc')
-rw-r--r-- | deps/v8/test/cctest/test-global-object.cc | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/deps/v8/test/cctest/test-global-object.cc b/deps/v8/test/cctest/test-global-object.cc index c696086061..d6713208bf 100644 --- a/deps/v8/test/cctest/test-global-object.cc +++ b/deps/v8/test/cctest/test-global-object.cc @@ -42,12 +42,12 @@ TEST(StrictUndeclaredGlobalVariable) { LocalContext context; v8::TryCatch try_catch(CcTest::isolate()); v8::Local<v8::Script> script = v8_compile("\"use strict\"; x = 42;"); - v8::Handle<v8::Object> proto = v8::Object::New(CcTest::isolate()); - v8::Handle<v8::Object> global = + v8::Local<v8::Object> proto = v8::Object::New(CcTest::isolate()); + v8::Local<v8::Object> global = context->Global()->GetPrototype().As<v8::Object>(); - proto->Set(var_name, v8_num(100)); - global->SetPrototype(proto); - script->Run(); + proto->Set(context.local(), var_name, v8_num(100)).FromJust(); + global->SetPrototype(context.local(), proto).FromJust(); + CHECK(script->Run(context.local()).IsEmpty()); CHECK(try_catch.HasCaught()); v8::String::Utf8Value exception(try_catch.Exception()); CHECK_EQ(0, strcmp("ReferenceError: x is not defined", *exception)); @@ -59,7 +59,7 @@ TEST(KeysGlobalObject_Regress2764) { v8::HandleScope scope(env1->GetIsolate()); // Create second environment. - v8::Handle<Context> env2 = Context::New(env1->GetIsolate()); + v8::Local<Context> env2 = Context::New(env1->GetIsolate()); Local<Value> token = v8_str("foo"); @@ -68,17 +68,25 @@ TEST(KeysGlobalObject_Regress2764) { env2->SetSecurityToken(token); // Create a reference to env2 global from env1 global. - env1->Global()->Set(v8_str("global2"), env2->Global()); + env1->Global() + ->Set(env1.local(), v8_str("global2"), env2->Global()) + .FromJust(); // Set some global variables in global2 - env2->Global()->Set(v8_str("a"), v8_str("a")); - env2->Global()->Set(v8_str("42"), v8_str("42")); + env2->Global()->Set(env2, v8_str("a"), v8_str("a")).FromJust(); + env2->Global()->Set(env2, v8_str("42"), v8_str("42")).FromJust(); // List all entries from global2. Local<Array> result; result = Local<Array>::Cast(CompileRun("Object.keys(global2)")); CHECK_EQ(2u, result->Length()); - CHECK(v8_str("42")->Equals(result->Get(0))); - CHECK(v8_str("a")->Equals(result->Get(1))); + CHECK( + v8_str("42") + ->Equals(env1.local(), result->Get(env1.local(), 0).ToLocalChecked()) + .FromJust()); + CHECK( + v8_str("a") + ->Equals(env1.local(), result->Get(env1.local(), 1).ToLocalChecked()) + .FromJust()); result = Local<Array>::Cast(CompileRun("Object.getOwnPropertyNames(global2)")); |