Improve formatting of accessibility tests that dump the tree.

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/string16.h"
@@ skipping 49 matching lines @@
   view_host->set_save_accessibility_tree_for_testing(true);
   view_host->EnableRendererAccessibility();
 
   // Setup test paths.
   FilePath dir_test_data;
   EXPECT_TRUE(PathService::Get(content::DIR_TEST_DATA, &dir_test_data));
   FilePath test_path(dir_test_data.Append(FILE_PATH_LITERAL("accessibility")));
   EXPECT_TRUE(file_util::PathExists(test_path))
       << test_path.LossyDisplayName();
 
+  // Output the test path to help anyone who encounters a failure and needs
+  // to know where to look.
+  printf("Path to test files: %s\n", test_path.MaybeAsASCII().c_str());
+
   // Grab all HTML files.
   file_util::FileEnumerator file_enumerator(test_path,
                                             false,
                                             file_util::FileEnumerator::FILES,
                                             FILE_PATH_LITERAL("*.html"));
 
   // TODO(dtseng): Make each of these a gtest with script.
   FilePath html_file(file_enumerator.Next());
   ASSERT_FALSE(html_file.empty());
   do {
+    printf("Testing %s\n", html_file.BaseName().MaybeAsASCII().c_str());
+
     std::string html_contents;
     file_util::ReadFileToString(html_file, &html_contents);
 
-    std::string expected_contents;
+    // Read the expected file.
+    std::string expected_contents_raw;
     FilePath expected_file =
         FilePath(html_file.RemoveExtension().value() +
             helper_.GetExpectedFileSuffix());
     file_util::ReadFileToString(
         expected_file,
-        &expected_contents);
+        &expected_contents_raw);
+
+    // Tolerate Windows-style line endings (\r\n) in the expected file:
+    // normalize by deleting all \r from the file (if any) to leave only \n.
+    std::string expected_contents;
+    RemoveChars(expected_contents_raw, "\r", &expected_contents);
 
     // Load the page.
     ui_test_utils::WindowedNotificationObserver tree_updated_observer(
         content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
         content::NotificationService::AllSources());
     string16 html_contents16;
     html_contents16 = UTF8ToUTF16(html_contents);
     GURL url(UTF8ToUTF16(kUrlPreamble) + html_contents16);
     browser()->OpenURL(OpenURLParams(
         url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
 
     // Wait for the tree.
     tree_updated_observer.Wait();
 
     // Perform a diff (or write the initial baseline).
-    string16 actual_contents;
+    string16 actual_contents_utf16;
     helper_.DumpAccessibilityTree(
         host_view->GetBrowserAccessibilityManager()->GetRoot(),
-        &actual_contents);
-    std::string actual_contents8 = UTF16ToUTF8(actual_contents);
-    EXPECT_EQ(expected_contents, actual_contents8);
+        &actual_contents_utf16);
+    std::string actual_contents = UTF16ToUTF8(actual_contents_utf16);
+    EXPECT_TRUE(expected_contents == actual_contents);
+    if (expected_contents != actual_contents) {
+      printf("*** EXPECTED: ***\n%s\n", expected_contents.c_str());
+      printf("*** ACTUAL: ***\n%s\n", actual_contents.c_str());
+    }
 
     if (!file_util::PathExists(expected_file)) {
       FilePath actual_file =
           FilePath(html_file.RemoveExtension().value() +
                    helper_.GetActualFileSuffix());
 
       EXPECT_TRUE(file_util::WriteFile(
-          actual_file, actual_contents8.c_str(), actual_contents8.size()));
+          actual_file, actual_contents.c_str(), actual_contents.size()));
 
       ADD_FAILURE() << "No expectation found. Create it by doing:\n"
           << "mv " << actual_file.LossyDisplayName() << " "
           << expected_file.LossyDisplayName();
     }
   } while (!(html_file = file_enumerator.Next()).empty());
 }