| Index: trunk/LayoutTests/gamepad/gamepad-events-basic.html
|
| ===================================================================
|
| --- trunk/LayoutTests/gamepad/gamepad-events-basic.html (revision 174432)
|
| +++ trunk/LayoutTests/gamepad/gamepad-events-basic.html (working copy)
|
| @@ -13,18 +13,15 @@
|
| shouldBe("event.__proto__", "GamepadEvent.prototype");
|
| shouldBe("event.__proto__.__proto__", "Event.prototype");
|
| shouldBeEqualToString("event.gamepad.id", "MockStick 3000");
|
| - shouldBe("event.gamepad.buttons.length", "3");
|
| - shouldBe("event.gamepad.axes.length", "3");
|
| + shouldBe("event.gamepad.buttons.length", "2");
|
| + shouldBe("event.gamepad.axes.length", "2");
|
| shouldBe("event.gamepad.buttons[0].value", "1.0");
|
| shouldBeTrue("event.gamepad.buttons[0].pressed");
|
| shouldBe("event.gamepad.buttons[1].value", "0.0");
|
| shouldBeFalse("event.gamepad.buttons[1].pressed");
|
| - shouldBe("event.gamepad.axes.length", "3");
|
| - shouldBe("event.gamepad.buttons[2].value", "0.333333");
|
| - shouldBeTrue("event.gamepad.buttons[2].pressed");
|
| + shouldBe("event.gamepad.axes.length", "2");
|
| shouldBe("event.gamepad.axes[0]", "0.5");
|
| shouldBe("event.gamepad.axes[1]", "-1.0");
|
| - shouldBe("event.gamepad.axes[2]", "0.333333");
|
| gamepadController.disconnect(0);
|
| }
|
|
|
| @@ -33,8 +30,8 @@
|
| shouldBe("event.__proto__", "GamepadEvent.prototype");
|
| shouldBe("event.__proto__.__proto__", "Event.prototype");
|
| shouldBeEqualToString("event.gamepad.id", "MockStick 3000");
|
| - shouldBe("event.gamepad.buttons.length", "3");
|
| - shouldBe("event.gamepad.axes.length", "3");
|
| + shouldBe("event.gamepad.buttons.length", "2");
|
| + shouldBe("event.gamepad.axes.length", "2");
|
| finishJSTest();
|
| }
|
|
|
| @@ -43,14 +40,12 @@
|
|
|
| gamepadController.connect(0);
|
| gamepadController.setId(0, "MockStick 3000");
|
| - gamepadController.setButtonCount(0, 3);
|
| - gamepadController.setAxisCount(0, 3);
|
| + gamepadController.setButtonCount(0, 2);
|
| + gamepadController.setAxisCount(0, 2);
|
| gamepadController.setButtonData(0, 0, 1);
|
| gamepadController.setButtonData(0, 1, 0);
|
| - gamepadController.setButtonData(0, 2, 0.333333);
|
| gamepadController.setAxisData(0, 0, .5);
|
| gamepadController.setAxisData(0, 1, -1.0);
|
| - gamepadController.setAxisData(0, 2, 0.333333);
|
| gamepadController.dispatchConnected(0);
|
| }
|
| else
|
|
|