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

Side by Side Diff: test/cctest/test-log.cc

Issue 24265002: bulk replace v8::Isolate::GetCurrent in tests (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « test/cctest/test-heap-profiler.cc ('k') | test/cctest/test-parsing.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2009 the V8 project authors. All rights reserved. 1 // Copyright 2006-2009 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 54
55 class ScopedLoggerInitializer { 55 class ScopedLoggerInitializer {
56 public: 56 public:
57 ScopedLoggerInitializer() 57 ScopedLoggerInitializer()
58 : saved_log_(i::FLAG_log), 58 : saved_log_(i::FLAG_log),
59 saved_prof_(i::FLAG_prof), 59 saved_prof_(i::FLAG_prof),
60 temp_file_(NULL), 60 temp_file_(NULL),
61 // Need to run this prior to creating the scope. 61 // Need to run this prior to creating the scope.
62 trick_to_run_init_flags_(init_flags_()), 62 trick_to_run_init_flags_(init_flags_()),
63 scope_(v8::Isolate::GetCurrent()), 63 scope_(CcTest::isolate()),
64 env_(v8::Context::New(v8::Isolate::GetCurrent())), 64 env_(v8::Context::New(CcTest::isolate())),
65 logger_(i::Isolate::Current()->logger()) { 65 logger_(i::Isolate::Current()->logger()) {
66 env_->Enter(); 66 env_->Enter();
67 } 67 }
68 68
69 ~ScopedLoggerInitializer() { 69 ~ScopedLoggerInitializer() {
70 env_->Exit(); 70 env_->Exit();
71 logger_->TearDown(); 71 logger_->TearDown();
72 if (temp_file_ != NULL) fclose(temp_file_); 72 if (temp_file_ != NULL) fclose(temp_file_);
73 i::FLAG_prof = saved_prof_; 73 i::FLAG_prof = saved_prof_;
74 i::FLAG_log = saved_log_; 74 i::FLAG_log = saved_log_;
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 virtual ~SimpleExternalString() {} 292 virtual ~SimpleExternalString() {}
293 virtual size_t length() const { return utf_source_.length(); } 293 virtual size_t length() const { return utf_source_.length(); }
294 virtual const uint16_t* data() const { return utf_source_.start(); } 294 virtual const uint16_t* data() const { return utf_source_.start(); }
295 private: 295 private:
296 i::ScopedVector<uint16_t> utf_source_; 296 i::ScopedVector<uint16_t> utf_source_;
297 }; 297 };
298 298
299 } // namespace 299 } // namespace
300 300
301 TEST(Issue23768) { 301 TEST(Issue23768) {
302 v8::HandleScope scope(v8::Isolate::GetCurrent()); 302 v8::HandleScope scope(CcTest::isolate());
303 v8::Handle<v8::Context> env = v8::Context::New(v8::Isolate::GetCurrent()); 303 v8::Handle<v8::Context> env = v8::Context::New(CcTest::isolate());
304 env->Enter(); 304 env->Enter();
305 305
306 SimpleExternalString source_ext_str("(function ext() {})();"); 306 SimpleExternalString source_ext_str("(function ext() {})();");
307 v8::Local<v8::String> source = v8::String::NewExternal(&source_ext_str); 307 v8::Local<v8::String> source = v8::String::NewExternal(&source_ext_str);
308 // Script needs to have a name in order to trigger InitLineEnds execution. 308 // Script needs to have a name in order to trigger InitLineEnds execution.
309 v8::Handle<v8::String> origin = v8::String::New("issue-23768-test"); 309 v8::Handle<v8::String> origin = v8::String::New("issue-23768-test");
310 v8::Handle<v8::Script> evil_script = v8::Script::Compile(source, origin); 310 v8::Handle<v8::Script> evil_script = v8::Script::Compile(source, origin);
311 CHECK(!evil_script.IsEmpty()); 311 CHECK(!evil_script.IsEmpty());
312 CHECK(!evil_script->Run().IsEmpty()); 312 CHECK(!evil_script->Run().IsEmpty());
313 i::Handle<i::ExternalTwoByteString> i_source( 313 i::Handle<i::ExternalTwoByteString> i_source(
314 i::ExternalTwoByteString::cast(*v8::Utils::OpenHandle(*source))); 314 i::ExternalTwoByteString::cast(*v8::Utils::OpenHandle(*source)));
315 // This situation can happen if source was an external string disposed 315 // This situation can happen if source was an external string disposed
316 // by its owner. 316 // by its owner.
317 i_source->set_resource(NULL); 317 i_source->set_resource(NULL);
318 318
319 // Must not crash. 319 // Must not crash.
320 i::Isolate::Current()->logger()->LogCompiledFunctions(); 320 i::Isolate::Current()->logger()->LogCompiledFunctions();
321 } 321 }
322 322
323 323
324 static void ObjMethod1(const v8::FunctionCallbackInfo<v8::Value>& args) { 324 static void ObjMethod1(const v8::FunctionCallbackInfo<v8::Value>& args) {
325 } 325 }
326 326
327 327
328 UNINITIALIZED_TEST(LogCallbacks) { 328 UNINITIALIZED_TEST(LogCallbacks) {
329 ScopedLoggerInitializer initialize_logger; 329 ScopedLoggerInitializer initialize_logger;
330 Logger* logger = initialize_logger.logger(); 330 Logger* logger = initialize_logger.logger();
331 331
332 v8::Local<v8::FunctionTemplate> obj = 332 v8::Local<v8::FunctionTemplate> obj =
333 v8::Local<v8::FunctionTemplate>::New(v8::Isolate::GetCurrent(), 333 v8::Local<v8::FunctionTemplate>::New(CcTest::isolate(),
334 v8::FunctionTemplate::New()); 334 v8::FunctionTemplate::New());
335 obj->SetClassName(v8_str("Obj")); 335 obj->SetClassName(v8_str("Obj"));
336 v8::Handle<v8::ObjectTemplate> proto = obj->PrototypeTemplate(); 336 v8::Handle<v8::ObjectTemplate> proto = obj->PrototypeTemplate();
337 v8::Local<v8::Signature> signature = v8::Signature::New(obj); 337 v8::Local<v8::Signature> signature = v8::Signature::New(obj);
338 proto->Set(v8_str("method1"), 338 proto->Set(v8_str("method1"),
339 v8::FunctionTemplate::New(ObjMethod1, 339 v8::FunctionTemplate::New(ObjMethod1,
340 v8::Handle<v8::Value>(), 340 v8::Handle<v8::Value>(),
341 signature), 341 signature),
342 static_cast<v8::PropertyAttribute>(v8::DontDelete)); 342 static_cast<v8::PropertyAttribute>(v8::DontDelete));
343 343
(...skipping 28 matching lines...) Expand all
372 static void Prop2Getter(v8::Local<v8::String> property, 372 static void Prop2Getter(v8::Local<v8::String> property,
373 const v8::PropertyCallbackInfo<v8::Value>& info) { 373 const v8::PropertyCallbackInfo<v8::Value>& info) {
374 } 374 }
375 375
376 376
377 UNINITIALIZED_TEST(LogAccessorCallbacks) { 377 UNINITIALIZED_TEST(LogAccessorCallbacks) {
378 ScopedLoggerInitializer initialize_logger; 378 ScopedLoggerInitializer initialize_logger;
379 Logger* logger = initialize_logger.logger(); 379 Logger* logger = initialize_logger.logger();
380 380
381 v8::Local<v8::FunctionTemplate> obj = 381 v8::Local<v8::FunctionTemplate> obj =
382 v8::Local<v8::FunctionTemplate>::New(v8::Isolate::GetCurrent(), 382 v8::Local<v8::FunctionTemplate>::New(CcTest::isolate(),
383 v8::FunctionTemplate::New()); 383 v8::FunctionTemplate::New());
384 obj->SetClassName(v8_str("Obj")); 384 obj->SetClassName(v8_str("Obj"));
385 v8::Handle<v8::ObjectTemplate> inst = obj->InstanceTemplate(); 385 v8::Handle<v8::ObjectTemplate> inst = obj->InstanceTemplate();
386 inst->SetAccessor(v8_str("prop1"), Prop1Getter, Prop1Setter); 386 inst->SetAccessor(v8_str("prop1"), Prop1Getter, Prop1Setter);
387 inst->SetAccessor(v8_str("prop2"), Prop2Getter); 387 inst->SetAccessor(v8_str("prop2"), Prop2Getter);
388 388
389 logger->LogAccessorCallbacks(); 389 logger->LogAccessorCallbacks();
390 390
391 bool exists = false; 391 bool exists = false;
392 i::Vector<const char> log( 392 i::Vector<const char> log(
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 v8::Local<v8::String> s = result->ToString(); 474 v8::Local<v8::String> s = result->ToString();
475 i::ScopedVector<char> data(s->Utf8Length() + 1); 475 i::ScopedVector<char> data(s->Utf8Length() + 1);
476 CHECK_NE(NULL, data.start()); 476 CHECK_NE(NULL, data.start());
477 s->WriteUtf8(data.start()); 477 s->WriteUtf8(data.start());
478 printf("%s\n", data.start()); 478 printf("%s\n", data.start());
479 // Make sure that our output is written prior crash due to CHECK failure. 479 // Make sure that our output is written prior crash due to CHECK failure.
480 fflush(stdout); 480 fflush(stdout);
481 CHECK(false); 481 CHECK(false);
482 } 482 }
483 } 483 }
OLDNEW
« no previous file with comments | « test/cctest/test-heap-profiler.cc ('k') | test/cctest/test-parsing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698