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

Unified Diff: test/cctest/test-ordered-hash-table.cc

Issue 947683002: Reimplement Maps and Sets in JS (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Merged to master Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/cctest/test-dictionary.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/test-ordered-hash-table.cc
diff --git a/test/cctest/test-ordered-hash-table.cc b/test/cctest/test-ordered-hash-table.cc
deleted file mode 100644
index 957893631759af3dd0329e029229bd6ead7e6dda..0000000000000000000000000000000000000000
--- a/test/cctest/test-ordered-hash-table.cc
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2014 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided
-// with the distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived
-// from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <stdlib.h>
-
-#include "src/v8.h"
-
-#include "src/factory.h"
-#include "test/cctest/cctest.h"
-
-namespace {
-
-using namespace v8::internal;
-
-
-TEST(Set) {
- LocalContext context;
- Isolate* isolate = CcTest::i_isolate();
- Factory* factory = isolate->factory();
- HandleScope scope(isolate);
- Handle<OrderedHashSet> ordered_set = factory->NewOrderedHashSet();
- CHECK_EQ(2, ordered_set->NumberOfBuckets());
- CHECK_EQ(0, ordered_set->NumberOfElements());
- CHECK_EQ(0, ordered_set->NumberOfDeletedElements());
-
- Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize);
- Handle<JSObject> obj = factory->NewJSObjectFromMap(map);
- CHECK(!ordered_set->Contains(obj));
- ordered_set = OrderedHashSet::Add(ordered_set, obj);
- CHECK_EQ(1, ordered_set->NumberOfElements());
- CHECK(ordered_set->Contains(obj));
- bool was_present = false;
- ordered_set = OrderedHashSet::Remove(ordered_set, obj, &was_present);
- CHECK(was_present);
- CHECK_EQ(0, ordered_set->NumberOfElements());
- CHECK(!ordered_set->Contains(obj));
-
- // Removing a not-present object should set was_present to false.
- ordered_set = OrderedHashSet::Remove(ordered_set, obj, &was_present);
- CHECK(!was_present);
-
- // Test for collisions/chaining
- Handle<JSObject> obj1 = factory->NewJSObjectFromMap(map);
- ordered_set = OrderedHashSet::Add(ordered_set, obj1);
- Handle<JSObject> obj2 = factory->NewJSObjectFromMap(map);
- ordered_set = OrderedHashSet::Add(ordered_set, obj2);
- Handle<JSObject> obj3 = factory->NewJSObjectFromMap(map);
- ordered_set = OrderedHashSet::Add(ordered_set, obj3);
- CHECK_EQ(3, ordered_set->NumberOfElements());
- CHECK(ordered_set->Contains(obj1));
- CHECK(ordered_set->Contains(obj2));
- CHECK(ordered_set->Contains(obj3));
-
- // Test growth
- ordered_set = OrderedHashSet::Add(ordered_set, obj);
- Handle<JSObject> obj4 = factory->NewJSObjectFromMap(map);
- ordered_set = OrderedHashSet::Add(ordered_set, obj4);
- CHECK(ordered_set->Contains(obj));
- CHECK(ordered_set->Contains(obj1));
- CHECK(ordered_set->Contains(obj2));
- CHECK(ordered_set->Contains(obj3));
- CHECK(ordered_set->Contains(obj4));
- CHECK_EQ(5, ordered_set->NumberOfElements());
- CHECK_EQ(0, ordered_set->NumberOfDeletedElements());
- CHECK_EQ(4, ordered_set->NumberOfBuckets());
-
- // Test shrinking
- ordered_set = OrderedHashSet::Remove(ordered_set, obj, &was_present);
- CHECK(was_present);
- ordered_set = OrderedHashSet::Remove(ordered_set, obj1, &was_present);
- CHECK(was_present);
- ordered_set = OrderedHashSet::Remove(ordered_set, obj2, &was_present);
- CHECK(was_present);
- ordered_set = OrderedHashSet::Remove(ordered_set, obj3, &was_present);
- CHECK(was_present);
- CHECK_EQ(1, ordered_set->NumberOfElements());
- CHECK_EQ(2, ordered_set->NumberOfBuckets());
-}
-
-
-TEST(Map) {
- LocalContext context;
- Isolate* isolate = CcTest::i_isolate();
- Factory* factory = isolate->factory();
- HandleScope scope(isolate);
- Handle<OrderedHashMap> ordered_map = factory->NewOrderedHashMap();
- CHECK_EQ(2, ordered_map->NumberOfBuckets());
- CHECK_EQ(0, ordered_map->NumberOfElements());
- CHECK_EQ(0, ordered_map->NumberOfDeletedElements());
-
- Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize);
- Handle<JSObject> obj = factory->NewJSObjectFromMap(map);
- Handle<JSObject> val = factory->NewJSObjectFromMap(map);
- CHECK(ordered_map->Lookup(obj)->IsTheHole());
- ordered_map = OrderedHashMap::Put(ordered_map, obj, val);
- CHECK_EQ(1, ordered_map->NumberOfElements());
- Object* lookup = ordered_map->Lookup(obj);
- CHECK(lookup->SameValue(*val));
- bool was_present = false;
- ordered_map = OrderedHashMap::Remove(ordered_map, obj, &was_present);
- CHECK(was_present);
- CHECK_EQ(0, ordered_map->NumberOfElements());
- CHECK(ordered_map->Lookup(obj)->IsTheHole());
-
- // Test for collisions/chaining
- Handle<JSObject> obj1 = factory->NewJSObjectFromMap(map);
- Handle<JSObject> obj2 = factory->NewJSObjectFromMap(map);
- Handle<JSObject> obj3 = factory->NewJSObjectFromMap(map);
- Handle<JSObject> val1 = factory->NewJSObjectFromMap(map);
- Handle<JSObject> val2 = factory->NewJSObjectFromMap(map);
- Handle<JSObject> val3 = factory->NewJSObjectFromMap(map);
- ordered_map = OrderedHashMap::Put(ordered_map, obj1, val1);
- ordered_map = OrderedHashMap::Put(ordered_map, obj2, val2);
- ordered_map = OrderedHashMap::Put(ordered_map, obj3, val3);
- CHECK_EQ(3, ordered_map->NumberOfElements());
- lookup = ordered_map->Lookup(obj1);
- CHECK(lookup->SameValue(*val1));
- lookup = ordered_map->Lookup(obj2);
- CHECK(lookup->SameValue(*val2));
- lookup = ordered_map->Lookup(obj3);
- CHECK(lookup->SameValue(*val3));
-
- // Test growth
- ordered_map = OrderedHashMap::Put(ordered_map, obj, val);
- Handle<JSObject> obj4 = factory->NewJSObjectFromMap(map);
- Handle<JSObject> val4 = factory->NewJSObjectFromMap(map);
- ordered_map = OrderedHashMap::Put(ordered_map, obj4, val4);
- lookup = ordered_map->Lookup(obj);
- CHECK(lookup->SameValue(*val));
- lookup = ordered_map->Lookup(obj1);
- CHECK(lookup->SameValue(*val1));
- lookup = ordered_map->Lookup(obj2);
- CHECK(lookup->SameValue(*val2));
- lookup = ordered_map->Lookup(obj3);
- CHECK(lookup->SameValue(*val3));
- lookup = ordered_map->Lookup(obj4);
- CHECK(lookup->SameValue(*val4));
- CHECK_EQ(5, ordered_map->NumberOfElements());
- CHECK_EQ(4, ordered_map->NumberOfBuckets());
-
- // Test shrinking
- ordered_map = OrderedHashMap::Remove(ordered_map, obj, &was_present);
- CHECK(was_present);
- ordered_map = OrderedHashMap::Remove(ordered_map, obj1, &was_present);
- CHECK(was_present);
- ordered_map = OrderedHashMap::Remove(ordered_map, obj2, &was_present);
- CHECK(was_present);
- ordered_map = OrderedHashMap::Remove(ordered_map, obj3, &was_present);
- CHECK(was_present);
- CHECK_EQ(1, ordered_map->NumberOfElements());
- CHECK_EQ(2, ordered_map->NumberOfBuckets());
-}
-
-
-}
« no previous file with comments | « test/cctest/test-dictionary.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698