Index: test/cctest/test-transitions.cc |
diff --git a/test/cctest/test-transitions.cc b/test/cctest/test-transitions.cc |
index 6bcdb35e7ecd84cd58b90ff007008503325ae855..59c9f74c96dbdb41ef34ccb1b55e634936fcf522 100644 |
--- a/test/cctest/test-transitions.cc |
+++ b/test/cctest/test-transitions.cc |
@@ -41,10 +41,11 @@ static void CheckPropertyDetailsFieldsConsistency(PropertyType type, |
TEST(PropertyDetailsFieldsConsistency) { |
- CheckPropertyDetailsFieldsConsistency(FIELD, DATA, IN_OBJECT); |
- CheckPropertyDetailsFieldsConsistency(CONSTANT, DATA, IN_DESCRIPTOR); |
- CheckPropertyDetailsFieldsConsistency(ACCESSOR_FIELD, ACCESSOR, IN_OBJECT); |
- CheckPropertyDetailsFieldsConsistency(CALLBACKS, ACCESSOR, IN_DESCRIPTOR); |
+ CheckPropertyDetailsFieldsConsistency(DATA, kData, kField); |
+ CheckPropertyDetailsFieldsConsistency(DATA_CONSTANT, kData, kDescriptor); |
+ CheckPropertyDetailsFieldsConsistency(ACCESSOR, kAccessor, kField); |
+ CheckPropertyDetailsFieldsConsistency(ACCESSOR_CONSTANT, kAccessor, |
+ kDescriptor); |
} |
@@ -77,7 +78,7 @@ TEST(TransitionArray_SimpleFieldTransitions) { |
transitions->Insert(map0, name1, map1, SIMPLE_PROPERTY_TRANSITION); |
ConnectTransition(map0, transitions, map1); |
CHECK(transitions->IsSimpleTransition()); |
- transition = transitions->Search(DATA, *name1, attributes); |
+ transition = transitions->Search(kData, *name1, attributes); |
CHECK_EQ(TransitionArray::kSimpleTransitionIndex, transition); |
CHECK_EQ(*name1, transitions->GetKey(transition)); |
CHECK_EQ(*map1, transitions->GetTarget(transition)); |
@@ -87,11 +88,11 @@ TEST(TransitionArray_SimpleFieldTransitions) { |
ConnectTransition(map0, transitions, map2); |
CHECK(transitions->IsFullTransitionArray()); |
- transition = transitions->Search(DATA, *name1, attributes); |
+ transition = transitions->Search(kData, *name1, attributes); |
CHECK_EQ(*name1, transitions->GetKey(transition)); |
CHECK_EQ(*map1, transitions->GetTarget(transition)); |
- transition = transitions->Search(DATA, *name2, attributes); |
+ transition = transitions->Search(kData, *name2, attributes); |
CHECK_EQ(*name2, transitions->GetKey(transition)); |
CHECK_EQ(*map2, transitions->GetTarget(transition)); |
@@ -127,7 +128,7 @@ TEST(TransitionArray_FullFieldTransitions) { |
transitions = transitions->Insert(map0, name1, map1, PROPERTY_TRANSITION); |
ConnectTransition(map0, transitions, map1); |
CHECK(transitions->IsFullTransitionArray()); |
- transition = transitions->Search(DATA, *name1, attributes); |
+ transition = transitions->Search(kData, *name1, attributes); |
CHECK_EQ(*name1, transitions->GetKey(transition)); |
CHECK_EQ(*map1, transitions->GetTarget(transition)); |
@@ -135,11 +136,11 @@ TEST(TransitionArray_FullFieldTransitions) { |
ConnectTransition(map0, transitions, map2); |
CHECK(transitions->IsFullTransitionArray()); |
- transition = transitions->Search(DATA, *name1, attributes); |
+ transition = transitions->Search(kData, *name1, attributes); |
CHECK_EQ(*name1, transitions->GetKey(transition)); |
CHECK_EQ(*map1, transitions->GetTarget(transition)); |
- transition = transitions->Search(DATA, *name2, attributes); |
+ transition = transitions->Search(kData, *name2, attributes); |
CHECK_EQ(*name2, transitions->GetKey(transition)); |
CHECK_EQ(*map2, transitions->GetTarget(transition)); |
@@ -179,7 +180,7 @@ TEST(TransitionArray_DifferentFieldNames) { |
} |
for (int i = 0; i < PROPS_COUNT; i++) { |
- int transition = transitions->Search(DATA, *names[i], attributes); |
+ int transition = transitions->Search(kData, *names[i], attributes); |
CHECK_EQ(*names[i], transitions->GetKey(transition)); |
CHECK_EQ(*maps[i], transitions->GetTarget(transition)); |
} |
@@ -222,7 +223,7 @@ TEST(TransitionArray_SameFieldNamesDifferentAttributesSimple) { |
for (int i = 0; i < ATTRS_COUNT; i++) { |
PropertyAttributes attributes = static_cast<PropertyAttributes>(i); |
- int transition = transitions->Search(DATA, *name, attributes); |
+ int transition = transitions->Search(kData, *name, attributes); |
CHECK_EQ(*name, transitions->GetKey(transition)); |
CHECK_EQ(*attr_maps[i], transitions->GetTarget(transition)); |
} |
@@ -285,14 +286,14 @@ TEST(TransitionArray_SameFieldNamesDifferentAttributes) { |
for (int i = 0; i < ATTRS_COUNT; i++) { |
PropertyAttributes attributes = static_cast<PropertyAttributes>(i); |
- int transition = transitions->Search(DATA, *name, attributes); |
+ int transition = transitions->Search(kData, *name, attributes); |
CHECK_EQ(*name, transitions->GetKey(transition)); |
CHECK_EQ(*attr_maps[i], transitions->GetTarget(transition)); |
} |
// Ensure that info about the other fields still valid. |
for (int i = 0; i < PROPS_COUNT; i++) { |
- int transition = transitions->Search(DATA, *names[i], NONE); |
+ int transition = transitions->Search(kData, *names[i], NONE); |
CHECK_EQ(*names[i], transitions->GetKey(transition)); |
CHECK_EQ(*maps[i], transitions->GetTarget(transition)); |
} |