Re-enable 4 PDF accessibility tests by making them more robust.

chrome/browser/pdf/pdf_extension_test.cc

 // Copyright 2014 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 <stddef.h>
 
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/hash.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
+#include "base/strings/pattern.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/pdf/pdf_extension_test_util.h"
 #include "chrome/browser/pdf/pdf_extension_util.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 37 matching lines @@
 using content::WebContents;
 
 const int kNumberLoadTestParts = 10;
 
 #if defined(OS_MACOSX)
 const int kDefaultKeyModifier = blink::WebInputEvent::MetaKey;
 #else
 const int kDefaultKeyModifier = blink::WebInputEvent::ControlKey;
 #endif
 
-// Using ASSERT_TRUE deliberately instead of ASSERT_EQ or ASSERT_STREQ
-// in order to print a more readable message if the strings differ.
-#define ASSERT_MULTILINE_STREQ(expected, actual) \
-    ASSERT_TRUE(expected == actual) \
-        << "Expected:\n" << expected \
-        << "\n\nActual:\n" << actual
+// Check if the |actual| string matches the string or the string pattern in
+// |pattern| and print a readable message if it does not match.
+#define ASSERT_MULTILINE_STR_MATCHES(pattern, actual) \
+  ASSERT_TRUE(base::MatchPattern(actual, pattern))    \
+      << "Expected match pattern:\n"                  \
+      << pattern << "\n\nActual:\n"                   \
+      << actual
 
 bool GetGuestCallback(WebContents** guest_out, WebContents* guest) {
   EXPECT_FALSE(*guest_out);
   *guest_out = guest;
   // Return false so that we iterate through all the guests and verify there is
   // only one.
   return false;
 }
 
 class PDFExtensionTest : public ExtensionApiTest,
@@ skipping 497 matching lines @@
     if (node.role == ui::AX_ROLE_EMBEDDED_OBJECT)
       found_embedded_object = true;
     if (!found_embedded_object)
       continue;
 
     int indent = id_to_indentation[node.id];
     ax_tree_dump += std::string(2 * indent, ' ');
     ax_tree_dump += ui::ToString(node.role);
 
     std::string name = node.GetStringAttribute(ui::AX_ATTR_NAME);
-    base::ReplaceChars(name, "\r", "\\r", &name);
-    base::ReplaceChars(name, "\n", "\\n", &name);
+    base::ReplaceChars(name, "\r\n", "", &name);
     if (!name.empty())
       ax_tree_dump += " '" + name + "'";
     ax_tree_dump += "\n";
     for (size_t j = 0; j < node.child_ids.size(); ++j)
       id_to_indentation[node.child_ids[j]] = indent + 1;
   }
 
   return ax_tree_dump;
 }
 
-static const char kExpectedPDFAXTree[] =
+// This is a pattern with a few wildcards due to a PDF bug where the
+// fi ligature is not parsed correctly on some systems.
+// http://crbug.com/701427
+
+static const char kExpectedPDFAXTreePattern[] =
     "embeddedObject\n"
     "  group\n"
     "    region 'Page 1'\n"
     "      paragraph\n"
-    "        staticText '1 First Section\\r\\n'\n"
+    "        staticText '1 First Section'\n"
     "          inlineTextBox '1 '\n"
-    "          inlineTextBox 'First Section\\r\\n'\n"
+    "          inlineTextBox 'First Section'\n"
     "      paragraph\n"
-    "        staticText 'This is the first section.\\r\\n1'\n"
-    "          inlineTextBox 'This is the first section.\\r\\n'\n"
+    "        staticText 'This is the *rst section.1'\n"
+    "          inlineTextBox 'This is the *rst section.'\n"
     "          inlineTextBox '1'\n"
     "    region 'Page 2'\n"
     "      paragraph\n"
-    "        staticText '1.1 First Subsection\\r\\n'\n"
+    "        staticText '1.1 First Subsection'\n"
     "          inlineTextBox '1.1 '\n"
-    "          inlineTextBox 'First Subsection\\r\\n'\n"
+    "          inlineTextBox 'First Subsection'\n"
     "      paragraph\n"
-    "        staticText 'This is the first subsection.\\r\\n2'\n"
-    "          inlineTextBox 'This is the first subsection.\\r\\n'\n"
+    "        staticText 'This is the *rst subsection.2'\n"
+    "          inlineTextBox 'This is the *rst subsection.'\n"
     "          inlineTextBox '2'\n"
     "    region 'Page 3'\n"
     "      paragraph\n"
-    "        staticText '2 Second Section\\r\\n'\n"
+    "        staticText '2 Second Section'\n"
     "          inlineTextBox '2 '\n"
-    "          inlineTextBox 'Second Section\\r\\n'\n"
+    "          inlineTextBox 'Second Section'\n"
     "      paragraph\n"
     "        staticText '3'\n"
     "          inlineTextBox '3'\n";
 
-// https://crbug.com/701427
-IN_PROC_BROWSER_TEST_F(PDFExtensionTest, DISABLED_PdfAccessibility) {
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PdfAccessibility) {
   content::BrowserAccessibilityState::GetInstance()->EnableAccessibility();
 
   GURL test_pdf_url(embedded_test_server()->GetURL("/pdf/test-bookmarks.pdf"));
   WebContents* guest_contents = LoadPdfGetGuestContents(test_pdf_url);
   ASSERT_TRUE(guest_contents);
 
   WaitForAccessibilityTreeToContainNodeWithName(guest_contents,
                                                 "1 First Section\r\n");
   ui::AXTreeUpdate ax_tree = GetAccessibilityTreeSnapshot(guest_contents);
   std::string ax_tree_dump = DumpPdfAccessibilityTree(ax_tree);
-  ASSERT_MULTILINE_STREQ(kExpectedPDFAXTree, ax_tree_dump);
+
+  ASSERT_MULTILINE_STR_MATCHES(kExpectedPDFAXTreePattern, ax_tree_dump);
 }
 
 #if defined(GOOGLE_CHROME_BUILD)
 // Test a particular PDF encountered in the wild that triggered a crash
 // when accessibility is enabled.  (http://crbug.com/648981)
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PdfAccessibilityCharCountCrash) {
   content::BrowserAccessibilityState::GetInstance()->EnableAccessibility();
   GURL test_pdf_url(embedded_test_server()->GetURL(
       "/pdf_private/accessibility_crash_1.pdf"));
 
   WebContents* guest_contents = LoadPdfGetGuestContents(test_pdf_url);
   ASSERT_TRUE(guest_contents);
 
   WaitForAccessibilityTreeToContainNodeWithName(guest_contents, "Page 1");
 }
 #endif
 
-// https://crbug.com/701427
-IN_PROC_BROWSER_TEST_F(PDFExtensionTest, DISABLED_PdfAccessibilityEnableLater) {
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PdfAccessibilityEnableLater) {
   // In this test, load the PDF file first, with accessibility off.
   GURL test_pdf_url(embedded_test_server()->GetURL("/pdf/test-bookmarks.pdf"));
   WebContents* guest_contents = LoadPdfGetGuestContents(test_pdf_url);
   ASSERT_TRUE(guest_contents);
 
   // Now enable accessibility globally, and assert that the PDF accessibility
   // tree loads.
   EnableAccessibilityForWebContents(guest_contents);
   WaitForAccessibilityTreeToContainNodeWithName(guest_contents,
                                                 "1 First Section\r\n");
   ui::AXTreeUpdate ax_tree = GetAccessibilityTreeSnapshot(guest_contents);
   std::string ax_tree_dump = DumpPdfAccessibilityTree(ax_tree);
-  ASSERT_MULTILINE_STREQ(kExpectedPDFAXTree, ax_tree_dump);
+  ASSERT_MULTILINE_STR_MATCHES(kExpectedPDFAXTreePattern, ax_tree_dump);
 }
 
 bool RetrieveGuestContents(WebContents** out_guest_contents,
                            WebContents* in_guest_contents) {
   *out_guest_contents = in_guest_contents;
   return true;
 }
 
-// https://crbug.com/701427
-IN_PROC_BROWSER_TEST_F(PDFExtensionTest, DISABLED_PdfAccessibilityInIframe) {
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PdfAccessibilityInIframe) {
   content::BrowserAccessibilityState::GetInstance()->EnableAccessibility();
   GURL test_iframe_url(embedded_test_server()->GetURL("/pdf/test-iframe.html"));
   ui_test_utils::NavigateToURL(browser(), test_iframe_url);
   WebContents* contents = GetActiveWebContents();
   WaitForAccessibilityTreeToContainNodeWithName(contents,
                                                 "1 First Section\r\n");
 
   WebContents* guest_contents = nullptr;
   content::BrowserPluginGuestManager* guest_manager =
         contents->GetBrowserContext()->GetGuestManager();
   guest_manager->ForEachGuest(contents,
                               base::Bind(&RetrieveGuestContents,
                                          &guest_contents));
   ASSERT_TRUE(guest_contents);
 
   ui::AXTreeUpdate ax_tree = GetAccessibilityTreeSnapshot(guest_contents);
   std::string ax_tree_dump = DumpPdfAccessibilityTree(ax_tree);
-  ASSERT_MULTILINE_STREQ(kExpectedPDFAXTree, ax_tree_dump);
+  ASSERT_MULTILINE_STR_MATCHES(kExpectedPDFAXTreePattern, ax_tree_dump);
 }
 
-// https://crbug.com/701427
-IN_PROC_BROWSER_TEST_F(PDFExtensionTest, DISABLED_PdfAccessibilityInOOPIF) {
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PdfAccessibilityInOOPIF) {
   content::BrowserAccessibilityState::GetInstance()->EnableAccessibility();
   GURL test_iframe_url(embedded_test_server()->GetURL(
       "/pdf/test-cross-site-iframe.html"));
   ui_test_utils::NavigateToURL(browser(), test_iframe_url);
   WebContents* contents = GetActiveWebContents();
   WaitForAccessibilityTreeToContainNodeWithName(contents,
                                                 "1 First Section\r\n");
 
   WebContents* guest_contents = nullptr;
   content::BrowserPluginGuestManager* guest_manager =
         contents->GetBrowserContext()->GetGuestManager();
   guest_manager->ForEachGuest(contents,
                               base::Bind(&RetrieveGuestContents,
                                          &guest_contents));
   ASSERT_TRUE(guest_contents);
 
   ui::AXTreeUpdate ax_tree = GetAccessibilityTreeSnapshot(guest_contents);
   std::string ax_tree_dump = DumpPdfAccessibilityTree(ax_tree);
-  ASSERT_MULTILINE_STREQ(kExpectedPDFAXTree, ax_tree_dump);
+  ASSERT_MULTILINE_STR_MATCHES(kExpectedPDFAXTreePattern, ax_tree_dump);
 }
 
 #if defined(GOOGLE_CHROME_BUILD)
 // Test a particular PDF encountered in the wild that triggered a crash
 // when accessibility is enabled.  (http://crbug.com/668724)
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PdfAccessibilityTextRunCrash) {
   content::BrowserAccessibilityState::GetInstance()->EnableAccessibility();
   GURL test_pdf_url(embedded_test_server()->GetURL(
       "/pdf_private/accessibility_crash_2.pdf"));
 
@@ skipping 264 matching lines @@
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, OpenFromFTP) {
   net::SpawnedTestServer ftp_server(
       net::SpawnedTestServer::TYPE_FTP, net::SpawnedTestServer::kLocalhost,
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data/pdf")));
   ASSERT_TRUE(ftp_server.Start());
 
   GURL url(ftp_server.GetURL("/test.pdf"));
   ASSERT_TRUE(LoadPdf(url));
   EXPECT_EQ(base::ASCIIToUTF16("test.pdf"), GetActiveWebContents()->GetTitle());
 }