@@ -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 { |
@@ -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)); | |||
} | |||
@@ -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(); |
@@ -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(); |
@@ -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(); |
@@ -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(); |
@@ -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")); |
@@ -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(); |
@@ -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(); |
@@ -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 |
@@ -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"); |
@@ -1,25 +1,18 @@ | |||
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(); |
@@ -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(); |
@@ -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; | |||
@@ -21,11 +18,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(); |
@@ -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(); |
@@ -3,26 +3,16 @@ 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; | |||
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; |
@@ -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 |
@@ -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(); | |||
@@ -53,13 +45,6 @@ public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest { | |||
assertEquals("1. Ctrl-Enter button pressed", getLogRow(0)); | |||
} | |||
@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; |
@@ -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(); |
@@ -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(); |
@@ -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 { |
@@ -3,11 +3,8 @@ package com.vaadin.tests.components.window; | |||
import static com.vaadin.tests.components.window.ComboboxScrollableWindow.COMBOBOX_ID; | |||
import static com.vaadin.tests.components.window.ComboboxScrollableWindow.WINDOW_ID; | |||
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.commands.TestBenchElementCommands; | |||
@@ -22,12 +19,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; | |||
*/ | |||
public class ComboboxScrollableWindowTest extends MultiBrowserTest { | |||
@Override | |||
public List<DesiredCapabilities> getBrowsersToTest() { | |||
// Fix to #10652 broke this for PhantomJS | |||
return getBrowsersExcludingPhantomJS(); | |||
} | |||
@Test | |||
public void testWindowScrollbars() throws Exception { | |||
openTestURL(); |
@@ -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(); |
@@ -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(); |
@@ -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(); |
@@ -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(); | |||
} | |||
} |
@@ -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(); | |||
} | |||
} |
@@ -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(); | |||
} | |||
} |
@@ -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(); | |||
} | |||
} |
@@ -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"); |
@@ -1,20 +1,7 @@ | |||
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; |
@@ -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; |
@@ -1,16 +1,7 @@ | |||
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; |
@@ -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(); | |||
} | |||
} |
@@ -1,17 +1,8 @@ | |||
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"; |
@@ -1,24 +1,15 @@ | |||
package com.vaadin.tests.resources; | |||
import java.util.List; | |||
import static org.junit.Assert.assertEquals; | |||
import org.junit.Test; | |||
import org.openqa.selenium.By; | |||
import org.openqa.selenium.remote.DesiredCapabilities; | |||
import com.vaadin.testbench.parallel.Browser; | |||
import com.vaadin.testbench.parallel.BrowserUtil; | |||
import com.vaadin.tests.tb3.MultiBrowserTest; | |||
public class FrontendInitialResourceUITest extends MultiBrowserTest { | |||
@Override | |||
protected List<DesiredCapabilities> getBrowserCapabilities(Browser... browsers) { | |||
return getBrowsersExcludingPhantomJS(); | |||
} | |||
@Test | |||
public void correctEs5Es6FileImportedThroughFrontend() { | |||
openTestURL(); |
@@ -1,25 +1,15 @@ | |||
package com.vaadin.tests.resources; | |||
import java.util.List; | |||
import static org.junit.Assert.assertEquals; | |||
import org.junit.Test; | |||
import org.openqa.selenium.By; | |||
import org.openqa.selenium.remote.DesiredCapabilities; | |||
import com.vaadin.testbench.elements.ButtonElement; | |||
import com.vaadin.testbench.parallel.Browser; | |||
import com.vaadin.testbench.parallel.BrowserUtil; | |||
import com.vaadin.tests.tb3.MultiBrowserTest; | |||
public class FrontendLaterLoadedResourceUITest extends MultiBrowserTest { | |||
@Override | |||
protected List<DesiredCapabilities> getBrowserCapabilities(Browser... browsers) { | |||
return getBrowsersExcludingPhantomJS(); | |||
} | |||
@Test | |||
public void correctEs5Es6FileImportedThroughFrontend() { | |||
openTestURL(); |
@@ -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 |
@@ -25,7 +25,6 @@ import org.apache.http.HttpResponse; | |||
import org.apache.http.impl.client.DefaultHttpClient; | |||
import org.apache.http.message.BasicHttpEntityEnclosingRequest; | |||
import org.junit.Rule; | |||
import org.junit.rules.ExternalResource; | |||
import org.junit.rules.TestName; | |||
import org.junit.runner.Description; | |||
import org.junit.runner.RunWith; | |||
@@ -115,15 +114,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; |
@@ -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; | |||
@@ -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( |
@@ -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; | |||
} | |||
} |
@@ -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; | |||
} | |||
} |
@@ -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(); | |||
} | |||
} |
@@ -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 |
@@ -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(); |
@@ -77,9 +77,8 @@ public class ImmediateUploadTest extends MultiBrowserTest { | |||
} | |||
@Test | |||
public void testAcceptAttribute() | |||
{ | |||
public void testAcceptAttribute() { | |||
WebElement input = getUploadFileInput("immediateupload"); | |||
assertThat(input.getAttribute("accept"),is(TEST_MIME_TYPE)); | |||
assertThat(input.getAttribute("accept"), is(TEST_MIME_TYPE)); | |||
} | |||
} |
@@ -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; | |||
} | |||
} |
@@ -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() { |
@@ -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(); |
@@ -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); |
@@ -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(); | |||
} | |||
} |
@@ -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(); |
@@ -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(); |