diff options
Diffstat (limited to 'uitest/src/test/java/com/vaadin')
50 files changed, 20 insertions, 479 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnDetachedComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnDetachedComponentsTest.java index 9d7fb618ad..a45c6292d2 100644 --- a/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnDetachedComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnDetachedComponentsTest.java @@ -4,13 +4,10 @@ import static org.hamcrest.CoreMatchers.endsWith; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -import java.util.List; - import org.junit.Before; import org.junit.Test; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.TableElement; @@ -31,11 +28,6 @@ public class ActionsOnDetachedComponentsTest extends MultiBrowserTest { } } - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingContextMenu(); - } - @Test public void shortcutActionOnDetachedComponentShouldNotBeHandled() throws InterruptedException { diff --git a/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java index b171d3d1ff..eb0cb893ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java @@ -2,33 +2,23 @@ package com.vaadin.tests.actions; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; public class ActionsOnInvisibleComponentsTest extends MultiBrowserTest { private static final String LAST_INIT_LOG = "3. 'C' triggers a click on a visible and enabled button"; - // This method should be removed once #12785 is fixed - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowserCapabilities(Browser.IE11, Browser.PHANTOMJS); - } - @Test public void testShortcutsOnInvisibleDisabledButtons() { openTestURL(); assertEquals(LAST_INIT_LOG, getLogRow(0)); - invokeShortcut("A"); + invokeShortcut("a"); assertEquals(LAST_INIT_LOG, getLogRow(0)); - invokeShortcut("B"); + invokeShortcut("b"); assertEquals(LAST_INIT_LOG, getLogRow(0)); - invokeShortcut("C"); + invokeShortcut("c"); assertEquals("4. Click event for enabled button", getLogRow(0)); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java index 09ecd47d27..2dea0fbd4c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java @@ -3,11 +3,8 @@ package com.vaadin.tests.components.abstractcomponent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.UIElement; @@ -15,11 +12,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class ContextClickUITest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingContextMenu(); - } - @Test public void testContextClick() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java index f3c6f6371b..3703024cbf 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java @@ -2,11 +2,8 @@ package com.vaadin.tests.components.checkbox; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.WebElement; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.CheckBoxElement; @@ -14,11 +11,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class CheckboxContextClickTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingContextMenu(); - } - @Test public void contextClickCheckboxAndText() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java index bb946aa43d..bd0cc55cc9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java @@ -2,10 +2,7 @@ package com.vaadin.tests.components.grid; import static org.junit.Assert.assertTrue; -import java.util.List; - import org.junit.Test; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; @@ -13,13 +10,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class GridColumnAutoExpandTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // The functionality doesn't work for PHJS_1. And the test fails. It - // works for PHJS_2. - return getBrowsersExcludingPhantomJS(); - } - @Test public void testSecondColumnHasExpanded() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java index bf5fdb1988..73e2794c61 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java @@ -3,15 +3,11 @@ package com.vaadin.tests.components.grid; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.number.IsCloseTo.closeTo; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.By; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.LabelElement; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -24,15 +20,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; @TestCategory("grid") public class GridDetailsLayoutExpandTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> browsersToTest = super.getBrowsersToTest(); - // for some reason PhantomJS doesn't find the label even if it detects - // the presence - browsersToTest.remove(Browser.PHANTOMJS.getDesiredCapabilities()); - return browsersToTest; - } - @Test public void testLabelWidths() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowResizeTest.java index eeb5136df5..05b54e7d74 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowResizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowResizeTest.java @@ -19,7 +19,6 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.LabelElement; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -75,15 +74,6 @@ public class GridLayoutDetailsRowResizeTest extends MultiBrowserTest { @Test public void testMultipleDetailsRows() { - if (Browser.PHANTOMJS.name() - .equalsIgnoreCase(getDesiredCapabilities().getBrowserName())) { - // For some inexplicable reason PhantomJS fails to click that - // button, even if similar button clicks work just fine in other - // tests. Didn't disable PhantomJS altogether so that the other test - // at least could work in the initial pre-merge regression check. - return; - } - setDebug(true); openTestURL(); waitForElementPresent(By.className("v-grid")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectEmptyTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectEmptyTest.java index baf85cc45a..1d93a8b509 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectEmptyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectEmptyTest.java @@ -2,10 +2,7 @@ package com.vaadin.tests.components.grid; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Test; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement; @@ -13,12 +10,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class GridMultiSelectEmptyTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // On PhantomJS the result is more correct before recalculation. - return getBrowsersExcludingPhantomJS(); - } - @Test public void testCheckBoxColumnCorrectSize() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridPopupViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridPopupViewTest.java index 989fdacc82..fa21b5097e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridPopupViewTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridPopupViewTest.java @@ -2,28 +2,16 @@ package com.vaadin.tests.components.grid; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.Dimension; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.PopupViewElement; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; public class GridPopupViewTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> l = getBrowserCapabilities(Browser.IE11, - Browser.FIREFOX, Browser.CHROME); - l.add(PHANTOMJS2()); - return l; - } - @Test public void gridSizeCorrect() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java index 67c196a4e9..81f2518afc 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java @@ -35,7 +35,7 @@ public abstract class GridBasicsTest extends MultiBrowserTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { // Most tests are run with only one browser. - return getBrowserCapabilities(Browser.PHANTOMJS); + return getBrowserCapabilities(Browser.CHROME); } @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java index 8f49903fac..247d3b140a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java @@ -1,15 +1,11 @@ package com.vaadin.tests.components.orderedlayout; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; public class OrderedLayoutInfiniteLayoutPassesTest extends MultiBrowserTest { @@ -19,15 +15,6 @@ public class OrderedLayoutInfiniteLayoutPassesTest extends MultiBrowserTest { return true; } - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> b = super.getBrowsersToTest(); - // Chrome and PhantomJS do not support browser zoom changes - b.remove(Browser.CHROME.getDesiredCapabilities()); - b.remove(Browser.PHANTOMJS.getDesiredCapabilities()); - return b; - } - @Test public void ensureFiniteLayoutPhase() throws Exception { openTestURL("debug"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaDelegateToShortcutHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaDelegateToShortcutHandlerTest.java index 0fc2c631ca..9d29a1ad0d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaDelegateToShortcutHandlerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaDelegateToShortcutHandlerTest.java @@ -1,24 +1,17 @@ package com.vaadin.tests.components.richtextarea; -import java.util.List; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertThat; -import com.vaadin.testbench.elements.RichTextAreaElement; -import com.vaadin.tests.tb3.MultiBrowserTest; import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import org.openqa.selenium.remote.DesiredCapabilities; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertThat; +import com.vaadin.testbench.elements.RichTextAreaElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class RichTextAreaDelegateToShortcutHandlerTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersExcludingPhantomJS(); - } - @Test public void shouldDelegateToShortcutActionHandler() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaReadOnlyDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaReadOnlyDisabledTest.java index 83b1c41edc..4908a2bdf2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaReadOnlyDisabledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaReadOnlyDisabledTest.java @@ -1,20 +1,13 @@ package com.vaadin.tests.components.richtextarea; -import com.vaadin.tests.tb3.MultiBrowserTest; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.openqa.selenium.remote.DesiredCapabilities; -import java.util.List; +import com.vaadin.tests.tb3.MultiBrowserTest; public class RichTextAreaReadOnlyDisabledTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersExcludingPhantomJS(); - } - @Test public void shouldDelegateToShortcutActionHandler() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java index 663eb59cd2..6dab60b655 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java @@ -4,13 +4,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.lessThan; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -22,11 +19,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class ContextMenuSizeTest extends MultiBrowserTest { @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingContextMenu(); - } - - @Override public void setup() throws Exception { super.setup(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java index 1eab7f22e4..5410477af1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java @@ -1,10 +1,7 @@ package com.vaadin.tests.components.table; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.TestBenchElement; import com.vaadin.testbench.elements.TableElement; @@ -16,11 +13,6 @@ public class TableContextMenuAndIconsTest extends MultiBrowserTest { return com.vaadin.tests.components.table.Tables.class; } - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingContextMenu(); - } - @Test public void tableContextMenuWithIcons() throws Exception { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java index 8488fd9e9b..6bc3752ae4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java @@ -3,13 +3,10 @@ package com.vaadin.tests.components.tabsheet; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.By; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -17,13 +14,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class TabSheetFocusedTabTest extends MultiBrowserTest { @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // PhantomJS doesn't send Focus / Blur events when clicking or - // navigating with keyboard - return getBrowsersExcludingPhantomJS(); - } - - @Override protected Class<?> getUIClass() { return TabsheetScrolling.class; } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java index 1a8c020352..406a6f3177 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java @@ -8,7 +8,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.By; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -28,9 +27,8 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { - // Ignoring Chrome 40 because of a regression. See #16636. - return getBrowserCapabilities(Browser.IE11, Browser.FIREFOX, - Browser.PHANTOMJS); + // Regression. See #16636. + return getBrowsersExcludingChrome(); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java index 9ff676463a..243efb114f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java @@ -2,16 +2,12 @@ package com.vaadin.tests.components.ui; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.TextAreaElement; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest { @@ -24,9 +20,7 @@ public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest { Actions builder = new Actions(driver); builder.click(textArea); builder.sendKeys(textArea, "first line asdf"); - builder.keyDown(Keys.SHIFT); - builder.sendKeys(Keys.ENTER); - builder.keyUp(Keys.SHIFT); + builder.sendKeys(Keys.chord(Keys.SHIFT, Keys.ENTER)); builder.sendKeys(textArea, "second line jkl;"); builder.perform(); @@ -43,9 +37,7 @@ public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest { Actions builder = new Actions(driver); builder.click(textArea); builder.sendKeys(textArea, "first line asdf"); - builder.keyDown(Keys.CONTROL); - builder.sendKeys(Keys.ENTER); - builder.keyUp(Keys.CONTROL); + builder.sendKeys(Keys.chord(Keys.CONTROL, Keys.ENTER)); builder.sendKeys(textArea, "second line jkl;"); builder.perform(); @@ -54,13 +46,6 @@ public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest { } @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // Firefox can't handle ctrl. - // IE11 has issues with shift and ctrl - return getBrowserCapabilities(Browser.CHROME, Browser.PHANTOMJS); - } - - @Override protected Class<?> getUIClass() { return TextAreaEventPropagation.class; } diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/InterruptUploadTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/InterruptUploadTest.java index 9870190449..b956820303 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/InterruptUploadTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/InterruptUploadTest.java @@ -6,13 +6,11 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.util.List; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.internal.WrapsElement; -import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.LocalFileDetector; import org.openqa.selenium.remote.RemoteWebElement; @@ -24,12 +22,6 @@ import com.vaadin.tests.util.LoremIpsum; public class InterruptUploadTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // PhantomJS fails to upload files for unknown reasons - return getBrowsersExcludingPhantomJS(); - } - @Test public void testInterruptUpload() throws Exception { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java index 1a31d24f43..daff475fc4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java @@ -9,13 +9,11 @@ import java.io.IOException; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.List; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.internal.WrapsElement; -import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.LocalFileDetector; import org.openqa.selenium.remote.RemoteWebElement; @@ -24,12 +22,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class TestFileUploadTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // PhantomJS fails to upload files for unknown reasons - return getBrowsersExcludingPhantomJS(); - } - @Test public void testUploadAnyFile() throws Exception { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetTest.java index 156676f68f..bb12a0ebeb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetTest.java @@ -4,13 +4,11 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.util.List; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.internal.WrapsElement; -import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.LocalFileDetector; import org.openqa.selenium.remote.RemoteWebElement; @@ -23,12 +21,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; */ public class UploadInTabsheetTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // PhantomJS fails to upload files for unknown reasons - return getBrowsersExcludingPhantomJS(); - } - @Test public void testThatChangingTabAfterUploadDoesntCauseErrors() throws Exception { diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java index 24816845c5..e8663a687c 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java @@ -3,7 +3,6 @@ package com.vaadin.tests.contextclick; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -12,7 +11,6 @@ import org.junit.Test; import org.openqa.selenium.Point; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.AbstractComponentElement; import com.vaadin.testbench.elements.ButtonElement; @@ -26,11 +24,6 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest { private Pattern defaultLog = Pattern .compile("[0-9]+. ContextClickEvent: [(]([0-9]+), ([0-9]+)[)]"); - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingContextMenu(); - } - @Before public void setUp() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java index 1c41207c62..b76177f8cf 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java @@ -2,13 +2,9 @@ package com.vaadin.tests.extensions; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Before; import org.junit.Test; -import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.WebDriverWait; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; @@ -24,13 +20,6 @@ public class SetThemeAndResponsiveLayoutTest extends MultiBrowserTest { testBench().resizeViewPortTo(1024, 768); } - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // Seems like stylesheet onload is not fired on PhantomJS - // https://github.com/ariya/phantomjs/issues/12332 - return getBrowsersExcludingPhantomJS(); - } - @Test public void testWidthAndHeightRanges() throws Exception { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/htmlimport/HtmlImportUITest.java b/uitest/src/test/java/com/vaadin/tests/htmlimport/HtmlImportUITest.java index 588d42acae..36b108f052 100644 --- a/uitest/src/test/java/com/vaadin/tests/htmlimport/HtmlImportUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/htmlimport/HtmlImportUITest.java @@ -7,36 +7,15 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.junit.Test; import org.openqa.selenium.WebElement; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.By; -import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; public class HtmlImportUITest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - - List<DesiredCapabilities> browsers = getBrowsersExcludingPhantomJS(); - browsers.add(PHANTOMJS2()); - - return browsers.stream().filter(dc -> { - // Won't work on Firefox 24, will work when testing is done on a - // modern Firefox - if (BrowserUtil.isFirefox(dc) && dc.getVersion().equals("24")) { - return false; - } - - return true; - - }).collect(Collectors.toList()); - } - @Test public void importsLoadedAfterJs() { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java index 1143ba59ed..f59ba0814a 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java @@ -1,12 +1,4 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class BasicPushWebsocketTest extends BasicPushTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java index d2ce3c5e7a..bcba9d0aa5 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java @@ -1,12 +1,4 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class BasicPushWebsocketXhrTest extends BasicPushTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java index c90a48ee04..19792b136e 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java @@ -1,14 +1,5 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class ExtremelyLongPushTimeWebsocketTest extends ExtremelyLongPushTimeTest { - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java index 7885b6c911..b91103844c 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java @@ -1,18 +1,9 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class IdlePushChannelWebsocketTest extends IdlePushChannelTest { @Override protected Class<?> getUIClass() { return BasicPushWebsocket.class; } - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java index faa7f45ab3..53a7852b21 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java @@ -4,18 +4,10 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -import java.util.List; - import org.junit.Test; -import org.openqa.selenium.remote.DesiredCapabilities; public class PushConfigurationWebSocketTest extends PushConfigurationTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } - @Test public void testWebsocket() throws InterruptedException { getTransportSelect().selectByText("Websocket"); diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java index 1f0e904cdc..6ac0da840d 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java @@ -1,21 +1,8 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class ReconnectLongPollingTest extends ReconnectTest { @Override - public List<DesiredCapabilities> getBrowsersToTest() { - - // PhantomJS doesn't seem to detect disconnection on - // Long-Polling/Streaming: - // https://github.com/ariya/phantomjs/issues/11938 - return getBrowsersExcludingPhantomJS(); - } - - @Override protected Class<?> getUIClass() { return BasicPushLongPolling.class; } diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java index bc2318e2ce..c70a806d2c 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java @@ -1,20 +1,6 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class ReconnectStreamingTest extends ReconnectTest { - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - - // PhantomJS doesn't seem to detect disconnection on - // Long-Polling/Streaming: - // https://github.com/ariya/phantomjs/issues/11938 - return getBrowsersExcludingPhantomJS(); - } - @Override protected Class<?> getUIClass() { return BasicPushStreaming.class; diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java index 4ed74f914a..52b5b28466 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java @@ -1,17 +1,8 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class ReconnectWebsocketTest extends ReconnectTest { @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } - - @Override protected Class<?> getUIClass() { return BasicPushWebsocket.class; } diff --git a/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java b/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java index c175385d56..27641fc355 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java @@ -2,10 +2,7 @@ package com.vaadin.tests.push; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Test; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -24,9 +21,4 @@ public class RefreshCloseConnectionTest extends MultiBrowserTest { assertEquals("2. Refresh", getLogRow(1)); assertEquals("3. Push", getLogRow(0)); } - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java index f898d74f71..bedd2da5c8 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java @@ -1,18 +1,9 @@ package com.vaadin.tests.push; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - public class SendMultibyteCharactersWebSocketTest extends SendMultibyteCharactersTest { @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } - - @Override protected String getTransport() { return "websocket"; } diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java index 60062af62b..eece869929 100644 --- a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java +++ b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java @@ -3,21 +3,16 @@ package com.vaadin.tests.serialization; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; -import java.util.List; import java.util.Locale; import java.util.TimeZone; import java.util.stream.Collectors; import org.junit.Test; import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.testbench.annotations.RunLocally; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; public class SerializerTestTest extends MultiBrowserTest { @@ -25,12 +20,6 @@ public class SerializerTestTest extends MultiBrowserTest { private static final SimpleDateFormat FORMAT = new SimpleDateFormat( "EEE MMM dd HH:mm:ss 'GMT'Z yyyy", new Locale("en", "fi")); - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // IE11 and PhantomJS don't support getting timezone - return getBrowsersExcludingPhantomJS(); - } - @Test public void testSerialization() { // Set up formatting with browsers timezone diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java index a18573fc04..d825f2959f 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -102,15 +102,6 @@ public abstract class AbstractTB3Test extends ParallelTest { */ private static final int BROWSER_TIMEOUT_IN_MS = 30 * 1000; - protected static DesiredCapabilities PHANTOMJS2() { - DesiredCapabilities phantomjs2 = new VaadinBrowserFactory() - .create(Browser.PHANTOMJS, "2"); - // Hack for the test cluster - phantomjs2.setCapability("phantomjs.binary.path", - "/usr/bin/phantomjs2"); - return phantomjs2; - } - private boolean debug = false; private boolean push = false; diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java index 69f0467c8c..05bf9e4c89 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java @@ -6,7 +6,6 @@ import org.openqa.selenium.Platform; import org.openqa.selenium.ie.InternetExplorerDriver; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.shared.Version; import com.vaadin.testbench.parallel.Browser; import com.vaadin.testbench.parallel.DefaultBrowserFactory; diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java index 1febf9d952..eca7ee3565 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java @@ -25,27 +25,16 @@ import com.vaadin.testbench.parallel.Browser; */ public abstract class MultiBrowserTest extends PrivateTB3Configuration { - protected List<DesiredCapabilities> getBrowsersSupportingWebSocket() { - // No WebSocket support in PhantomJS 1 - return getBrowserCapabilities(Browser.IE11, Browser.FIREFOX, - Browser.CHROME); - } - - protected List<DesiredCapabilities> getBrowsersExcludingPhantomJS() { - return getBrowserCapabilities(Browser.IE11, Browser.CHROME, - Browser.FIREFOX); + protected List<DesiredCapabilities> getBrowsersExcludingChrome() { + return getBrowserCapabilities(Browser.FIREFOX, Browser.IE11); } protected List<DesiredCapabilities> getBrowsersExcludingIE() { - return getBrowserCapabilities(Browser.FIREFOX, Browser.CHROME, - Browser.PHANTOMJS); + return getBrowserCapabilities(Browser.FIREFOX, Browser.CHROME); } protected List<DesiredCapabilities> getBrowsersExcludingFirefox() { - // this is sometimes needed as the Firefox driver causes extra mouseOut - // events that make tooltips disappear etc. - return getBrowserCapabilities(Browser.IE11, Browser.CHROME, - Browser.PHANTOMJS); + return getBrowserCapabilities(Browser.IE11, Browser.CHROME); } protected List<DesiredCapabilities> getBrowsersSupportingShiftClick() { @@ -56,12 +45,6 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration { return getBrowserCapabilities(Browser.IE11); } - protected List<DesiredCapabilities> getBrowsersSupportingContextMenu() { - // context menu doesn't work in phantom JS - return getBrowserCapabilities(Browser.IE11, Browser.FIREFOX, - Browser.CHROME); - } - protected List<DesiredCapabilities> getBrowsersSupportingTooltip() { // With IEDriver, the cursor seems to jump to default position after the // mouse move, so we are not able to test the tooltip behavior properly @@ -70,13 +53,13 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration { // On Firefox, the driver causes additional mouseOut events causing the // tooltip to disappear immediately. Tooltips may work in some // particular cases, but not in general. - return getBrowserCapabilities(Browser.CHROME, Browser.PHANTOMJS); + return getBrowserCapabilities(Browser.CHROME); } @Override public List<DesiredCapabilities> getBrowsersToTest() { return getBrowserCapabilities(Browser.IE11, Browser.FIREFOX, - Browser.CHROME, Browser.PHANTOMJS); + Browser.CHROME); } protected List<DesiredCapabilities> getBrowserCapabilities( diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java index ab9758f648..95cf55f09f 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java @@ -9,7 +9,6 @@ import java.util.Set; import org.junit.runner.RunWith; import org.junit.runners.Parameterized.Parameters; -import org.openqa.selenium.remote.DesiredCapabilities; /** * Test which uses theme returned by {@link #getTheme()} for running the test @@ -43,11 +42,4 @@ public abstract class MultiBrowserThemeTest extends MultiBrowserTest { params.add("theme=" + theme); super.openTestURL(uiClass, params.toArray(new String[params.size()])); } - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> browsersToTest = getBrowsersExcludingPhantomJS(); - browsersToTest.add(PHANTOMJS2()); - return browsersToTest; - } } diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java index 38f02e8c61..78f5ca42e8 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java @@ -3,12 +3,10 @@ package com.vaadin.tests.tb3; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; -import java.util.List; import java.util.Set; import org.junit.runner.RunWith; import org.junit.runners.Parameterized.Parameters; -import org.openqa.selenium.remote.DesiredCapabilities; @RunWith(ParameterizedTB3Runner.class) public abstract class MultiBrowserThemeTestWithProxy @@ -37,11 +35,4 @@ public abstract class MultiBrowserThemeTestWithProxy params.add("theme=" + theme); super.openTestURL(uiClass, params.toArray(new String[params.size()])); } - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> browsersToTest = getBrowsersExcludingPhantomJS(); - browsersToTest.add(PHANTOMJS2()); - return browsersToTest; - } } diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java index 73119557bc..35857d078a 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java @@ -1,9 +1,5 @@ package com.vaadin.tests.tb3; -import java.util.List; - -import org.openqa.selenium.remote.DesiredCapabilities; - import com.vaadin.testbench.parallel.TestCategory; /** @@ -14,9 +10,4 @@ import com.vaadin.testbench.parallel.TestCategory; */ @TestCategory("push") public abstract class WebsocketTest extends MultiBrowserTest { - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingWebSocket(); - } } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java index 950f7daa73..0151e31da7 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java @@ -15,7 +15,6 @@ import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.EmbeddedElement; import com.vaadin.testbench.elements.MenuBarElement; import com.vaadin.testbench.elements.TableElement; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -23,14 +22,9 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { - // Seems like stylesheet onload is not fired on PhantomJS - // https://github.com/ariya/phantomjs/issues/12332 - List<DesiredCapabilities> l = getBrowsersExcludingPhantomJS(); - // For some reason, IE times out when trying to open the combobox, // #18341 - l.remove(Browser.IE11.getDesiredCapabilities()); - return l; + return getBrowsersExcludingIE(); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java index 2f7ab3ab17..2f82d74b31 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java @@ -4,25 +4,16 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import java.io.IOException; -import java.util.List; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ThemeChangeOnTheFlyTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // Seems like stylesheet onload is not fired on PhantomJS - // https://github.com/ariya/phantomjs/issues/12332 - return getBrowsersExcludingPhantomJS(); - } - @Test public void injectedStyleAndThemeChange() throws IOException { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java index 9559b6246f..6ab6f94aae 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java @@ -1,17 +1,13 @@ package com.vaadin.tests.themes.valo; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.CssLayoutElement; import com.vaadin.testbench.elements.LabelElement; -import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.v7.testbench.elements.TreeElement; @@ -300,13 +296,4 @@ public class ValoThemeUITest extends MultiBrowserTest { protected boolean usePersistentHoverForIE() { return false; } - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> browsersToTest = getBrowserCapabilities( - Browser.IE11, Browser.FIREFOX, Browser.CHROME); - browsersToTest.add(PHANTOMJS2()); - return browsersToTest; - } - } diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java index ed8e269f70..a0220e6764 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java @@ -2,10 +2,7 @@ package com.vaadin.v7.tests.components.grid; import static org.junit.Assert.assertTrue; -import java.util.List; - import org.junit.Test; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; @@ -13,12 +10,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; @TestCategory("grid") public class GridThemeChangeTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // Seems like stylesheet onload is not fired on PhantomJS - // https://github.com/ariya/phantomjs/issues/12332 - return super.getBrowsersExcludingPhantomJS(); - } @Test public void testThemeChange() { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java index 2054c497f0..ee92550bc5 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java @@ -1,10 +1,8 @@ package com.vaadin.v7.tests.components.grid.basicfeatures; import java.io.IOException; -import java.util.List; import org.junit.Test; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; @@ -13,13 +11,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; @TestCategory("grid") public class GridSortingIndicatorsTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> browsers = getBrowsersExcludingPhantomJS(); - browsers.add(PHANTOMJS2()); - return browsers; - } - @Test public void testSortingIndicators() throws IOException { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java index 3d8d9aa22c..0f64105b06 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java @@ -2,24 +2,15 @@ package com.vaadin.v7.tests.components.grid.basicfeatures.client; import static org.junit.Assert.assertTrue; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; public class GridClientContextMenuEventTest extends GridBasicClientFeaturesTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // PhantomJS doesn't support context click.. - return getBrowsersExcludingPhantomJS(); - } - @Test public void testContextMenuEventIsHandledCorrectly() { setDebug(true); diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java index 2fc0cce68f..0ddf80e2e0 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java @@ -1,11 +1,9 @@ package com.vaadin.v7.tests.components.grid.basicfeatures.server; import java.io.IOException; -import java.util.List; import org.junit.Test; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; import com.vaadin.v7.tests.components.grid.basicfeatures.GridSidebarFeatures; @@ -60,10 +58,4 @@ public class GridSidebarThemeTest extends GridBasicFeaturesTest { compareScreen(theme + "-SidebarClosed2"); } - - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // phantom JS looks wrong from the beginning, so not tested - return getBrowsersExcludingPhantomJS(); - } } diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeContextMenuAndIconsTest.java index be69425560..391b953f75 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeContextMenuAndIconsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeContextMenuAndIconsTest.java @@ -2,13 +2,10 @@ package com.vaadin.v7.tests.components.tree; import static org.junit.Assert.assertEquals; -import java.util.List; - import org.junit.Test; import org.openqa.selenium.Dimension; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.By; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -20,11 +17,6 @@ public class TreeContextMenuAndIconsTest extends MultiBrowserTest { return Trees.class; } - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - return getBrowsersSupportingContextMenu(); - } - @Test public void testSimpleContextMenu() throws Exception { openTestURL(); diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/upload/TestFileUploadTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/upload/TestFileUploadTest.java index 2a655e02a6..e1d4058904 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/upload/TestFileUploadTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/upload/TestFileUploadTest.java @@ -9,13 +9,11 @@ import java.io.IOException; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.List; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.internal.WrapsElement; -import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.LocalFileDetector; import org.openqa.selenium.remote.RemoteWebElement; @@ -24,12 +22,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class TestFileUploadTest extends MultiBrowserTest { - @Override - public List<DesiredCapabilities> getBrowsersToTest() { - // PhantomJS fails to upload files for unknown reasons - return getBrowsersExcludingPhantomJS(); - } - @Test public void testUploadAnyFile() throws Exception { openTestURL(); |