Separating ARIA, HTML & event AX test.

content/browser/accessibility/dump_accessibility_browsertest_base.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 "content/browser/accessibility/dump_accessibility_browsertest_base.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 102 matching lines @@
       filters->push_back(Filter(base::UTF8ToUTF16(
           line.substr(deny_str.size())),
                                 Filter::DENY));
     } else if (StartsWithASCII(line, wait_str, true)) {
       *wait_for = line.substr(wait_str.size());
     }
   }
 }
 
 void DumpAccessibilityTestBase::RunTest(
-    const base::FilePath::CharType* file_path) {
+    const base::FilePath file_path, const char* file_dir) {
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
-  // Setup test paths.
-  base::FilePath dir_test_data;
-  ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &dir_test_data));
-  base::FilePath test_path(
-      dir_test_data.Append(FILE_PATH_LITERAL("accessibility")));
-  ASSERT_TRUE(base::PathExists(test_path))
-      << test_path.LossyDisplayName();
-
-  base::FilePath html_file = test_path.Append(base::FilePath(file_path));
   // Output the test path to help anyone who encounters a failure and needs
   // to know where to look.
-  printf("Testing: %s\n", html_file.MaybeAsASCII().c_str());
+  printf("Testing: %s\n", file_path.MaybeAsASCII().c_str());
 
   std::string html_contents;
-  base::ReadFileToString(html_file, &html_contents);
+  base::ReadFileToString(file_path, &html_contents);
 
   // Read the expected file.
   std::string expected_contents_raw;
   base::FilePath expected_file =
-    base::FilePath(html_file.RemoveExtension().value() +
+    base::FilePath(file_path.RemoveExtension().value() +
                    AccessibilityTreeFormatter::GetExpectedFileSuffix());
   base::ReadFileToString(expected_file, &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;
   base::RemoveChars(expected_contents_raw, "\r", &expected_contents);
 
   if (!expected_contents.compare(0, strlen(kMarkSkipFile), kMarkSkipFile)) {
     printf("Skipping this test on this platform.\n");
     return;
   }
 
   // Parse filters and other directives in the test file.
   std::string wait_for;
   AddDefaultFilters(&filters_);
   ParseHtmlForExtraDirectives(html_contents, &filters_, &wait_for);
 
   // Load the page.
   base::string16 html_contents16;
   html_contents16 = base::UTF8ToUTF16(html_contents);
-  GURL url = GetTestUrl("accessibility",
-                        html_file.BaseName().MaybeAsASCII().c_str());
+  GURL url = GetTestUrl(file_dir, file_path.BaseName().MaybeAsASCII().c_str());
 
   // If there's a @WAIT-FOR directive, set up an accessibility notification
   // waiter that returns on any event; we'll stop when we get the text we're
   // waiting for, or time out. Otherwise just wait specifically for
   // the "load complete" event.
   scoped_ptr<AccessibilityNotificationWaiter> waiter;
   if (!wait_for.empty()) {
     waiter.reset(new AccessibilityNotificationWaiter(
         shell(), AccessibilityModeComplete, ui::AX_EVENT_NONE));
   } else {
@@ skipping 49 matching lines @@
       printf("%1s %4d %s\n", is_diff? kSignalDiff : "", line + 1,
              expected_lines[line].c_str());
     }
     printf("\nActual\n");
     printf("------\n");
     printf("%s\n", actual_contents.c_str());
   }
 
   if (!base::PathExists(expected_file)) {
     base::FilePath actual_file =
-        base::FilePath(html_file.RemoveExtension().value() +
+        base::FilePath(file_path.RemoveExtension().value() +
                        AccessibilityTreeFormatter::GetActualFileSuffix());
 
     EXPECT_TRUE(base::WriteFile(
         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();
   }
 }
 
 }  // namespace content