java,tests: More mockito instead of stub classes

Author: barancev

Diff for: java/client/test/org/openqa/selenium/StubDriver.java

@@ -17,12 +17,17 @@
 
 package org.openqa.selenium;
 
+import org.openqa.selenium.interactions.HasInputDevices;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.Keyboard;
+import org.openqa.selenium.interactions.Mouse;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.logging.Logs;
 
 import java.util.List;
 import java.util.Set;
 
-public class StubDriver implements WebDriver, org.openqa.selenium.interactions.HasInputDevices, org.openqa.selenium.interactions.HasTouchScreen {
+public class StubDriver implements WebDriver, HasInputDevices, HasTouchScreen {
 
   public void get(String url) {
     throw new UnsupportedOperationException("get");
@@ -81,15 +86,15 @@ public Logs logs() {
   }
 
   // TODO(eran): Why does this not throw an exception like everything else?
-  public org.openqa.selenium.interactions.Keyboard getKeyboard() {
+  public Keyboard getKeyboard() {
     return null;
   }
 
-  public org.openqa.selenium.interactions.Mouse getMouse() {
+  public Mouse getMouse() {
     return null;
   }
 
-  public org.openqa.selenium.interactions.TouchScreen getTouch() {
+  public TouchScreen getTouch() {
     return null;
   }
 

Diff for: java/client/test/org/openqa/selenium/StubElement.java

@@ -21,6 +21,8 @@
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,10 +32,10 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.openqa.selenium.Keys;
-import org.openqa.selenium.StubRenderedWebElement;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.Coordinates;
+import org.openqa.selenium.internal.Locatable;
 
 /**
  * Tests the builder for advanced user interaction, the Actions class.
@@ -51,25 +53,11 @@ public class ActionsTest {
   public void setUp() {
     MockitoAnnotations.initMocks(this);
 
-    dummyLocatableElement = new StubRenderedWebElement() {
-      @Override
-      public Coordinates getCoordinates() {
-        return mockCoordinates;
-      }
-    };
-
-    driver = new StubInputDeviceDriver() {
-      @Override
-      public Keyboard getKeyboard() {
-        return mockKeyboard;
-      }
-
-      @Override
-      public Mouse getMouse() {
-        return mockMouse;
-      }
-
-    };
+    dummyLocatableElement = mockLocatableElementWithCoordinates(mockCoordinates);
+
+    driver = mock(WebDriver.class, withSettings().extraInterfaces(HasInputDevices.class));
+    when(((HasInputDevices) driver).getKeyboard()).thenReturn(mockKeyboard);
+    when(((HasInputDevices) driver).getMouse()).thenReturn(mockMouse);
   }
 
   @Test
@@ -112,19 +100,8 @@ public void supplyingIndividualElementsToKeyboardActions() {
     final Coordinates dummyCoordinates2 = mock(Coordinates.class, "dummy2");
     final Coordinates dummyCoordinates3 = mock(Coordinates.class, "dummy3");
 
-    final WebElement dummyElement2 = new StubRenderedWebElement() {
-      @Override
-      public Coordinates getCoordinates() {
-        return dummyCoordinates2;
-      }
-    };
-
-    final WebElement dummyElement3 = new StubRenderedWebElement() {
-      @Override
-      public Coordinates getCoordinates() {
-        return dummyCoordinates3;
-      }
-    };
+    final WebElement dummyElement2 = mockLocatableElementWithCoordinates(dummyCoordinates2);
+    final WebElement dummyElement3 = mockLocatableElementWithCoordinates(dummyCoordinates3);
 
     Actions builder = new Actions(driver);
 
@@ -177,4 +154,10 @@ public void creatingAllMouseActions() {
     order.verifyNoMoreInteractions();
   }
 
+  private WebElement mockLocatableElementWithCoordinates(Coordinates coord) {
+    WebElement element = mock(WebElement.class,
+                              withSettings().extraInterfaces(Locatable.class));
+    when(((Locatable) element).getCoordinates()).thenReturn(coord);
+    return element;
+  }
 }

Diff for: java/client/test/org/openqa/selenium/StubRenderedWebElement.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 import static org.openqa.selenium.remote.DriverCommand.FIND_ELEMENT;
 
 import static org.hamcrest.Matchers.not;
@@ -33,10 +34,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mockito;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.StubElement;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -54,8 +56,9 @@ public void shouldAllowReflexiveCalls() {
     DesiredCapabilities caps = new DesiredCapabilities();
     caps.setCapability(CapabilityType.SUPPORTS_FINDING_BY_CSS, true);
     StubExecutor executor = new StubExecutor(caps);
+    final WebElement element = mock(WebElement.class);
     executor.expect(FIND_ELEMENT, ImmutableMap.of("using", "css selector", "value", "cheese"),
-        new StubElement());
+        element);
 
     WebDriver driver = new RemoteWebDriver(executor, caps);
     WebDriver returned = getAugmenter().augment(driver);