Commit a52ba18d authored by Aaron Leventhal's avatar Aaron Leventhal Committed by Commit Bot

Improve Unserialize test failure output

Bug: None
Change-Id: Ia17656ca86f5bfd292d9879a3dc46629fd12f0d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2507459
Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
Reviewed-by: default avatarKurt Catti-Schmidt <kschmi@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#828239}
parent 051f20ea
...@@ -255,7 +255,10 @@ TEST(AXGeneratedTreeTest, SerializeGeneratedTrees) { ...@@ -255,7 +255,10 @@ TEST(AXGeneratedTreeTest, SerializeGeneratedTrees) {
ASSERT_TRUE(serializer.SerializeChanges(tree0.root(), &update0)); ASSERT_TRUE(serializer.SerializeChanges(tree0.root(), &update0));
AXTree dst_tree; AXTree dst_tree;
ASSERT_TRUE(dst_tree.Unserialize(update0)); ASSERT_TRUE(dst_tree.Unserialize(update0))
<< dst_tree.error() << "\n"
<< TreeToString(dst_tree)
<< "\nTree update: " << update0.ToString();
// At this point, |dst_tree| should now be identical to |tree0|. // At this point, |dst_tree| should now be identical to |tree0|.
EXPECT_EQ(TreeToString(tree0), TreeToString(dst_tree)); EXPECT_EQ(TreeToString(tree0), TreeToString(dst_tree));
...@@ -275,7 +278,12 @@ TEST(AXGeneratedTreeTest, SerializeGeneratedTrees) { ...@@ -275,7 +278,12 @@ TEST(AXGeneratedTreeTest, SerializeGeneratedTrees) {
AXTreeUpdate update; AXTreeUpdate update;
ASSERT_TRUE( ASSERT_TRUE(
serializer.SerializeChanges(tree1.GetFromId(id), &update)); serializer.SerializeChanges(tree1.GetFromId(id), &update));
ASSERT_TRUE(dst_tree.Unserialize(update)); std::string tree_before_str = TreeToString(dst_tree);
ASSERT_TRUE(dst_tree.Unserialize(update))
<< dst_tree.error() << "\nTree before : " << tree_before_str
<< "\nTree after : " << TreeToString(dst_tree)
<< "\nExpected after: " << TreeToString(tree1)
<< "\nTree update : " << update.ToString();
} }
// After the sequence of updates, |dst_tree| should now be // After the sequence of updates, |dst_tree| should now be
...@@ -327,7 +335,13 @@ TEST(AXGeneratedTreeTest, GeneratedTreesWithIgnoredNodes) { ...@@ -327,7 +335,13 @@ TEST(AXGeneratedTreeTest, GeneratedTreesWithIgnoredNodes) {
AXEventGenerator event_generator(&fat_tree); AXEventGenerator event_generator(&fat_tree);
AXTreeUpdate update = AXTreeUpdate update =
MakeTreeUpdateFromIgnoredChanges(fat_tree, fat_tree1); MakeTreeUpdateFromIgnoredChanges(fat_tree, fat_tree1);
ASSERT_TRUE(fat_tree.Unserialize(update)); std::string fat_tree_before_str = TreeToString(fat_tree);
ASSERT_TRUE(fat_tree.Unserialize(update))
<< fat_tree.error() << "\nTree before : " << fat_tree_before_str
<< "\nTree after :" << TreeToString(fat_tree)
<< "\nExpected after: " << TreeToString(fat_tree1)
<< "\nTree update : " << update.ToString();
EXPECT_EQ(TreeToString(fat_tree), TreeToString(fat_tree1)); EXPECT_EQ(TreeToString(fat_tree), TreeToString(fat_tree1));
// Capture the events generated. // Capture the events generated.
...@@ -346,7 +360,14 @@ TEST(AXGeneratedTreeTest, GeneratedTreesWithIgnoredNodes) { ...@@ -346,7 +360,14 @@ TEST(AXGeneratedTreeTest, GeneratedTreesWithIgnoredNodes) {
// the generated events. // the generated events.
AXEventGenerator skinny_event_generator(&skinny_tree); AXEventGenerator skinny_event_generator(&skinny_tree);
AXTreeUpdate skinny_update = SerializeEntireTree(skinny_tree1); AXTreeUpdate skinny_update = SerializeEntireTree(skinny_tree1);
ASSERT_TRUE(skinny_tree.Unserialize(skinny_update)); std::string skinny_tree_before_str = TreeToString(skinny_tree);
ASSERT_TRUE(skinny_tree.Unserialize(skinny_update))
<< skinny_tree.error()
<< "\nTree before : " << skinny_tree_before_str
<< "\nTree after :" << TreeToString(skinny_tree)
<< "\nExpected after: " << TreeToString(skinny_tree1)
<< "\nTree update : " << skinny_update.ToString();
EXPECT_EQ(TreeToString(skinny_tree), TreeToString(skinny_tree1)); EXPECT_EQ(TreeToString(skinny_tree), TreeToString(skinny_tree1));
std::map<AXNode::AXID, std::set<AXEventGenerator::Event>> std::map<AXNode::AXID, std::set<AXEventGenerator::Event>>
......
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