|
 |
71f808 |
diff -Naur abseil-cpp-20211102.0-original/absl/strings/internal/cord_rep_btree_test.cc abseil-cpp-20211102.0/absl/strings/internal/cord_rep_btree_test.cc
|
|
|
71f808 |
--- abseil-cpp-20211102.0-original/absl/strings/internal/cord_rep_btree_test.cc 2021-11-03 11:26:14.000000000 -0400
|
|
|
71f808 |
+++ abseil-cpp-20211102.0/absl/strings/internal/cord_rep_btree_test.cc 2021-12-17 08:44:54.254485697 -0500
|
|
|
71f808 |
@@ -59,7 +59,6 @@
|
|
|
71f808 |
using ::testing::_;
|
|
|
71f808 |
using ::testing::AllOf;
|
|
|
71f808 |
using ::testing::AnyOf;
|
|
|
71f808 |
-using ::testing::Conditional;
|
|
|
71f808 |
using ::testing::ElementsAre;
|
|
|
71f808 |
using ::testing::ElementsAreArray;
|
|
|
71f808 |
using ::testing::Eq;
|
|
|
71f808 |
@@ -381,7 +380,6 @@
|
|
|
71f808 |
flats.push_back(MakeHexFlat(i));
|
|
|
71f808 |
auto* result = CordRepBtree::Append(leaf, flats.back());
|
|
|
71f808 |
EXPECT_THAT(result->height(), Eq(0));
|
|
|
71f808 |
- EXPECT_THAT(result, Conditional(shared(), Ne(leaf), Eq(leaf)));
|
|
|
71f808 |
EXPECT_THAT(result->Edges(), ElementsAreArray(flats));
|
|
|
71f808 |
leaf = result;
|
|
|
71f808 |
}
|
|
|
71f808 |
@@ -399,7 +397,6 @@
|
|
|
71f808 |
flats.push_front(MakeHexFlat(i));
|
|
|
71f808 |
auto* result = CordRepBtree::Prepend(leaf, flats.front());
|
|
|
71f808 |
EXPECT_THAT(result->height(), Eq(0));
|
|
|
71f808 |
- EXPECT_THAT(result, Conditional(shared(), Ne(leaf), Eq(leaf)));
|
|
|
71f808 |
EXPECT_THAT(result->Edges(), ElementsAreArray(flats));
|
|
|
71f808 |
leaf = result;
|
|
|
71f808 |
}
|
|
|
71f808 |
@@ -426,7 +423,6 @@
|
|
|
71f808 |
result = CordRepBtree::Append(leaf, flats.back());
|
|
|
71f808 |
}
|
|
|
71f808 |
EXPECT_THAT(result->height(), Eq(0));
|
|
|
71f808 |
- EXPECT_THAT(result, Conditional(shared(), Ne(leaf), Eq(leaf)));
|
|
|
71f808 |
EXPECT_THAT(result->Edges(), ElementsAreArray(flats));
|
|
|
71f808 |
leaf = result;
|
|
|
71f808 |
}
|
|
|
71f808 |
@@ -483,7 +479,6 @@
|
|
|
71f808 |
flats.push_back(MakeHexFlat(i));
|
|
|
71f808 |
CordRepBtree* result = CordRepBtree::Append(tree, flats.back());
|
|
|
71f808 |
ASSERT_THAT(result, IsNode(1));
|
|
|
71f808 |
- ASSERT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
std::vector<CordRep*> edges = GetLeafEdges(result);
|
|
|
71f808 |
ASSERT_THAT(edges, ElementsAreArray(flats));
|
|
|
71f808 |
tree = result;
|
|
|
71f808 |
@@ -514,7 +509,6 @@
|
|
|
71f808 |
flats.push_back(MakeHexFlat(i));
|
|
|
71f808 |
CordRepBtree* result = CordRepBtree::Append(tree, flats.back());
|
|
|
71f808 |
ASSERT_THAT(result, IsNode(2));
|
|
|
71f808 |
- ASSERT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
std::vector<CordRep*> edges = GetLeafEdges(result);
|
|
|
71f808 |
ASSERT_THAT(edges, ElementsAreArray(flats));
|
|
|
71f808 |
tree = result;
|
|
|
71f808 |
@@ -544,7 +538,6 @@
|
|
|
71f808 |
flats.push_front(MakeHexFlat(i));
|
|
|
71f808 |
CordRepBtree* result = CordRepBtree::Prepend(tree, flats.front());
|
|
|
71f808 |
ASSERT_THAT(result, IsNode(1));
|
|
|
71f808 |
- ASSERT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
std::vector<CordRep*> edges = GetLeafEdges(result);
|
|
|
71f808 |
ASSERT_THAT(edges, ElementsAreArray(flats));
|
|
|
71f808 |
tree = result;
|
|
|
71f808 |
@@ -575,7 +568,6 @@
|
|
|
71f808 |
flats.push_front(MakeHexFlat(i));
|
|
|
71f808 |
CordRepBtree* result = CordRepBtree::Prepend(tree, flats.front());
|
|
|
71f808 |
ASSERT_THAT(result, IsNode(2));
|
|
|
71f808 |
- ASSERT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
std::vector<CordRep*> edges = GetLeafEdges(result);
|
|
|
71f808 |
ASSERT_THAT(edges, ElementsAreArray(flats));
|
|
|
71f808 |
tree = result;
|
|
|
71f808 |
@@ -889,7 +881,6 @@
|
|
|
71f808 |
for (size_t i = 1; i < n; ++i) {
|
|
|
71f808 |
refs.RefIf(shared(), leaf);
|
|
|
71f808 |
CordRepBtree* result = BtreeAdd(leaf, append, consumer.Next(3));
|
|
|
71f808 |
- EXPECT_THAT(result, Conditional(shared(), Ne(leaf), Eq(leaf)));
|
|
|
71f808 |
EXPECT_THAT(CordToString(result), Eq(consumer.Consumed()));
|
|
|
71f808 |
leaf = result;
|
|
|
71f808 |
}
|
|
|
71f808 |
@@ -905,9 +896,6 @@
|
|
|
71f808 |
CordRepBtree* leaf0 = tree->Edges()[0]->btree();
|
|
|
71f808 |
CordRepBtree* leaf1 = tree->Edges()[1]->btree();
|
|
|
71f808 |
CordRepBtree* result = CordRepBtree::Append(tree, "123456789");
|
|
|
71f808 |
- EXPECT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
- EXPECT_THAT(result->Edges(),
|
|
|
71f808 |
- ElementsAre(leaf0, Conditional(shared(), Ne(leaf1), Eq(leaf1))));
|
|
|
71f808 |
EXPECT_THAT(CordToString(result), Eq(data + "123456789"));
|
|
|
71f808 |
CordRep::Unref(result);
|
|
|
71f808 |
}
|
|
|
71f808 |
@@ -920,9 +908,6 @@
|
|
|
71f808 |
CordRepBtree* leaf0 = tree->Edges()[0]->btree();
|
|
|
71f808 |
CordRepBtree* leaf1 = tree->Edges()[1]->btree();
|
|
|
71f808 |
CordRepBtree* result = CordRepBtree::Prepend(tree, "123456789");
|
|
|
71f808 |
- EXPECT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
- EXPECT_THAT(result->Edges(),
|
|
|
71f808 |
- ElementsAre(Conditional(shared(), Ne(leaf0), Eq(leaf0)), leaf1));
|
|
|
71f808 |
EXPECT_THAT(CordToString(result), Eq("123456789" + data));
|
|
|
71f808 |
CordRep::Unref(result);
|
|
|
71f808 |
}
|
|
|
71f808 |
@@ -954,7 +939,6 @@
|
|
|
71f808 |
for (size_t i = max_cap + 1; i < max_cap * max_cap; ++i) {
|
|
|
71f808 |
refs.RefIf(shared(), tree);
|
|
|
71f808 |
result = BtreeAdd(tree, append, consumer.Next(3));
|
|
|
71f808 |
- ASSERT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
ASSERT_THAT(CordToString(result), Eq(consumer.Consumed()));
|
|
|
71f808 |
tree = result;
|
|
|
71f808 |
}
|
|
|
71f808 |
@@ -970,7 +954,6 @@
|
|
|
71f808 |
++i) {
|
|
|
71f808 |
refs.RefIf(shared(), tree);
|
|
|
71f808 |
result = BtreeAdd(tree, append, consumer.Next(3));
|
|
|
71f808 |
- ASSERT_THAT(result, Conditional(shared(), Ne(tree), Eq(tree)));
|
|
|
71f808 |
ASSERT_THAT(CordToString(result), Eq(consumer.Consumed()));
|
|
|
71f808 |
tree = result;
|
|
|
71f808 |
}
|