Bug 948591 - Intermittent testClearPrivateData | Exception caught - junit.framework.AssertionFailedError: Text string: '^Settings$' is not found! r=mcomella

This commit is contained in:
Jonathan Almeida [:jonalmeida] 2015-08-17 00:00:00 -07:00
parent 6f71798ccd
commit 3b5a98f35b
2 changed files with 10 additions and 14 deletions

View File

@ -15,11 +15,7 @@ public interface Actions {
RIGHT, RIGHT,
ENTER, ENTER,
MENU, MENU,
/** DELETE,
* @deprecated Use Solo.goBack() in Robocop instead.
*/
@Deprecated
BACK
} }
public interface EventExpecter { public interface EventExpecter {

View File

@ -337,25 +337,25 @@ public class FennecNativeActions implements Actions {
public void sendSpecialKey(SpecialKey button) { public void sendSpecialKey(SpecialKey button) {
switch(button) { switch(button) {
case DOWN: case DOWN:
sendKeyCode(KeyEvent.KEYCODE_DPAD_DOWN); sendKeyCode(Solo.DOWN);
break; break;
case UP: case UP:
sendKeyCode(KeyEvent.KEYCODE_DPAD_UP); sendKeyCode(Solo.UP);
break; break;
case LEFT: case LEFT:
sendKeyCode(KeyEvent.KEYCODE_DPAD_LEFT); sendKeyCode(Solo.LEFT);
break; break;
case RIGHT: case RIGHT:
sendKeyCode(KeyEvent.KEYCODE_DPAD_RIGHT); sendKeyCode(Solo.RIGHT);
break; break;
case ENTER: case ENTER:
sendKeyCode(KeyEvent.KEYCODE_ENTER); sendKeyCode(Solo.ENTER);
break; break;
case MENU: case MENU:
sendKeyCode(KeyEvent.KEYCODE_MENU); sendKeyCode(Solo.MENU);
break; break;
case BACK: case DELETE:
sendKeyCode(KeyEvent.KEYCODE_BACK); sendKeyCode(Solo.DELETE);
break; break;
default: default:
mAsserter.ok(false, "sendSpecialKey", "Unknown SpecialKey " + button); mAsserter.ok(false, "sendSpecialKey", "Unknown SpecialKey " + button);
@ -367,7 +367,7 @@ public class FennecNativeActions implements Actions {
if (keyCode <= 0 || keyCode > KeyEvent.getMaxKeyCode()) { if (keyCode <= 0 || keyCode > KeyEvent.getMaxKeyCode()) {
mAsserter.ok(false, "sendKeyCode", "Unknown keyCode " + keyCode); mAsserter.ok(false, "sendKeyCode", "Unknown keyCode " + keyCode);
} }
mInstr.sendCharacterSync(keyCode); mSolo.sendKey(keyCode);
} }
@Override @Override