Commit f0b67de5 authored by Clemens Backes's avatar Clemens Backes Committed by Commit Bot

[test] Clean up vector unittest

Use proper gtest macros for testing expected values.

R=leszeks@chromium.org

Bug: v8:10426
Change-Id: Ibdbbf4d05b0a8914f52a270d21a9087c019396b0
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2152836Reviewed-by: 's avatarLeszek Swirski <leszeks@chromium.org>
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#67206}
parent fb403653
...@@ -32,11 +32,11 @@ TEST(VectorTest, Factories) { ...@@ -32,11 +32,11 @@ TEST(VectorTest, Factories) {
TEST(VectorTest, Equals) { TEST(VectorTest, Equals) {
auto foo1 = CStrVector("foo"); auto foo1 = CStrVector("foo");
auto foo2 = ArrayVector("ffoo") + 1; auto foo2 = ArrayVector("ffoo") + 1;
CHECK_EQ(4, foo2.size()); // Includes trailing '\0'. EXPECT_EQ(4u, foo2.size()); // Includes trailing '\0'.
foo2.Truncate(foo2.size() - 1); foo2.Truncate(foo2.size() - 1);
// This is a requirement for the test. // This is a requirement for the test.
CHECK_NE(foo1.begin(), foo2.begin()); EXPECT_NE(foo1.begin(), foo2.begin());
CHECK_EQ(foo1, foo2); EXPECT_EQ(foo1, foo2);
// Compare Vector<char> against Vector<const char>. // Compare Vector<char> against Vector<const char>.
char arr1[] = {'a', 'b', 'c'}; char arr1[] = {'a', 'b', 'c'};
...@@ -46,22 +46,22 @@ TEST(VectorTest, Equals) { ...@@ -46,22 +46,22 @@ TEST(VectorTest, Equals) {
Vector<const char> vec1_const_char = vec1_char; Vector<const char> vec1_const_char = vec1_char;
Vector<char> vec2_char = ArrayVector(arr2); Vector<char> vec2_char = ArrayVector(arr2);
Vector<char> vec3_char = ArrayVector(arr3); Vector<char> vec3_char = ArrayVector(arr3);
CHECK_NE(vec1_char.begin(), vec2_char.begin()); EXPECT_NE(vec1_char.begin(), vec2_char.begin());
// Note: We directly call operator== and operator!= here (without CHECK_EQ or // Note: We directly call operator== and operator!= here (without EXPECT_EQ or
// CHECK_NE) to have full control over the arguments. // EXPECT_NE) to have full control over the arguments.
CHECK(vec1_char == vec1_const_char); EXPECT_TRUE(vec1_char == vec1_const_char);
CHECK(vec1_char == vec2_char); EXPECT_TRUE(vec1_char == vec2_char);
CHECK(vec1_const_char == vec2_char); EXPECT_TRUE(vec1_const_char == vec2_char);
CHECK(vec1_const_char != vec3_char); EXPECT_TRUE(vec1_const_char != vec3_char);
CHECK(vec3_char != vec2_char); EXPECT_TRUE(vec3_char != vec2_char);
CHECK(vec3_char != vec1_const_char); EXPECT_TRUE(vec3_char != vec1_const_char);
} }
TEST(OwnedVectorConstruction, Equals) { TEST(OwnedVectorConstruction, Equals) {
auto int_vec = OwnedVector<int>::New(4); auto int_vec = OwnedVector<int>::New(4);
CHECK_EQ(4, int_vec.size()); EXPECT_EQ(4u, int_vec.size());
auto find_non_zero = [](int i) { return i != 0; }; auto find_non_zero = [](int i) { return i != 0; };
CHECK_EQ(int_vec.end(), EXPECT_EQ(int_vec.end(),
std::find_if(int_vec.begin(), int_vec.end(), find_non_zero)); std::find_if(int_vec.begin(), int_vec.end(), find_non_zero));
constexpr int kInit[] = {4, 11, 3}; constexpr int kInit[] = {4, 11, 3};
...@@ -69,8 +69,8 @@ TEST(OwnedVectorConstruction, Equals) { ...@@ -69,8 +69,8 @@ TEST(OwnedVectorConstruction, Equals) {
// Note: {const int} should also work: We initialize the owned vector, but // Note: {const int} should also work: We initialize the owned vector, but
// afterwards it's non-modifyable. // afterwards it's non-modifyable.
auto init_vec2 = OwnedVector<const int>::Of(ArrayVector(kInit)); auto init_vec2 = OwnedVector<const int>::Of(ArrayVector(kInit));
CHECK_EQ(init_vec1.as_vector(), ArrayVector(kInit)); EXPECT_EQ(init_vec1.as_vector(), ArrayVector(kInit));
CHECK_EQ(init_vec1.as_vector(), init_vec2.as_vector()); EXPECT_EQ(init_vec1.as_vector(), init_vec2.as_vector());
} }
} // namespace internal } // namespace internal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment