summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/content_capture/content_capture_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/content_capture/content_capture_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/content_capture/content_capture_test.cc110
1 files changed, 54 insertions, 56 deletions
diff --git a/chromium/third_party/blink/renderer/core/content_capture/content_capture_test.cc b/chromium/third_party/blink/renderer/core/content_capture/content_capture_test.cc
index 980debec4b5..518284b069c 100644
--- a/chromium/third_party/blink/renderer/core/content_capture/content_capture_test.cc
+++ b/chromium/third_party/blink/renderer/core/content_capture/content_capture_test.cc
@@ -68,10 +68,9 @@ void ToNodeIds(const Vector<Persistent<Node>>& nodes,
}
}
-void ToNodeTexts(const Vector<Persistent<Node>>& nodes,
- Vector<std::string>& texts) {
+void ToNodeTexts(const Vector<Persistent<Node>>& nodes, Vector<String>& texts) {
for (auto& n : nodes)
- texts.push_back(n->nodeValue().Utf8());
+ texts.push_back(n->nodeValue());
}
} // namespace
@@ -89,7 +88,7 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient {
data_ = data;
first_data_ = first_data;
for (auto& d : data) {
- auto text = d.GetValue().Utf8();
+ auto text = d.GetValue();
all_text_.push_back(text);
captured_text_.push_back(text);
}
@@ -98,7 +97,7 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient {
void DidUpdateContent(const WebVector<WebContentHolder>& data) override {
updated_data_ = data;
for (auto& d : data)
- updated_text_.push_back(d.GetValue().Utf8());
+ updated_text_.push_back(d.GetValue());
}
void DidRemoveContent(WebVector<int64_t> data) override {
@@ -113,11 +112,11 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient {
return updated_data_;
}
- const Vector<std::string>& AllText() const { return all_text_; }
+ const Vector<String>& AllText() const { return all_text_; }
- const Vector<std::string>& CapturedText() const { return captured_text_; }
+ const Vector<String>& CapturedText() const { return captured_text_; }
- const Vector<std::string>& UpdatedText() const { return updated_text_; }
+ const Vector<String>& UpdatedText() const { return updated_text_; }
const WebVector<int64_t>& RemovedData() const { return removed_data_; }
@@ -134,9 +133,9 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient {
WebVector<WebContentHolder> data_;
WebVector<WebContentHolder> updated_data_;
WebVector<int64_t> removed_data_;
- Vector<std::string> all_text_;
- Vector<std::string> updated_text_;
- Vector<std::string> captured_text_;
+ Vector<String> all_text_;
+ Vector<String> updated_text_;
+ Vector<String> captured_text_;
};
class ContentCaptureTaskTestHelper : public ContentCaptureTask {
@@ -247,7 +246,7 @@ class ContentCaptureTest
InitScrollingTestData();
}
- void SimulateScrolling(size_t step) {
+ void SimulateScrolling(wtf_size_t step) {
CHECK_LT(step, 4u);
content_capture_manager_->GetContentCaptureTask()
->SetCapturedContentForTesting(scrolling_node_ids_[step]);
@@ -329,7 +328,7 @@ class ContentCaptureTest
Node& invisible_node() const { return *invisible_node_; }
- const Vector<Vector<std::string>>& scrolling_expected_captured_nodes() {
+ const Vector<Vector<String>>& scrolling_expected_captured_nodes() {
return scrolling_expected_captured_nodes_;
}
@@ -342,11 +341,11 @@ class ContentCaptureTest
GetWebContentCaptureClient()->ResetResults();
}
- void BuildNodesInfo(const Vector<std::string>& ids,
+ void BuildNodesInfo(const Vector<String>& ids,
Vector<Persistent<Node>>& nodes,
Vector<cc::NodeInfo>& node_ids) {
for (auto id : ids) {
- Node* node = GetElementById(id.c_str())->firstChild();
+ Node* node = GetDocument().getElementById(AtomicString(id))->firstChild();
CHECK(node);
LayoutObject* layout_object = node->GetLayoutObject();
CHECK(layout_object);
@@ -361,21 +360,21 @@ class ContentCaptureTest
// TODO(michaelbai): Remove this once integrate with LayoutText.
void InitNodeHolders() {
BuildNodesInfo(
- Vector<std::string>{"p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8"},
- nodes_, node_ids_);
+ Vector<String>{"p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8"}, nodes_,
+ node_ids_);
invisible_node_ = GetElementById("invisible")->firstChild();
DCHECK(invisible_node_.Get());
}
void InitScrollingTestData() {
Vector<Vector<Persistent<Node>>> nodes{4};
- BuildNodesInfo(Vector<std::string>{"p1", "p2", "p3"}, nodes[0],
+ BuildNodesInfo(Vector<String>{"p1", "p2", "p3"}, nodes[0],
scrolling_node_ids_[0]);
- BuildNodesInfo(Vector<std::string>{"p3", "p4", "p5"}, nodes[1],
+ BuildNodesInfo(Vector<String>{"p3", "p4", "p5"}, nodes[1],
scrolling_node_ids_[1]);
- BuildNodesInfo(Vector<std::string>{"p6", "p7", "p8"}, nodes[2],
+ BuildNodesInfo(Vector<String>{"p6", "p7", "p8"}, nodes[2],
scrolling_node_ids_[2]);
- BuildNodesInfo(Vector<std::string>{"p2", "p3"}, nodes[3],
+ BuildNodesInfo(Vector<String>{"p2", "p3"}, nodes[3],
scrolling_node_ids_[3]);
// Build expected result.
if (base::FeatureList::IsEnabled(
@@ -406,7 +405,7 @@ class ContentCaptureTest
Vector<Persistent<Node>> nodes_;
Vector<cc::NodeInfo> node_ids_;
Persistent<Node> invisible_node_;
- Vector<Vector<std::string>> scrolling_expected_captured_nodes_{4};
+ Vector<Vector<String>> scrolling_expected_captured_nodes_{4};
Vector<Vector<int64_t>> scrolling_expected_removed_nodes_{4};
Vector<Vector<cc::NodeInfo>> scrolling_node_ids_{4};
std::unique_ptr<WebContentCaptureClientTestHelper> content_capture_client_;
@@ -433,7 +432,7 @@ TEST_P(ContentCaptureTest, Basic) {
}
TEST_P(ContentCaptureTest, Scrolling) {
- for (size_t step = 0; step < 4; ++step) {
+ for (wtf_size_t step = 0; step < 4; ++step) {
SimulateScrolling(step);
RunContentCaptureTask();
EXPECT_EQ(ContentCaptureTask::TaskState::kStop,
@@ -818,8 +817,7 @@ class ContentCaptureSimTest : public SimTest {
child_frame_expected_text_.push_back("New Text");
}
- void InsertMainFrameEditableContent(const std::string& content,
- unsigned offset) {
+ void InsertMainFrameEditableContent(const String& content, unsigned offset) {
InsertNodeContent(GetDocument(), "editable_id", content, offset);
}
@@ -827,16 +825,16 @@ class ContentCaptureSimTest : public SimTest {
DeleteNodeContent(GetDocument(), "editable_id", offset, length);
}
- const Vector<std::string>& MainFrameExpectedText() const {
+ const Vector<String>& MainFrameExpectedText() const {
return main_frame_expected_text_;
}
- const Vector<std::string>& ChildFrameExpectedText() const {
+ const Vector<String>& ChildFrameExpectedText() const {
return child_frame_expected_text_;
}
- void ReplaceMainFrameExpectedText(const std::string& old_text,
- const std::string& new_text) {
+ void ReplaceMainFrameExpectedText(const String& old_text,
+ const String& new_text) {
std::replace(main_frame_expected_text_.begin(),
main_frame_expected_text_.end(), old_text, new_text);
}
@@ -913,8 +911,8 @@ class ContentCaptureSimTest : public SimTest {
}
void InitMainFrameNodeHolders() {
- Vector<std::string> ids = {"p1", "p2", "p3", "p4", "p5",
- "p6", "p7", "s8", "editable_id"};
+ Vector<String> ids = {"p1", "p2", "p3", "p4", "p5",
+ "p6", "p7", "s8", "editable_id"};
main_frame_expected_text_ = {
"Hello World1", "Hello World2", "Hello World3",
"Hello World4", "Hello World5", "Hello World6",
@@ -924,18 +922,19 @@ class ContentCaptureSimTest : public SimTest {
}
void InitChildFrameNodeHolders(const Document& doc) {
- Vector<std::string> ids = {"c1", "c2"};
+ Vector<String> ids = {"c1", "c2"};
child_frame_expected_text_ = {"Hello World11", "Hello World12"};
InitNodeHolders(child_frame_content_, ids, doc);
EXPECT_EQ(2u, child_frame_content_.size());
}
void InitNodeHolders(Vector<cc::NodeInfo>& buffer,
- const Vector<std::string>& ids,
+ const Vector<String>& ids,
const Document& document) {
for (auto id : ids) {
- auto* layout_object =
- document.getElementById(id.c_str())->firstChild()->GetLayoutObject();
+ auto* layout_object = document.getElementById(AtomicString(id))
+ ->firstChild()
+ ->GetLayoutObject();
auto* layout_text = To<LayoutText>(layout_object);
EXPECT_TRUE(layout_text->HasNodeId());
buffer.push_back(
@@ -957,20 +956,19 @@ class ContentCaptureSimTest : public SimTest {
}
void InsertNodeContent(Document& doc,
- const std::string& id,
- const std::string& content,
+ const String& id,
+ const String& content,
unsigned offset) {
- To<Text>(doc.getElementById(id.c_str())->firstChild())
- ->insertData(offset, String(content.c_str()),
- IGNORE_EXCEPTION_FOR_TESTING);
+ To<Text>(doc.getElementById(AtomicString(id))->firstChild())
+ ->insertData(offset, content, IGNORE_EXCEPTION_FOR_TESTING);
Compositor().BeginFrame();
}
void DeleteNodeContent(Document& doc,
- const std::string& id,
+ const String& id,
unsigned offset,
unsigned length) {
- To<Text>(doc.getElementById(id.c_str())->firstChild())
+ To<Text>(doc.getElementById(AtomicString(id))->firstChild())
->deleteData(offset, length, IGNORE_EXCEPTION_FOR_TESTING);
Compositor().BeginFrame();
}
@@ -984,8 +982,8 @@ class ContentCaptureSimTest : public SimTest {
->SetCapturedContentForTesting(captured_content);
}
- Vector<std::string> main_frame_expected_text_;
- Vector<std::string> child_frame_expected_text_;
+ Vector<String> main_frame_expected_text_;
+ Vector<String> child_frame_expected_text_;
Vector<cc::NodeInfo> main_frame_content_;
Vector<cc::NodeInfo> child_frame_content_;
WebContentCaptureClientTestHelper client_;
@@ -1056,8 +1054,8 @@ TEST_F(ContentCaptureSimTest, ChangeNode) {
EXPECT_TRUE(ChildClient().Data().empty());
EXPECT_THAT(Client().AllText(),
testing::UnorderedElementsAreArray(MainFrameExpectedText()));
- Vector<std::string> expected_text_update;
- std::string insert_text = "content ";
+ Vector<String> expected_text_update;
+ String insert_text = "content ";
// Changed content to 'content editable'.
InsertMainFrameEditableContent(insert_text, 0);
@@ -1071,13 +1069,13 @@ TEST_F(ContentCaptureSimTest, ChangeNode) {
testing::UnorderedElementsAreArray(expected_text_update));
// Changing content multiple times before capturing.
- std::string insert_text1 = "i";
+ String insert_text1 = "i";
// Changed content to 'content ieditable'.
- InsertMainFrameEditableContent(insert_text1, insert_text.size());
- std::string insert_text2 = "s ";
+ InsertMainFrameEditableContent(insert_text1, insert_text.length());
+ String insert_text2 = "s ";
// Changed content to 'content is editable'.
InsertMainFrameEditableContent(insert_text2,
- insert_text.size() + insert_text1.size());
+ insert_text.length() + insert_text1.length());
SetCapturedContent(ContentType::kMainFrame);
RunContentCaptureTaskUntil(ContentCaptureTask::TaskState::kStop);
@@ -1092,16 +1090,16 @@ TEST_F(ContentCaptureSimTest, ChangeNode) {
TEST_F(ContentCaptureSimTest, ChangeNodeBeforeCapture) {
// Changed content to 'content editable' before capture.
- std::string insert_text = "content ";
+ String insert_text = "content ";
InsertMainFrameEditableContent(insert_text, 0);
// Changing content multiple times before capturing.
- std::string insert_text1 = "i";
+ String insert_text1 = "i";
// Changed content to 'content ieditable'.
- InsertMainFrameEditableContent(insert_text1, insert_text.size());
- std::string insert_text2 = "s ";
+ InsertMainFrameEditableContent(insert_text1, insert_text.length());
+ String insert_text2 = "s ";
// Changed content to 'content is editable'.
InsertMainFrameEditableContent(insert_text2,
- insert_text.size() + insert_text1.size());
+ insert_text.length() + insert_text1.length());
// The changed content shall be captured as new content.
ReplaceMainFrameExpectedText(
@@ -1133,7 +1131,7 @@ TEST_F(ContentCaptureSimTest, DeleteNodeContent) {
EXPECT_EQ(1u, Client().UpdatedData().size());
EXPECT_FALSE(Client().FirstData());
EXPECT_TRUE(ChildClient().Data().empty());
- Vector<std::string> expected_text_update;
+ Vector<String> expected_text_update;
expected_text_update.push_back("edit");
EXPECT_THAT(Client().UpdatedText(),
testing::UnorderedElementsAreArray(expected_text_update));
View Lorry Controller Status