3939import  static  org .openqa .selenium .testing .TestUtilities .isFirefox ;
4040import  static  org .openqa .selenium .testing .TestUtilities .isInternetExplorer ;
4141import  static  org .openqa .selenium .testing .TestUtilities .isNativeEventsEnabled ;
42+ import  static  org .openqa .selenium .support .ui .ExpectedConditions .presenceOfElementLocated ;
4243
4344import  org .junit .Test ;
4445import  org .openqa .selenium .By ;
4849import  org .openqa .selenium .Point ;
4950import  org .openqa .selenium .WaitingConditions ;
5051import  org .openqa .selenium .WebElement ;
51- import  org .openqa .selenium .support .ui .ExpectedConditions ;
5252import  org .openqa .selenium .testing .Ignore ;
5353import  org .openqa .selenium .testing .JUnit4TestBase ;
5454import  org .openqa .selenium .testing .JavascriptEnabled ;
@@ -185,7 +185,7 @@ public void testControlClickingOnCustomMultiSelectionList() {
185185 private  void  navigateToClicksPageAndClickLink () {
186186 driver .get (pages .clicksPage );
187187
188-  wait .until (ExpectedConditions . presenceOfElementLocated (By .id ("normal" )));
188+  wait .until (presenceOfElementLocated (By .id ("normal" )));
189189 WebElement  link  = driver .findElement (By .id ("normal" ));
190190
191191 new  Actions (driver )
@@ -208,7 +208,7 @@ public void testCanClickOnLinks() {
208208 public  void  testCanClickOnLinksWithAnOffset () {
209209 driver .get (pages .clicksPage );
210210
211-  wait .until (ExpectedConditions . presenceOfElementLocated (By .id ("normal" )));
211+  wait .until (presenceOfElementLocated (By .id ("normal" )));
212212 WebElement  link  = driver .findElement (By .id ("normal" ));
213213
214214 new  Actions (driver )
@@ -220,7 +220,7 @@ public void testCanClickOnLinksWithAnOffset() {
220220 }
221221
222222 @ Ignore (
223-  value  = {HTMLUNIT , IPHONE },
223+  value  = {HTMLUNIT , IPHONE ,  CHROME ,  IE ,  OPERA ,  SAFARI },
224224 reason  = "HtmlUnit: Advanced mouse actions only implemented in rendered browsers" )
225225 @ Test 
226226 public  void  testClickAfterMoveToAnElementWithAnOffsetShouldUseLastMousePosition () {
@@ -236,6 +236,8 @@ public void testClickAfterMoveToAnElementWithAnOffsetShouldUseLastMousePosition(
236236 .click ()
237237 .perform ();
238238
239+  wait .until (presenceOfElementLocated (By .id ("pageX" )));
240+ 
239241 int  x  = Integer .parseInt (driver .findElement (By .id ("pageX" )).getText ());
240242 int  y  = Integer .parseInt (driver .findElement (By .id ("pageY" )).getText ());
241243
@@ -347,7 +349,7 @@ public void testHoldingDownShiftKeyWhileClicking() {
347349 new  Actions (driver ).keyDown (Keys .SHIFT ).click (toClick ).keyUp (Keys .SHIFT ).perform ();
348350
349351 WebElement  shiftInfo  =
350-  wait .until (ExpectedConditions . presenceOfElementLocated (By .id ("shiftKey" )));
352+  wait .until (presenceOfElementLocated (By .id ("shiftKey" )));
351353 assertThat (shiftInfo .getText (), equalTo ("true" ));
352354 }
353355
0 commit comments