Index: LayoutTests/gamepad/gamepad-polling-access.html |
diff --git a/LayoutTests/gamepad/gamepad-polling-access.html b/LayoutTests/gamepad/gamepad-polling-access.html |
index b6c3aaf682caa3e5ec71f9431d17ec12a60df04a..00e44716c4d7dece045199f90c208dfc01620578 100644 |
--- a/LayoutTests/gamepad/gamepad-polling-access.html |
+++ b/LayoutTests/gamepad/gamepad-polling-access.html |
@@ -19,12 +19,25 @@ |
shouldBeUndefined("navigator.webkitGetGamepads()[2]"); |
shouldBeUndefined("navigator.webkitGetGamepads()[3]"); |
+ shouldBe("navigator.getGamepads().length", "4"); |
+ shouldBeNull("navigator.getGamepads().item(0)"); |
+ shouldBeNull("navigator.getGamepads().item(1)"); |
+ shouldBeNull("navigator.getGamepads().item(2)"); |
+ shouldBeNull("navigator.getGamepads().item(3)"); |
+ shouldBeUndefined("navigator.getGamepads()[0]"); |
+ shouldBeUndefined("navigator.getGamepads()[1]"); |
+ shouldBeUndefined("navigator.getGamepads()[2]"); |
+ shouldBeUndefined("navigator.getGamepads()[3]"); |
+ |
// connect and disconnect |
gamepadController.connect(0); |
shouldBeNonNull("navigator.webkitGetGamepads()[0]"); |
+ shouldBeNonNull("navigator.getGamepads()[0]"); |
gamepadController.disconnect(0); |
shouldBeNull("navigator.webkitGetGamepads().item(0)"); |
shouldBeUndefined("navigator.webkitGetGamepads()[0]"); |
+ shouldBeNull("navigator.getGamepads().item(0)"); |
+ shouldBeUndefined("navigator.getGamepads()[0]"); |
// connect again, and check standard access |
gamepadController.connect(0); |
@@ -43,6 +56,17 @@ |
shouldBe("navigator.webkitGetGamepads()[0].axes.length", "2"); |
shouldBe("navigator.webkitGetGamepads()[0].axes[0]", "0.5"); |
shouldBe("navigator.webkitGetGamepads()[0].axes[1]", "-1.0"); |
+ |
+ shouldBe("navigator.getGamepads()[0].id", "'MockStick 3000'"); |
+ shouldBe("navigator.getGamepads()[0].buttons.length", "2"); |
+ shouldBe("navigator.getGamepads()[0].axes.length", "2"); |
+ shouldBe("navigator.getGamepads()[0].buttons[0].value", "1.0"); |
+ shouldBe("navigator.getGamepads()[0].buttons[0].pressed", "true"); |
+ shouldBe("navigator.getGamepads()[0].buttons[1].value", "0.0"); |
+ shouldBe("navigator.getGamepads()[0].buttons[1].pressed", "false"); |
+ shouldBe("navigator.getGamepads()[0].axes.length", "2"); |
+ shouldBe("navigator.getGamepads()[0].axes[0]", "0.5"); |
+ shouldBe("navigator.getGamepads()[0].axes[1]", "-1.0"); |
} |
else |
{ |