diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..38715a0b --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,31 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node-terminal", + "name": "Run Maven Jetty", + "request": "launch", + "command": "mvn jetty:run", + "cwd": "${workspaceFolder}/vaadin-spreadsheet" + }, + { + "type": "java", + "name": "Attach to Maven Jetty", + "request": "attach", + "hostName": "localhost", + "port": 5005, + "preLaunchTask": "Run Maven Jetty with debugger" + } + ], + "compounds": [ + { + "name": "Debug Maven Jetty", + "configurations": [ + "Attach to Maven Jetty" + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..4c595fce --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive", + "java.compile.nullAnalysis.mode": "disabled", + "files.exclude": { + "**/*.rpyc": true, + "**/*.rpa": true, + "**/*.rpymc": true, + "**/cache/": true + } +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..35a09bda --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,35 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Run Maven Jetty with debugger", + "type": "shell", + "command": "mvn", + "args": [ + "jetty:run" + ], + "options": { + "cwd": "${workspaceFolder}/vaadin-spreadsheet", + "env": { + "MAVEN_OPTS": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005" + } + }, + "isBackground": true, + "problemMatcher": { + "owner": "java", + "fileLocation": "absolute", + "pattern": { + "regexp": "^(.+\\.java):\\[(\\d+),(\\d+)\\]\\s+(.+)$", + "file": 1, + "line": 2, + "column": 3, + "message": 4 + }, + "background": { + "activeOnStart": true, + "beginsPattern": "Listening for transport dt_socket at address: 5005", + "endsPattern": "Listening for transport dt_socket at address: 5005" + } + } + } + ] \ No newline at end of file diff --git a/pom.xml b/pom.xml index f69cb6b8..bd8cbb5e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,9 +23,9 @@ UTF-8 2026 - 8.30.1 + 8.32.0 4.3.5 - 5.1.2 + 5.4.0 9.4.54.v20240208 3.0.1 4.13.2 diff --git a/vaadin-spreadsheet-charts/pom.xml b/vaadin-spreadsheet-charts/pom.xml index 8e2a1196..a866dbd5 100644 --- a/vaadin-spreadsheet-charts/pom.xml +++ b/vaadin-spreadsheet-charts/pom.xml @@ -18,9 +18,9 @@ UTF-8 2026 - 8.14.4 + 8.32.0 4.3.5 - 5.1.2 + 5.4.0 9.4.54.v20240208 5.5.1 diff --git a/vaadin-spreadsheet-testbench-api/pom.xml b/vaadin-spreadsheet-testbench-api/pom.xml index d76b5c8c..b3e38cc6 100644 --- a/vaadin-spreadsheet-testbench-api/pom.xml +++ b/vaadin-spreadsheet-testbench-api/pom.xml @@ -17,8 +17,8 @@ UTF-8 2026 - 8.14.4 - 5.1.2 + 8.32.0 + 5.4.0 diff --git a/vaadin-spreadsheet-testbench-api/src/main/java/com/vaadin/addon/spreadsheet/elements/SpreadsheetElement.java b/vaadin-spreadsheet-testbench-api/src/main/java/com/vaadin/addon/spreadsheet/elements/SpreadsheetElement.java index c41a70e7..a1e800a7 100644 --- a/vaadin-spreadsheet-testbench-api/src/main/java/com/vaadin/addon/spreadsheet/elements/SpreadsheetElement.java +++ b/vaadin-spreadsheet-testbench-api/src/main/java/com/vaadin/addon/spreadsheet/elements/SpreadsheetElement.java @@ -10,6 +10,7 @@ */ package com.vaadin.addon.spreadsheet.elements; +import java.time.Duration; import java.util.List; import org.openqa.selenium.By; @@ -287,7 +288,7 @@ boolean isElementSelected(WebElement element) { private void findSelectionOutline() { // sometimes the spreadsheet takes so long to load that the selection // widget elements are not found - new WebDriverWait(getDriver(), 10).until(ExpectedConditions + new WebDriverWait(getDriver(), Duration.ofMillis(10)).until(ExpectedConditions .presenceOfElementLocated(By.className("s-top"))); sTop = findElement(By.className("s-top")); sBottom = findElement(By.className("s-bottom")); diff --git a/vaadin-spreadsheet/pom.xml b/vaadin-spreadsheet/pom.xml index b07fb6d3..224d0db8 100755 --- a/vaadin-spreadsheet/pom.xml +++ b/vaadin-spreadsheet/pom.xml @@ -23,9 +23,9 @@ UTF-8 2026 - 8.30.1 + 8.32.0 4.3.5 - 5.1.2 + 5.4.0 9.4.54.v20240208 3.0.1 4.13.2 diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/BordersWithHiddenColumnsAndRowsTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/BordersWithHiddenColumnsAndRowsTest.java index 4ccbe231..136d167d 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/BordersWithHiddenColumnsAndRowsTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/BordersWithHiddenColumnsAndRowsTest.java @@ -31,7 +31,7 @@ public void test() throws Exception { spreadsheetPage.selectSheetAt(0); compareScreen("sheet1_row_3_hidden"); - if (!isPhantomOrFF()) { + if (!isFirefox()) { // Context click doesn't work in those FF and Phantom compareSheet1WithRow3Shown(); compareSheet1WithColumnHShown(); @@ -40,17 +40,16 @@ public void test() throws Exception { spreadsheetPage.selectSheetAt(1); compareScreen("sheet2_initial"); - if (!isPhantomOrFF()) { + if (!isFirefox()) { // Context click doesn't work in those FF and Phantom compareSheet2WithRowsShown(); compareSheet2WithColumnsShown(); } } - private boolean isPhantomOrFF() { + private boolean isFirefox() { DesiredCapabilities capabilities = getDesiredCapabilities(); - return BrowserUtil.isFirefox(capabilities) - || BrowserUtil.isPhantomJS(capabilities); + return BrowserUtil.isFirefox(capabilities); } private void compareSheet1WithRow3Shown() throws IOException { diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CellDeletionTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CellDeletionTest.java index 03eb0228..3a30c1fd 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CellDeletionTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CellDeletionTest.java @@ -62,7 +62,6 @@ public void deletionHandler_SpreadsheetWithDeletionFixture_deleteSingleCellFails @Test public void deletionHandler_SpreadsheetWithDeletionFixture_deleteIndividualCellSucceedsWhenHandlerReturnsTrue() { - skipBrowser("PhantomJS ignores the CTRL", Browser.PHANTOMJS); skipBrowser("Firefox ignores the CTRL", Browser.FIREFOX); sheetController.clickCell("B3"); @@ -81,7 +80,6 @@ public void deletionHandler_SpreadsheetWithDeletionFixture_deleteIndividualCellS @Test public void deletionHandler_SpreadsheetWithDeletionFixture_deleteIndividualCellFailsWhenHandlerReturnsFalse() { - skipBrowser("PhantomJS ignores the CTRL", Browser.PHANTOMJS); skipBrowser("Firefox ignores the CTRL", Browser.FIREFOX); sheetController.clickCell("C3"); @@ -102,7 +100,6 @@ public void deletionHandler_SpreadsheetWithDeletionFixture_deleteIndividualCellF @Test public void deletionHandler_SpreadsheetWithDeletionFixture_deleteCellRangeSucceedsWhenHandlerReturnsTrue() { - skipBrowser("PhantomJS ignores the SHIFT", Browser.PHANTOMJS); skipBrowser("Firefox ignores the SHIFT", Browser.FIREFOX); sheetController.clickCell("B6"); @@ -122,7 +119,6 @@ public void deletionHandler_SpreadsheetWithDeletionFixture_deleteCellRangeSuccee @Test public void deletionHandler_SpreadsheetWithDeletionFixture_deleteCellRangeFailsWhenHandlerReturnsFalse() { - skipBrowser("PhantomJS ignores the SHIFT", Browser.PHANTOMJS); skipBrowser("Firefox ignores the SHIFT", Browser.FIREFOX); sheetController.clickCell("C6"); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CommentTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CommentTest.java index e0e821ce..32bb2761 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CommentTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CommentTest.java @@ -102,7 +102,7 @@ public void contextClick_on_commentIndicator() throws InterruptedException { @Test public void removeRow_removeRowWithComment_commentIsRemoved() { skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); // is this true? headerPage.createNewSpreadsheet(); headerPage.loadFile("cell_comments.xlsx", this); // A1 has a comment final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CustomComponentsTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CustomComponentsTest.java index e2c73baf..ead25234 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CustomComponentsTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/CustomComponentsTest.java @@ -13,13 +13,13 @@ import static org.junit.Assert.assertEquals; import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.junit.Before; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.support.ui.Duration; import org.openqa.selenium.support.ui.Select; import org.openqa.selenium.support.ui.Sleeper; @@ -128,9 +128,9 @@ public void testScrollingBug() throws InterruptedException { assertEquals(TEXT_PROXY, sheetController.getCellContent("B2")); sheetController.selectCell("B5"); sheetController.navigateToCell("B100"); - Sleeper.SYSTEM_SLEEPER.sleep(new Duration(1, TimeUnit.SECONDS)); + Sleeper.SYSTEM_SLEEPER.sleep(Duration.ofSeconds(1)); sheetController.navigateToCell("B1"); - Sleeper.SYSTEM_SLEEPER.sleep(new Duration(3, TimeUnit.SECONDS)); + Sleeper.SYSTEM_SLEEPER.sleep(Duration.ofSeconds(3)); assertEquals(TEXT_PROXY, sheetController.getCellContent("B2")); } diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/HideTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/HideTest.java index a86ca77f..6d0d8758 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/HideTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/HideTest.java @@ -16,7 +16,6 @@ import org.junit.Test; import com.vaadin.addon.spreadsheet.test.fixtures.TestFixtures; -import com.vaadin.testbench.parallel.Browser; public class HideTest extends AbstractSpreadsheetTestCase { @@ -40,8 +39,6 @@ public void testHideColumn() { @Test public void testHideRow() { headerPage.createNewSpreadsheet(); - skipBrowser("Fails on phantom JS, B3 is visible after hiding region", - Browser.PHANTOMJS); sheetController.selectCell("B3"); headerPage.loadTestFixture(TestFixtures.RowToggle); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellNarrowFirstColumnTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellNarrowFirstColumnTest.java index 84e7a7e2..ec649e71 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellNarrowFirstColumnTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellNarrowFirstColumnTest.java @@ -54,8 +54,7 @@ public void overflowBasedOnFullMergedWidth() throws IOException { SheetCellElement cellElement = underlyingCell .wrap(SheetCellElement.class); - if (!BrowserUtil.isPhantomJS(getDesiredCapabilities()) - && !BrowserUtil.isIE(getDesiredCapabilities(), 10)) { + if (!BrowserUtil.isIE(getDesiredCapabilities(), 10)) { // for some reason PhantomJS and IE10 lose the underlying content // doesn't affect the end result negatively so can be ignored assertThat(cellElement.getValue(), equalTo(cellText)); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellOverflowTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellOverflowTest.java index 158fdb5e..b8928797 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellOverflowTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MergedCellOverflowTest.java @@ -55,8 +55,7 @@ public void overflow_spreadsheetWithMergedAndFormattedArea_noOverflowFromFirstCe } SheetCellElement cellElement = underlyingCell .wrap(SheetCellElement.class); - if (!BrowserUtil.isPhantomJS(getDesiredCapabilities()) - && !BrowserUtil.isIE(getDesiredCapabilities(), 10)) { + if (!BrowserUtil.isIE(getDesiredCapabilities(), 10)) { // for some reason PhantomJS and IE10 lose the underlying content // doesn't affect the end result negatively so can be ignored assertThat(cellElement.getValue(), equalTo(cellText)); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MultipleSheetTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MultipleSheetTest.java index 4d5c926e..f6a736f9 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MultipleSheetTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/MultipleSheetTest.java @@ -21,7 +21,6 @@ import com.vaadin.addon.spreadsheet.elements.SpreadsheetElement; import com.vaadin.addon.spreadsheet.test.fixtures.TestFixtures; import com.vaadin.testbench.By; -import com.vaadin.testbench.parallel.Browser; public class MultipleSheetTest extends AbstractSpreadsheetTestCase { @@ -58,9 +57,6 @@ public void testMultipleSheet() { @Test public void testRenameSheet() { - skipBrowser("Cannot find the 'new sheet name' element on PhantomJS", - Browser.PHANTOMJS); - Actions actions = new Actions(driver); actions.doubleClick(driver.findElement(By.xpath( "//div[@class='sheet-tabsheet-container']//div[text()='Sheet1']"))); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NavigationTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NavigationTest.java index cb7a8b8d..3920bc00 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NavigationTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NavigationTest.java @@ -225,9 +225,6 @@ public void testEnterSelectionRangeInAddress() throws Exception { @Test public void testEnterSelectionRangeInAddress_outsideOfViewport() throws Exception { - skipBrowser( - "setAddressFieldValue() does not work correctly with PhantomJS", - Browser.PHANTOMJS); spreadsheetPage.setAddressFieldValue("AT1:AV7"); assertSelectionRange("AT1:AV7", true); } @@ -236,7 +233,6 @@ public void testEnterSelectionRangeInAddress_outsideOfViewport() public void testKeyboardNavigation() throws Exception { skipBrowser("Sending multiple keys fails in IE", Browser.IE9, Browser.IE10, Browser.IE11); - skipBrowser("Fails randomly with PhantomJS", Browser.PHANTOMJS); spreadsheetPage.clickOnCell("J10"); new Actions(getDriver()).sendKeys(Keys.RIGHT).build().perform(); @@ -271,10 +267,6 @@ public void testKeyboardNavigation() throws Exception { @Test @Ignore("Keys.RETURN loses active position indication") public void testNavigationInSelectionWithEnterAndTab() throws Exception { - skipBrowser( - "setAddressFieldValue() does not work correctly with PhantomJS", - Browser.PHANTOMJS); - spreadsheetPage.setAddressFieldValue("A1:C2"); // Assert that everything is selected assertSelectionRange("A1:C2", true); @@ -442,8 +434,8 @@ public void testClickOnRowHeaderSelectsRow() throws Exception { @Test public void testShiftClickShouldSelect() throws Exception { - skipBrowser("Fails on Firefox and PhantomJS", Browser.FIREFOX, - Browser.PHANTOMJS); + // TODO: Is this still true? + skipBrowser("Fails on Firefox and PhantomJS", Browser.FIREFOX); spreadsheetPage.clickOnCell("B2"); assertSelectedCell("B2", spreadsheetPage.isCellSelected("B2")); // new Actions(getDriver()).keyDown(Keys.SHIFT).build().perform(); @@ -456,8 +448,8 @@ public void testShiftClickShouldSelect() throws Exception { @Test public void testShiftClickOnColumnHeader() throws Exception { - skipBrowser("Fails on Firefox and PhantomJS", Browser.FIREFOX, - Browser.PHANTOMJS); + // TODO: Is this still true? + skipBrowser("Fails on Firefox and PhantomJS", Browser.FIREFOX); spreadsheetPage.clickOnCell("B2"); assertSelectedCell("B2", spreadsheetPage.isCellSelected("B2")); // new Actions(getDriver()).keyDown(Keys.SHIFT).build().perform(); @@ -471,8 +463,8 @@ public void testShiftClickOnColumnHeader() throws Exception { @Test public void testShiftClickOnRowHeader() throws Exception { - skipBrowser("Range selection assertion fails", Browser.FIREFOX, - Browser.PHANTOMJS); + // TODO: Is this still true? + skipBrowser("Range selection assertion fails", Browser.FIREFOX); spreadsheetPage.clickOnCell("B10"); assertSelectedCell("B10", spreadsheetPage.isCellSelected("B10")); @@ -487,8 +479,8 @@ public void testShiftClickOnRowHeader() throws Exception { @Test public void testSelectCellsByCtrlClick() throws Exception { - skipBrowser("Fails on Firefox and PhantomJS", Browser.FIREFOX, - Browser.PHANTOMJS); + // TODO: Is this still true? + skipBrowser("Fails on Firefox and PhantomJS", Browser.FIREFOX); // ("only works on windows due to // https://code.google.com/p/selenium/issues/detail?id=4843 (patch diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NoScreenshotTBTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NoScreenshotTBTest.java index 185c526d..a58d4f28 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NoScreenshotTBTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/NoScreenshotTBTest.java @@ -21,9 +21,11 @@ import com.vaadin.addon.spreadsheet.test.tb3.AbstractTB3Test; import com.vaadin.addon.spreadsheet.test.tb3.PrivateTB3Configuration; -import com.vaadin.addon.spreadsheet.test.tb3.VaadinBrowserFactory; +//import com.vaadin.addon.spreadsheet.test.tb3.VaadinBrowserFactory; import com.vaadin.testbench.annotations.BrowserFactory; +import com.vaadin.testbench.annotations.RunLocally; import com.vaadin.testbench.annotations.RunOnHub; +import com.vaadin.testbench.parallel.Browser; /** * Blatant copy of {@link PrivateTB3Configuration} to create TB tests that don't @@ -33,8 +35,9 @@ * point * */ -@RunOnHub("tb3-hub.intra.itmill.com") -@BrowserFactory(VaadinBrowserFactory.class) +@RunLocally(Browser.FIREFOX) +//@RunOnHub("tb3-hub.intra.itmill.com") +//@BrowserFactory(VaadinBrowserFactory.class) public abstract class NoScreenshotTBTest extends AbstractTB3Test { public static final String PORT_PROPERTY = "com.vaadin.testbench.deployment.port"; diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RemoveInsertRow.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RemoveInsertRow.java index 93a64e09..bde5202d 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RemoveInsertRow.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RemoveInsertRow.java @@ -25,8 +25,9 @@ public class RemoveInsertRow extends AbstractSpreadsheetTestCase { @Test public void removeRow_theFirstCellHasInvalidFormula_formulaIndicatorIsRemoved() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -45,8 +46,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theSecondRowCellHasInvalidFormula_formulaIndicatorIsRemoved() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -67,8 +69,9 @@ public Object apply(WebDriver webDriver) { @Test public void insertRow_theFirstCellHasInvalidFormula_theInvalidFormulaIsMovedToNextRow() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -86,8 +89,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theSecondRowHasInvalidFormulaCell_formulaIndicatorIsMovedUp() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -105,8 +109,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theSecondAndThirdRowHasInvalidFormulaCell_formulaIndicatorIsMovedUp() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -127,8 +132,9 @@ public Object apply(WebDriver webDriver) { @Test public void insertRow_theFirstAndSecondRowHasInvalidFormulaCellAndTheRowIsAddedBetween_theFirstAndThirdRowHasErrorIndicator() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -151,8 +157,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theFirstRowHasInvalidFormulaCellAndTheSecondRowIsRemoved_theFirstRowHasErrorIndicator() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -170,8 +177,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theFirstCellHasMergedCell_thereIsNoMergedCells() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -193,8 +201,9 @@ public Object apply(WebDriver webDriver) { @Test public void insertRow_theFirstCellHasMergedCell_theMergedCellIsMovedToNextRow() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -217,8 +226,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theFirstCellHasPopupButton_thereIsNoPopupButtons() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -238,8 +248,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theSecondRowCellHasPopupButton_thereIsNoPopupButtons() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -260,8 +271,9 @@ public Object apply(WebDriver webDriver) { @Test public void removeRow_theSecondRowCellHasPopupButton_popupButtonIsMovedUp() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -281,8 +293,9 @@ public Object apply(WebDriver webDriver) { @Test public void insertRow_theFirstCellHasPopupButton_thePopupButtonIsMovedToNextRow() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -303,8 +316,9 @@ public Object apply(WebDriver webDriver) { @Ignore("This is a known issue which should be fixed. The problem is most likely on client side.") @Test public void insertRow_theFirstAndSecondRowHasPopupbuttonsNewRowIsAddedToFirstRow_theSecondAndThirdRowHasPopupButton() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeProtectedTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeProtectedTest.java index d71d80f5..8e9601b7 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeProtectedTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeProtectedTest.java @@ -80,11 +80,4 @@ protected void assertInRange(double from, double value, double to) { + to + "]", value >= from && value <= to); } - @Override - public List getBrowsersToTest() { - // ResizeHandle double click and dragging not working in phantomJS - List result = super.getBrowsersToTest(); - result.remove(Browser.PHANTOMJS.getDesiredCapabilities()); - return result; - } } diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeTest.java index f004d2e1..48f0b7b0 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/ResizeTest.java @@ -89,11 +89,4 @@ public void testColumnAutoResize() { 200); } - @Override - public List getBrowsersToTest() { - // ResizeHandle double click and dragging not working in phantomJS - List result = super.getBrowsersToTest(); - result.remove(Browser.PHANTOMJS.getDesiredCapabilities()); - return result; - } } diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowHeaderDoubleClickTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowHeaderDoubleClickTest.java index dc095325..87d1fbc8 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowHeaderDoubleClickTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowHeaderDoubleClickTest.java @@ -43,8 +43,6 @@ public void loadFixture_doubleClickOnRowHeader_rowHeaderDoubleClickEventFired() @Override public List getBrowsersToTest() { List result = super.getBrowsersToTest(); - // Double click is not supported by PhantomJS. - result.remove(Browser.PHANTOMJS.getDesiredCapabilities()); // In manual testing Chrome works fine result.remove(Browser.CHROME.getDesiredCapabilities()); return result; diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowShiftTests.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowShiftTests.java index 25c81b16..50a30ed5 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowShiftTests.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/RowShiftTests.java @@ -73,8 +73,6 @@ public void testFormula() { @Test public void testDeleteFormulaReference() { - skipBrowser("sheetController.putCellContent() fails with PhantomJS", - Browser.PHANTOMJS); spreadsheet.getCellAt("A3").setValue("42"); spreadsheet.getCellAt("C1").setValue("=A3"); spreadsheet.getCellAt("A4").click(); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SelectionTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SelectionTest.java index db99966f..11ae8481 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SelectionTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SelectionTest.java @@ -40,8 +40,9 @@ public void setUp() throws Exception { @Test public void testSelectionSingleCell() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.selectCell("B2"); ctrl.selectCell("C3"); ctrl.selectCell("D4"); @@ -53,8 +54,9 @@ public void testSelectionSingleCell() { @Test public void testMultipleRectSelection() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.selectCell("B1"); shift.selectCell("B3"); ctrl.selectCell("D3"); @@ -69,8 +71,9 @@ public void testMultipleRectSelection() { @Test public void testComplicatedCellSelection() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.selectCell("B2"); ctrl.clickCell("E2"); ctrl.clickCell("C3"); @@ -90,8 +93,9 @@ public void testComplicatedCellSelection() { @Test public void testRowSelection() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.clickRow(3); ctrl.clickRow(5); shift.clickRow(7); @@ -104,8 +108,9 @@ public void testRowSelection() { @Test public void testColumnSelection() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.clickColumn("B"); ctrl.clickColumn("D"); shift.clickColumn("F"); @@ -118,8 +123,9 @@ public void testColumnSelection() { @Test public void testRowColumnMixed() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.clickColumn("C"); ctrl.clickColumn("E"); ctrl.clickRow(3); @@ -137,8 +143,9 @@ public void testRowColumnMixed() { @Test @Ignore("Navigating to cell clears the selection, so this can't work -> Figure out another way to scroll") public void testColumnRowWithPagination() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.clickColumn("C"); ctrl.clickColumn("E"); ctrl.clickRow(3); @@ -156,8 +163,9 @@ public void testColumnRowWithPagination() { @Test public void testShiftClick() { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); sheetController.clickCell("B2"); shift.clickCell("C3"); assertCellSelected("B2"); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SheetTabSheetTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SheetTabSheetTest.java index 625190e7..0c48b440 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SheetTabSheetTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/SheetTabSheetTest.java @@ -70,8 +70,9 @@ public void focus_changeTab_sheetIsFocused() { @Test public void cellFocus_moveFromSheetOneToSheetTwoAndBack_cellSelectionRemains() throws InterruptedException { + // TODO: Is this still true? skipBrowser("Shift/Ctrl select fails with Firefox and PhantomJS", - Browser.FIREFOX, Browser.PHANTOMJS); + Browser.FIREFOX); SpreadsheetElement spreadsheet = $(SpreadsheetElement.class).first(); SheetCellElement cell = spreadsheet.getCellAt("C8"); diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/StyleTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/StyleTest.java index ae0e9a79..ba841bc0 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/StyleTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/StyleTest.java @@ -38,7 +38,6 @@ public void testCssStyleFromFixture() { @Test public void testCssFromUpload() { - skipBrowser("Fails in Phantom", Browser.PHANTOMJS); headerPage.createNewSpreadsheet(); headerPage.loadFile("spreadsheet_styles.xlsx", this); assertCorrectCss(sheetController); // TODO - Fails with rev 18 diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/UndoRedoTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/UndoRedoTest.java index 985561ad..31fc1fdf 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/UndoRedoTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/UndoRedoTest.java @@ -121,8 +121,9 @@ public void undo_cellValuesHasDeletedAndUndoneRedoneAndUndone_cellsHaveValues() @Test public void undo_addRowAndUndone_addedRowIsRemoved() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -137,8 +138,9 @@ public void undo_addRowAndUndone_addedRowIsRemoved() { @Test public void redo_addRowAndUndoneAndRedo_rowIsAdded() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -155,8 +157,9 @@ public void redo_addRowAndUndoneAndRedo_rowIsAdded() { @Test public void undo_removeRowAndUndone_removedRowIsAdded() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -171,8 +174,9 @@ public void undo_removeRowAndUndone_removedRowIsAdded() { @Test public void redo_removeRowAndUndoneAndRedo_rowIsRemoved() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -188,8 +192,9 @@ public void redo_removeRowAndUndoneAndRedo_rowIsRemoved() { @Test public void undo_removeRowWithCommentAndUndo_cellStillHasComment() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); headerPage.loadFile("cell_comments.xlsx", this); // A1 has a comment final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) @@ -209,8 +214,9 @@ public Object apply(WebDriver webDriver) { @Test public void undo_userAddsCommentAndRemovesTheRowAndUndo_cellStillHasComment() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -231,8 +237,9 @@ public Object apply(WebDriver webDriver) { @Test public void undo_removeRowsWithStyledCellsAndUndo_cellsHaveStyles() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); // differently styled cells on rows 2-5 headerPage.loadFile("spreadsheet_styles.xlsx", this); @@ -253,8 +260,9 @@ public void undo_removeRowsWithStyledCellsAndUndo_cellsHaveStyles() { @Test public void undo_addRowWithDateAndUndone_dateIsVisible() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); String expectedDate = "11/11/11"; headerPage.createNewSpreadsheet(); @@ -269,8 +277,9 @@ public void undo_addRowWithDateAndUndone_dateIsVisible() { @Test public void undo_theSecondRowWithMergedCellIsRemovedAndUndo_cellIsMerged() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -295,8 +304,9 @@ public Object apply(WebDriver webDriver) { @Ignore("This is a known issue which should be fixed.") @Test public void undo_theSecondRowWithInvalidFormulaIsRemovedAndUndo_formulaIndicatorIsPresent() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) .first(); @@ -316,8 +326,9 @@ public Object apply(WebDriver webDriver) { @Ignore("This is a known issue which should be fixed.") @Test public void undo_conditionalFormattedCellsRemovedAndUndo_cellsAreStillConditionallyFormatted() { + // TODO: Is this still true? skipBrowser("Context click does not work with PhantomJS and Firefox", - Browser.PHANTOMJS, Browser.FIREFOX); + Browser.FIREFOX); headerPage.createNewSpreadsheet(); headerPage.loadFile("conditional_formatting.xlsx", this); final SpreadsheetElement spreadsheet = $(SpreadsheetElement.class) diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java index 9e2a348d..aa45b903 100755 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java @@ -279,7 +279,8 @@ public int compare(Locale o1, Locale o2) { return o1.getDisplayName().compareTo(o2.getDisplayName()); } }); - localeSelect.setItems(locales); + //localeSelect.setItems(locales); + localeSelect.setItems(new Locale("en_US")); localeSelect.setItemCaptionGenerator(Locale::getDisplayName); localeSelect.addValueChangeListener(e -> updateLocale()); @@ -415,6 +416,7 @@ private ComboBox createTestSheetCombobox(List files) { cb.setId("testSheetSelect"); cb.setPageLength(30); cb.setWidth("250px"); + return cb; } diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/AbstractTB3Test.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/AbstractTB3Test.java index 679ad8cc..47212bbd 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/AbstractTB3Test.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/AbstractTB3Test.java @@ -55,20 +55,6 @@ public abstract class AbstractTB3Test extends ParallelTest { private boolean push = false; - @Override - public void setup() throws Exception { - // override local driver behaviour, so we can easily specify local - // PhantomJS - // with a system property - if (getBooleanProperty("localPhantom")) { - WebDriver driver = new SetupDriver() - .setupLocalDriver(Browser.PHANTOMJS); - setDriver(driver); - } else { - super.setup(); - } - } - protected boolean getBooleanProperty(String key) { return Boolean.parseBoolean(System.getProperty(key)); } diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/MultiBrowserTest.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/MultiBrowserTest.java index 3a00b865..edbc1209 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/MultiBrowserTest.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/MultiBrowserTest.java @@ -17,6 +17,7 @@ import org.junit.Rule; import org.junit.internal.AssumptionViolatedException; import org.junit.rules.TestName; +import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.ie.InternetExplorerDriver; import org.openqa.selenium.remote.DesiredCapabilities; @@ -67,7 +68,7 @@ public void setDesiredCapabilities( @BrowserConfiguration public List getBrowsersToTest() { return getBrowserCapabilities(Browser.IE11, Browser.FIREFOX, - Browser.CHROME, Browser.PHANTOMJS); + Browser.CHROME); } protected List getBrowsersExcludingPhantomJS() { @@ -152,11 +153,6 @@ private void skipBrowser(String reason, Browser browser) { throw new BrowserSkipped(reason); } break; - case PHANTOMJS: - if (BrowserUtil.isPhantomJS(capabilities)) { - throw new BrowserSkipped(reason); - } - break; default: throw new RuntimeException("Unknown browser: " + browser); } diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/PrivateTB3Configuration.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/PrivateTB3Configuration.java index 62b8b5dd..06b243e7 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/PrivateTB3Configuration.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/PrivateTB3Configuration.java @@ -20,7 +20,9 @@ import java.util.Properties; import com.vaadin.testbench.annotations.BrowserFactory; +import com.vaadin.testbench.annotations.RunLocally; import com.vaadin.testbench.annotations.RunOnHub; +import com.vaadin.testbench.parallel.Browser; /** * Provides values for parameters which depend on where the test is run. @@ -29,8 +31,8 @@ * * @author Vaadin Ltd */ -@RunOnHub("tb3-hub.intra.itmill.com") -@BrowserFactory(VaadinBrowserFactory.class) +//@RunOnHub("tb3-hub.intra.itmill.com") +@RunLocally(Browser.FIREFOX) public abstract class PrivateTB3Configuration extends ScreenshotTB3Test { /** * diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/ScreenshotTB3Test.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/ScreenshotTB3Test.java index 6a7784a1..308cd038 100644 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/ScreenshotTB3Test.java +++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/ScreenshotTB3Test.java @@ -341,7 +341,7 @@ private String getScreenshotReferenceName(String identifier) { */ private String getBrowserIdentifierWithVersion() { return getBrowserIdentifierWithoutVersion() + "_" - + getDesiredCapabilities().getVersion(); + + getDesiredCapabilities().getBrowserVersion(); } diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/VaadinBrowserFactory.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/VaadinBrowserFactory.java deleted file mode 100644 index 5c97004b..00000000 --- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/tb3/VaadinBrowserFactory.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Vaadin Spreadsheet Addon - * - * Copyright (C) 2013-2026 Vaadin Ltd - * - * This program is available under Vaadin Commercial License and Service Terms. - * - * See for the full - * license. - */ -package com.vaadin.addon.spreadsheet.test.tb3; - -import org.openqa.selenium.Platform; -import org.openqa.selenium.firefox.FirefoxDriver; -import org.openqa.selenium.ie.InternetExplorerDriver; -import org.openqa.selenium.remote.DesiredCapabilities; - -import com.vaadin.testbench.parallel.Browser; -import com.vaadin.testbench.parallel.DefaultBrowserFactory; - -public class VaadinBrowserFactory extends DefaultBrowserFactory { - private static final String FIREFOX_VERSION = "45"; - private static final String CHROME_VERSION = "40"; - private static final String PHANTOM_VERSION = "2"; - - @Override - public DesiredCapabilities create(Browser browser) { - switch (browser) { - case IE8: - return createIE(browser, "8"); - case IE9: - return createIE(browser, "9"); - case IE10: - return createIE(browser, "10"); - case IE11: - return createIE(browser, "11"); - case PHANTOMJS: - DesiredCapabilities phantom2 = create(browser, PHANTOM_VERSION, - Platform.LINUX); - // Hack for the test cluster - phantom2.setCapability("phantomjs.binary.path", - "/usr/bin/phantomjs2"); - return phantom2; - case CHROME: - return create(browser, CHROME_VERSION, Platform.VISTA); - case FIREFOX: - default: - return createFirefox(); - } - } - - private DesiredCapabilities createIE(Browser browser, String version) { - DesiredCapabilities capabilities = create(browser, version, - Platform.WINDOWS); - capabilities.setCapability( - InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION, true); - return capabilities; - } - - private DesiredCapabilities createFirefox() { - DesiredCapabilities capabilities = create(Browser.FIREFOX, - FIREFOX_VERSION, Platform.WINDOWS); - capabilities.setCapability(FirefoxDriver.MARIONETTE, false); - return capabilities; - } - - @Override - public DesiredCapabilities create(Browser browser, String version) { - return create(browser); - } -}