Version 3.20.11.1

test/cctest/test-api.cc

Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index 3c6f85ed72a0cc95f77754a3f850b2727c381b43..3895e524f4b2736486c665b949338043bdb6f376 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -55,8 +55,6 @@ static const bool kLogThreading = false;
 
 using ::v8::AccessorInfo;
 using ::v8::Arguments;
-using ::v8::Boolean;
-using ::v8::BooleanObject;
 using ::v8::Context;
 using ::v8::Extension;
 using ::v8::Function;
@@ -623,41 +621,6 @@ TEST(MakingExternalAsciiStringConditions) {
 }
 
 
-TEST(MakingExternalUnalignedAsciiString) {
-  LocalContext env;
-  v8::HandleScope scope(env->GetIsolate());
-
-  CompileRun("function cons(a, b) { return a + b; }"
-             "function slice(a) { return a.substring(1); }");
-  // Create a cons string that will land in old pointer space.
-  Local<String> cons = Local<String>::Cast(CompileRun(
-      "cons('abcdefghijklm', 'nopqrstuvwxyz');"));
-  // Create a sliced string that will land in old pointer space.
-  Local<String> slice = Local<String>::Cast(CompileRun(
-      "slice('abcdefghijklmnopqrstuvwxyz');"));
-
-  // Trigger GCs so that the newly allocated string moves to old gen.
-  SimulateFullSpace(HEAP->old_pointer_space());
-  HEAP->CollectGarbage(i::NEW_SPACE);  // in survivor space now
-  HEAP->CollectGarbage(i::NEW_SPACE);  // in old gen now
-
-  // Turn into external string with unaligned resource data.
-  int dispose_count = 0;
-  const char* c_cons = "_abcdefghijklmnopqrstuvwxyz";
-  bool success = cons->MakeExternal(
-      new TestAsciiResource(i::StrDup(c_cons) + 1, &dispose_count));
-  CHECK(success);
-  const char* c_slice = "_bcdefghijklmnopqrstuvwxyz";
-  success = slice->MakeExternal(
-      new TestAsciiResource(i::StrDup(c_slice) + 1, &dispose_count));
-  CHECK(success);
-
-  // Trigger GCs and force evacuation.
-  HEAP->CollectAllGarbage(i::Heap::kNoGCFlags);
-  HEAP->CollectAllGarbage(i::Heap::kReduceMemoryFootprintMask);
-}
-
-
 THREADED_TEST(UsingExternalString) {
   i::Factory* factory = i::Isolate::Current()->factory();
   {
@@ -1488,13 +1451,13 @@ THREADED_TEST(StringObject) {
   CHECK(!not_object->IsStringObject());
   v8::Handle<v8::StringObject> as_boxed = boxed_string.As<v8::StringObject>();
   CHECK(!as_boxed.IsEmpty());
-  Local<v8::String> the_string = as_boxed->ValueOf();
+  Local<v8::String> the_string = as_boxed->StringValue();
   CHECK(!the_string.IsEmpty());
   ExpectObject("\"test\"", the_string);
   v8::Handle<v8::Value> new_boxed_string = v8::StringObject::New(the_string);
   CHECK(new_boxed_string->IsStringObject());
   as_boxed = new_boxed_string.As<v8::StringObject>();
-  the_string = as_boxed->ValueOf();
+  the_string = as_boxed->StringValue();
   CHECK(!the_string.IsEmpty());
   ExpectObject("\"test\"", the_string);
 }
@@ -1511,12 +1474,12 @@ THREADED_TEST(NumberObject) {
   CHECK(!boxed_not_number->IsNumberObject());
   v8::Handle<v8::NumberObject> as_boxed = boxed_number.As<v8::NumberObject>();
   CHECK(!as_boxed.IsEmpty());
-  double the_number = as_boxed->ValueOf();
+  double the_number = as_boxed->NumberValue();
   CHECK_EQ(42.0, the_number);
   v8::Handle<v8::Value> new_boxed_number = v8::NumberObject::New(43);
   CHECK(new_boxed_number->IsNumberObject());
   as_boxed = new_boxed_number.As<v8::NumberObject>();
-  the_number = as_boxed->ValueOf();
+  the_number = as_boxed->NumberValue();
   CHECK_EQ(43.0, the_number);
 }
 
@@ -1533,68 +1496,16 @@ THREADED_TEST(BooleanObject) {
   v8::Handle<v8::BooleanObject> as_boxed =
       boxed_boolean.As<v8::BooleanObject>();
   CHECK(!as_boxed.IsEmpty());
-  bool the_boolean = as_boxed->ValueOf();
+  bool the_boolean = as_boxed->BooleanValue();
   CHECK_EQ(true, the_boolean);
   v8::Handle<v8::Value> boxed_true = v8::BooleanObject::New(true);
   v8::Handle<v8::Value> boxed_false = v8::BooleanObject::New(false);
   CHECK(boxed_true->IsBooleanObject());
   CHECK(boxed_false->IsBooleanObject());
   as_boxed = boxed_true.As<v8::BooleanObject>();
-  CHECK_EQ(true, as_boxed->ValueOf());
+  CHECK_EQ(true, as_boxed->BooleanValue());
   as_boxed = boxed_false.As<v8::BooleanObject>();
-  CHECK_EQ(false, as_boxed->ValueOf());
-}
-
-
-THREADED_TEST(PrimitiveAndWrappedBooleans) {
-  LocalContext env;
-  v8::HandleScope scope(env->GetIsolate());
-
-  Local<Value> primitive_false = Boolean::New(false);
-  CHECK(primitive_false->IsBoolean());
-  CHECK(!primitive_false->IsBooleanObject());
-  CHECK(!primitive_false->BooleanValue());
-  CHECK(!primitive_false->IsTrue());
-  CHECK(primitive_false->IsFalse());
-
-  Local<Value> false_value = BooleanObject::New(false);
-  CHECK(!false_value->IsBoolean());
-  CHECK(false_value->IsBooleanObject());
-  CHECK(false_value->BooleanValue());
-  CHECK(!false_value->IsTrue());
-  CHECK(!false_value->IsFalse());
-
-  Local<BooleanObject> false_boolean_object = false_value.As<BooleanObject>();
-  CHECK(!false_boolean_object->IsBoolean());
-  CHECK(false_boolean_object->IsBooleanObject());
-  // TODO(svenpanne) Uncomment when BooleanObject::BooleanValue() is deleted.
-  // CHECK(false_boolean_object->BooleanValue());
-  CHECK(!false_boolean_object->ValueOf());
-  CHECK(!false_boolean_object->IsTrue());
-  CHECK(!false_boolean_object->IsFalse());
-
-  Local<Value> primitive_true = Boolean::New(true);
-  CHECK(primitive_true->IsBoolean());
-  CHECK(!primitive_true->IsBooleanObject());
-  CHECK(primitive_true->BooleanValue());
-  CHECK(primitive_true->IsTrue());
-  CHECK(!primitive_true->IsFalse());
-
-  Local<Value> true_value = BooleanObject::New(true);
-  CHECK(!true_value->IsBoolean());
-  CHECK(true_value->IsBooleanObject());
-  CHECK(true_value->BooleanValue());
-  CHECK(!true_value->IsTrue());
-  CHECK(!true_value->IsFalse());
-
-  Local<BooleanObject> true_boolean_object = true_value.As<BooleanObject>();
-  CHECK(!true_boolean_object->IsBoolean());
-  CHECK(true_boolean_object->IsBooleanObject());
-  // TODO(svenpanne) Uncomment when BooleanObject::BooleanValue() is deleted.
-  // CHECK(true_boolean_object->BooleanValue());
-  CHECK(true_boolean_object->ValueOf());
-  CHECK(!true_boolean_object->IsTrue());
-  CHECK(!true_boolean_object->IsFalse());
+  CHECK_EQ(false, as_boxed->BooleanValue());
 }
 
 
@@ -2620,7 +2531,7 @@ THREADED_TEST(SymbolProperties) {
   CHECK(sym_obj->Equals(sym2));
   CHECK(!sym_obj->StrictEquals(sym2));
   CHECK(v8::SymbolObject::Cast(*sym_obj)->Equals(sym_obj));
-  CHECK(v8::SymbolObject::Cast(*sym_obj)->ValueOf()->Equals(sym2));
+  CHECK(v8::SymbolObject::Cast(*sym_obj)->SymbolValue()->Equals(sym2));
 
   // Make sure delete of a non-existent symbol property works.
   CHECK(obj->Delete(sym1));
@@ -13228,7 +13139,7 @@ THREADED_TEST(DateAccess) {
   v8::HandleScope scope(context->GetIsolate());
   v8::Handle<v8::Value> date = v8::Date::New(1224744689038.0);
   CHECK(date->IsDate());
-  CHECK_EQ(1224744689038.0, date.As<v8::Date>()->ValueOf());
+  CHECK_EQ(1224744689038.0, date.As<v8::Date>()->NumberValue());
 }