Merge branch 'master' of https://portal-ua.globallogic.com/git/selenium

Author: nataliakoval

java/client/src/org/openqa/selenium/remote/AddRemotePlayerApi.java

@@ -73,7 +73,7 @@ public void stop() {
         public PlayerState getState() {
             Number response = (Number)driverExecuteMethod
                     .execute(QtWebKitDriverCommand.GET_PLAYER_STATE, ImmutableMap.of("id", id));
-            PlayerState state = PlayerState.values()[((Long)response).intValue()];
+            PlayerState state = PlayerState.values()[response.intValue()];
             return state;
         }
 

java/client/test/org/openqa/selenium/qtwebkit/nativetests/VideoTest.java

@@ -70,13 +70,13 @@ public void testRemotePlayerSeek() {
         player.setState(Player.PlayerState.playing);
 
         try {
-            Thread.sleep(20000);
+            Thread.sleep(5000);
         } catch (InterruptedException ex) {
         }
 
         player.setState(Player.PlayerState.paused);
-        player.seek(10.5);
-        assertEquals(10.5, player.getCurrentPlayingPosition(), 0.1);
+        player.seek(1.5);
+        assertEquals(1.5, player.getCurrentPlayingPosition(), 0.1);
         player.setState(Player.PlayerState.playing);
     }