diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchDriverProxy.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchDriverProxy.java index 673d4f6c0..10fa82026 100644 --- a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchDriverProxy.java +++ b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchDriverProxy.java @@ -47,9 +47,7 @@ protected TestBenchDriverProxy(WebDriver webDriver) { @Override public WebDriver getWrappedDriver() { - // This is in practice the same thing as actualDriver because of proxy. - // Selenium can use us exactly the same way. - return this; + return actualDriver; } public WebDriver getActualDriver() { diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchElement.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchElement.java index 19bdfa04a..8068ab309 100644 --- a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchElement.java +++ b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchElement.java @@ -132,7 +132,7 @@ protected boolean isFirefox() { protected Capabilities getCapabilities() { WebDriver driver; if (getDriver() instanceof TestBenchDriverProxy) { - driver = ((TestBenchDriverProxy) getDriver()).getActualDriver(); + driver = ((TestBenchDriverProxy) getDriver()).getWrappedDriver(); } else { driver = getDriver(); } diff --git a/vaadin-testbench-core/src/test/java/com/vaadin/testbench/TestBenchDriverTest.java b/vaadin-testbench-core/src/test/java/com/vaadin/testbench/TestBenchDriverTest.java index 3ab704607..411e4705f 100644 --- a/vaadin-testbench-core/src/test/java/com/vaadin/testbench/TestBenchDriverTest.java +++ b/vaadin-testbench-core/src/test/java/com/vaadin/testbench/TestBenchDriverTest.java @@ -67,7 +67,7 @@ public void testTestBenchDriverActsAsProxy() { expect(mockDriver.getPageSource()).andReturn(""); expect(mockDriver.getTitle()).andReturn("bar"); expect(mockDriver.getWindowHandle()).andReturn("baz"); - Set handles = new HashSet(); + Set handles = new HashSet<>(); expect(mockDriver.getWindowHandles()).andReturn(handles); Options mockOptions = createNiceMock(Options.class); expect(mockDriver.manage()).andReturn(mockOptions); @@ -75,10 +75,8 @@ public void testTestBenchDriverActsAsProxy() { expect(mockDriver.navigate()).andReturn(mockNavigation); mockDriver.quit(); expectLastCall().once(); - expect( - ((JavascriptExecutor) mockDriver) - .executeScript(anyObject(String.class))).andStubReturn( - true); + expect(((JavascriptExecutor) mockDriver) + .executeScript(anyObject(String.class))).andStubReturn(true); TargetLocator mockTargetLocator = createNiceMock(TargetLocator.class); expect(mockDriver.switchTo()).andReturn(mockTargetLocator); replay(mockDriver); @@ -87,8 +85,10 @@ public void testTestBenchDriverActsAsProxy() { WebDriver driver = TestBench.createDriver(mockDriver); driver.close(); By mockBy = createNiceMock(By.class); - assertTrue(driver.findElement(mockBy) instanceof TestBenchElementCommands); - assertTrue(driver.findElements(mockBy).get(0) instanceof TestBenchElementCommands); + assertTrue( + driver.findElement(mockBy) instanceof TestBenchElementCommands); + assertTrue(driver.findElements(mockBy) + .get(0) instanceof TestBenchElementCommands); driver.get("foo"); assertEquals("foo", driver.getCurrentUrl()); assertEquals("", driver.getPageSource()); @@ -104,11 +104,11 @@ public void testTestBenchDriverActsAsProxy() { } @Test - public void getWrappedDriver_returnsItself() { + public void getWrappedDriver_returnsParent() { WebDriver driverMock = createNiceMock(WebDriver.class); WebDriver driver = TestBench.createDriver(driverMock); WebDriver wrappedDriver = ((WrapsDriver) driver).getWrappedDriver(); - assertEquals(driver, wrappedDriver); + assertEquals(driverMock, wrappedDriver); } @Test @@ -119,9 +119,11 @@ public void testDisableWaitForVaadin() { FirefoxDriver mockFF = createMock(FirefoxDriver.class); expect(mockFF.getCapabilities()).andReturn(mockCapabilities).anyTimes(); - expect(mockFF.executeScript(contains("clients[client].isActive()"))).andReturn(true).once(); + expect(mockFF.executeScript(contains("clients[client].isActive()"))) + .andReturn(true).once(); WebElement mockElement = createNiceMock(WebElement.class); - expect(mockFF.findElement(isA(By.class))).andReturn(mockElement).times(2); + expect(mockFF.findElement(isA(By.class))).andReturn(mockElement) + .times(2); replay(mockFF, mockElement, mockCapabilities); TestBenchDriverProxy tb = (TestBenchDriverProxy) TestBench