Commit b3cbdfe1 authored by Alexander Surkov's avatar Alexander Surkov
Browse files

Bug 482013 - use role.js instead of explicit .role and .finalRole calls, r=marcoz

parent b603641c

accessible/tests/mochitest/common.js

+0 −33
Original line number Diff line number Diff line
@@ -44,39 +44,6 @@ const nsIDOMWindow = Components.interfaces.nsIDOMWindow; 


const nsIPropertyElement = Components.interfaces.nsIPropertyElement;



////////////////////////////////////////////////////////////////////////////////

// Roles



const ROLE_ALERT = nsIAccessibleRole.ROLE_ALERT;

const ROLE_PUSHBUTTON = nsIAccessibleRole.ROLE_PUSHBUTTON;

const ROLE_CELL = nsIAccessibleRole.ROLE_CELL;

const ROLE_CHROME_WINDOW = nsIAccessibleRole.ROLE_CHROME_WINDOW;

const ROLE_COMBOBOX = nsIAccessibleRole.ROLE_COMBOBOX;

const ROLE_COMBOBOX_LIST = nsIAccessibleRole.ROLE_COMBOBOX_LIST;

const ROLE_COMBOBOX_OPTION = nsIAccessibleRole.ROLE_COMBOBOX_OPTION;

const ROLE_DOCUMENT = nsIAccessibleRole.ROLE_DOCUMENT;

const ROLE_ENTRY = nsIAccessibleRole.ROLE_ENTRY;

const ROLE_FLAT_EQUATION = nsIAccessibleRole.ROLE_FLAT_EQUATION;

const ROLE_FORM = nsIAccessibleRole.ROLE_FORM;

const ROLE_GRAPHIC = nsIAccessibleRole.ROLE_GRAPHIC;

const ROLE_GRID_CELL = nsIAccessibleRole.ROLE_GRID_CELL;

const ROLE_GROUPING = nsIAccessibleRole.ROLE_GROUPING;

const ROLE_HEADING = nsIAccessibleRole.ROLE_HEADING;

const ROLE_IMAGE_MAP = nsIAccessibleRole.ROLE_IMAGE_MAP;

const ROLE_INTERNAL_FRAME = nsIAccessibleRole.ROLE_INTERNAL_FRAME;

const ROLE_LABEL = nsIAccessibleRole.ROLE_LABEL;

const ROLE_LINK = nsIAccessibleRole.ROLE_LINK;

const ROLE_LIST = nsIAccessibleRole.ROLE_LIST;

const ROLE_LISTBOX = nsIAccessibleRole.ROLE_LISTBOX;

const ROLE_OPTION = nsIAccessibleRole.ROLE_OPTION;

const ROLE_PARAGRAPH = nsIAccessibleRole.ROLE_PARAGRAPH;

const ROLE_PASSWORD_TEXT = nsIAccessibleRole.ROLE_PASSWORD_TEXT;

const ROLE_SECTION = nsIAccessibleRole.ROLE_SECTION;

const ROLE_TABLE = nsIAccessibleRole.ROLE_TABLE;

const ROLE_TEXT_CONTAINER = nsIAccessibleRole.ROLE_TEXT_CONTAINER;

const ROLE_TEXT_LEAF = nsIAccessibleRole.ROLE_TEXT_LEAF;

const ROLE_TOGGLE_BUTTON = nsIAccessibleRole.ROLE_TOGGLE_BUTTON;



////////////////////////////////////////////////////////////////////////////////

// States

accessible/tests/mochitest/nsIAccessible_selects.js

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ function testThis(aID, aAcc, aNames, aRoles, aStates, aUndesiredStates, aIndex) 


  is(aAcc.name, aNames[aIndex],

     "wrong name for " + aID + " at index " + aIndex + "!");

  var role = aAcc.role;

  var role = getRole(aAcc);

  is(role, aRoles[aIndex],

     "Wrong role for " + aID + " at index " + aIndex + "!");

  testStates(aID, aAcc, aStates, aUndesiredStates, aIndex);

accessible/tests/mochitest/nsIAccessible_states.js

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ function testStatesInSubtree(aAccOrElmOrID, aState, aExtraState, aAbsentState) 
  if (!acc)

    return;



  if (acc.finalRole != ROLE_TEXT_LEAF)

  if (getRole(acc) != ROLE_TEXT_LEAF)

    // Right now, text leafs don't get tested because the states are not being

    // propagated.

    testStates(acc, aState, aExtraState, aAbsentState);

accessible/tests/mochitest/role.js

+49 −12
Original line number Diff line number Diff line 
////////////////////////////////////////////////////////////////////////////////

// Role constants



const ROLE_ALERT = nsIAccessibleRole.ROLE_ALERT;

const ROLE_PUSHBUTTON = nsIAccessibleRole.ROLE_PUSHBUTTON;

const ROLE_CELL = nsIAccessibleRole.ROLE_CELL;

const ROLE_CHROME_WINDOW = nsIAccessibleRole.ROLE_CHROME_WINDOW;

const ROLE_COMBOBOX = nsIAccessibleRole.ROLE_COMBOBOX;

const ROLE_COMBOBOX_LIST = nsIAccessibleRole.ROLE_COMBOBOX_LIST;

const ROLE_COMBOBOX_OPTION = nsIAccessibleRole.ROLE_COMBOBOX_OPTION;

const ROLE_DOCUMENT = nsIAccessibleRole.ROLE_DOCUMENT;

const ROLE_ENTRY = nsIAccessibleRole.ROLE_ENTRY;

const ROLE_FLAT_EQUATION = nsIAccessibleRole.ROLE_FLAT_EQUATION;

const ROLE_FORM = nsIAccessibleRole.ROLE_FORM;

const ROLE_GRAPHIC = nsIAccessibleRole.ROLE_GRAPHIC;

const ROLE_GRID_CELL = nsIAccessibleRole.ROLE_GRID_CELL;

const ROLE_GROUPING = nsIAccessibleRole.ROLE_GROUPING;

const ROLE_HEADING = nsIAccessibleRole.ROLE_HEADING;

const ROLE_IMAGE_MAP = nsIAccessibleRole.ROLE_IMAGE_MAP;

const ROLE_INTERNAL_FRAME = nsIAccessibleRole.ROLE_INTERNAL_FRAME;

const ROLE_LABEL = nsIAccessibleRole.ROLE_LABEL;

const ROLE_LINK = nsIAccessibleRole.ROLE_LINK;

const ROLE_LIST = nsIAccessibleRole.ROLE_LIST;

const ROLE_LISTBOX = nsIAccessibleRole.ROLE_LISTBOX;

const ROLE_NOTHING = nsIAccessibleRole.ROLE_NOTHING;

const ROLE_OPTION = nsIAccessibleRole.ROLE_OPTION;

const ROLE_PARAGRAPH = nsIAccessibleRole.ROLE_PARAGRAPH;

const ROLE_PASSWORD_TEXT = nsIAccessibleRole.ROLE_PASSWORD_TEXT;

const ROLE_SECTION = nsIAccessibleRole.ROLE_SECTION;

const ROLE_TABLE = nsIAccessibleRole.ROLE_TABLE;

const ROLE_TEXT_CONTAINER = nsIAccessibleRole.ROLE_TEXT_CONTAINER;

const ROLE_TEXT_LEAF = nsIAccessibleRole.ROLE_TEXT_LEAF;

const ROLE_TOGGLE_BUTTON = nsIAccessibleRole.ROLE_TOGGLE_BUTTON;



////////////////////////////////////////////////////////////////////////////////

// Public methods



/**

 * Test that the role of the given accessible is the role passed in.

 *

 * @param aAccOrElmOrID  the accessible, DOM element or ID to be tested.

 * @param aRole  The role that is to be expected.

 */

function testRole(aAccOrElmOrID, aRole)

{

  var role = getRole(aAccOrElmOrID);

  is(role, aRole, "Wrong role for " + prettyName(aAccOrElmOrID) + "!");

}



/**

 * Return the role of the given accessible. Return -1 if accessible could not

 * be retrieved.
@@ -20,15 +69,3 @@ function getRole(aAccOrElmOrID) 


  return role;

}
 


/**

 * Test that the role of the given accessible is the role passed in.

 *

 * @param aAccOrElmOrID  the accessible, DOM element or ID to be tested.

 * @param aRole  The role that is to be expected.

 */

function testRole(aAccOrElmOrID, aRole)

{

  var role = getRole(aAccOrElmOrID);

  is(role, aRole, "Wrong role for " + aAccOrElmOrID + "!");

}

accessible/tests/mochitest/testTextboxes.js

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ function testThis(aID, aName, aValue, aDescription, aRole, aState, 
  is(acc.name, aName, "Wrong name for " + aID + "!");

  testValue(aID, acc, aValue, aRole);

  is(acc.description, aDescription, "Wrong description for " + aID + "!");

  is(acc.role, aRole, "Wrong role for " + aID + "!");

  testRole(aID, aRole);



  testStates(acc, aState, aExtraState, aAbsentState);