Separating ARIA, HTML & event AX test.

content/browser/accessibility/dump_accessibility_browsertest_base.h

 // 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 <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "content/browser/accessibility/accessibility_tree_formatter.h"
 #include "content/public/test/content_browser_test.h"
 
 namespace content {
 
 // Base class for an accessibility browsertest that takes an HTML file as
 // input, loads it into a tab, dumps some accessibility data in text format,
 // then compares that text to an expectation file in the same directory.
 //
 // The system was inspired by WebKit/Blink LayoutTests, but customized for
 // testing accessibility in Chromium.
 class DumpAccessibilityTestBase : public ContentBrowserTest {
  public:
   DumpAccessibilityTestBase();
   virtual ~DumpAccessibilityTestBase();
 
   // Given a path to an HTML file relative to the test directory,
   // loads the HTML, loads the accessibility tree, calls Dump(), then
   // compares the output to the expected result and has the test succeed
   // or fail based on the diff.
-  void RunTest(const base::FilePath::CharType* file_path);
+  void RunTest(const base::FilePath file_path, const char* file_dir);
+  void RunAriaTest(const base::FilePath::CharType* file_path);
+  void RunEventTest(const base::FilePath::CharType* file_path);

[dmazzoni, 2014/12/22 08:01:20]

This doesn't belong in DumpAccessibilityTestBase, it belongs in
DumpAccessibilityEventsTest

Same with Aria and Html - they belong in DumpAccessibilityTreeTest.

[shreeramk, 2014/12/22 16:56:25]

Oops sorry. Will take care in next patchset.

+  void RunHtmlTest(const base::FilePath::CharType* file_path);
 
  protected:
   //
   // For subclasses to override:
   //
 
   // This is called by RunTest after the document has finished loading,
   // including the load complete accessibility event. The subclass should
   // dump whatever that specific test wants to dump, returning the result
   // as a sequence of strings.
@@ skipping 41 matching lines @@
   void ParseHtmlForExtraDirectives(
       const std::string& test_html,
       std::vector<AccessibilityTreeFormatter::Filter>* filters,
       std::string* wait_for);
 
   // The default filters plus the filters loaded from the test file.
   std::vector<AccessibilityTreeFormatter::Filter> filters_;
 };
 
 }  // namespace content