From 71119284f99129482d658033223461e931121fd9 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Tue, 18 Aug 2015 21:02:52 +0200
Subject: test: drop Isolate::GetCurrent() from addon tests

v8::Isolate::GetCurrent() is not exactly deprecated at this point but
its use is strongly discouraged.  Update the addon tests so they no
longer use it.

PR-URL: https://github.com/nodejs/node/pull/2427
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 test/addons/async-hello-world/binding.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'test/addons/async-hello-world')

diff --git a/test/addons/async-hello-world/binding.cc b/test/addons/async-hello-world/binding.cc
index 049afab7e7..aee3a3763f 100644
--- a/test/addons/async-hello-world/binding.cc
+++ b/test/addons/async-hello-world/binding.cc
@@ -7,6 +7,7 @@ struct async_req {
   uv_work_t req;
   int input;
   int output;
+  v8::Isolate* isolate;
   v8::Persistent<v8::Function> callback;
 };
 
@@ -17,9 +18,9 @@ void DoAsync(uv_work_t* r) {
 }
 
 void AfterAsync(uv_work_t* r) {
-  v8::Isolate* isolate = v8::Isolate::GetCurrent();
-  v8::HandleScope scope(isolate);
   async_req* req = reinterpret_cast<async_req*>(r->data);
+  v8::Isolate* isolate = req->isolate;
+  v8::HandleScope scope(isolate);
 
   v8::Handle<v8::Value> argv[2] = {
     v8::Null(isolate),
@@ -42,7 +43,7 @@ void AfterAsync(uv_work_t* r) {
 }
 
 void Method(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  v8::Isolate* isolate = v8::Isolate::GetCurrent();
+  v8::Isolate* isolate = args.GetIsolate();
   v8::HandleScope scope(isolate);
 
   async_req* req = new async_req;
@@ -50,6 +51,7 @@ void Method(const v8::FunctionCallbackInfo<v8::Value>& args) {
 
   req->input = args[0]->IntegerValue();
   req->output = 0;
+  req->isolate = isolate;
 
   v8::Local<v8::Function> callback = v8::Local<v8::Function>::Cast(args[1]);
   req->callback.Reset(isolate, callback);
-- 
cgit v1.2.1