{
expectedUserAgent
- .put(BrowserUtil
- .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION),
+ .put(Browser.FIREFOX.getDesiredCapabilities(),
"Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0");
expectedUserAgent
- .put(BrowserUtil.ie(8),
+ .put(Browser.IE8.getDesiredCapabilities(),
"Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)");
expectedUserAgent
- .put(BrowserUtil.ie(9),
+ .put(Browser.IE9.getDesiredCapabilities(),
"Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)");
expectedUserAgent
- .put(BrowserUtil.ie(10),
+ .put(Browser.IE10.getDesiredCapabilities(),
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)");
expectedUserAgent
- .put(BrowserUtil.ie(11),
+ .put(Browser.IE11.getDesiredCapabilities(),
"Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
expectedUserAgent
- .put(BrowserUtil.chrome(MultiBrowserTest.TESTED_CHROME_VERSION),
+ .put(Browser.CHROME.getDesiredCapabilities(),
"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36");
}
public List<DesiredCapabilities> getBrowsersToTest() {
List<DesiredCapabilities> browsers = super.getBrowsersToTest();
// sendKeys does nothing on these browsers
- browsers.remove(BrowserUtil.firefox(24));
- browsers.remove(BrowserUtil.ie(8));
- browsers.remove(BrowserUtil.opera(12));
+ browsers.remove(Browser.FIREFOX.getDesiredCapabilities());
+ browsers.remove(Browser.IE8.getDesiredCapabilities());
+ browsers.remove(Browser.OPERA.getDesiredCapabilities());
// Causes 'cannot focus element'
- browsers.remove(BrowserUtil.chrome(29));
+ browsers.remove(Browser.CHROME.getDesiredCapabilities());
return browsers;
}
import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.Keys;
-import org.openqa.selenium.Platform;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.remote.DesiredCapabilities;
*/
@Override
public List<DesiredCapabilities> getBrowsersToTest() {
- DesiredCapabilities chrome = DesiredCapabilities.chrome();
- chrome.setPlatform(Platform.WINDOWS);
- return Collections.singletonList(chrome);
+ return Collections.singletonList(Browser.CHROME
+ .getDesiredCapabilities());
}
@Test
return NativeSelects.class;
}
- // Uncomment this to debug test in local/portforwarded chromedriver
- // @Override
- // protected void setupLocalDriver() {
- // WebDriver chromeDriver;
- // try {
- // chromeDriver = new RemoteWebDriver(
- // new URL("http://localhost:9515"), getBrowsersToTest()
- // .iterator().next());
- // setDriver(chromeDriver);
- // } catch (MalformedURLException e) {
- // e.printStackTrace();
- // }
- // }
- //
- // /*
- // * (non-Javadoc)
- // *
- // * @see com.vaadin.tests.tb3.AbstractTB3Test#runLocally()
- // */
- // @Override
- // public boolean runLocally() {
- // return false;
- // }
-
/**
* @since
* @param string
import org.junit.runners.Parameterized.Parameters;
import org.openqa.selenium.remote.DesiredCapabilities;
-import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.MultiBrowserTest.Browser;
import com.vaadin.tests.tb3.PrivateTB3Configuration;
/**
@Parameters
public static Collection<DesiredCapabilities> getBrowsersForTest() {
- return Collections.singleton(BrowserUtil
- .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
+ return Collections.singleton(Browser.FIREFOX.getDesiredCapabilities());
}
}
package com.vaadin.tests.tb3;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
import java.net.URL;
import java.util.Collections;
import java.util.List;
import com.vaadin.testbench.TestBench;
import com.vaadin.testbench.TestBenchTestCase;
import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.tb3.MultiBrowserTest.Browser;
import com.vaadin.ui.UI;
/**
private boolean push = false;
{
// Default browser to run on unless setDesiredCapabilities is called
- desiredCapabilities = BrowserUtil
- .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION);
+ desiredCapabilities = Browser.FIREFOX.getDesiredCapabilities();
}
/**
* If something goes wrong
*/
protected void setupDriver() throws Exception {
- if (runLocally()) {
- setupLocalDriver();
+ RunLocally runLocally = getClass().getAnnotation(RunLocally.class);
+ if (runLocally != null) {
+ setupLocalDriver(runLocally.value().getDesiredCapabilities());
return;
}
DesiredCapabilities capabilities = getDesiredCapabilities();
}
- /**
- * Override and return true to run the test locally. This method is only to
- * be used for developing tests.
- *
- * @return true to run the test on a local browser, false to use the hub
- */
- public boolean runLocally() {
- return false;
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target(ElementType.TYPE)
+ public @interface RunLocally {
+ public Browser value() default Browser.FIREFOX;
}
/**
* for debug purposes. Used only when {@link #runLocally()} is overridden to
* return true;
*/
- protected abstract void setupLocalDriver();
+ protected abstract void setupLocalDriver(
+ DesiredCapabilities desiredCapabilities);
/**
* Opens the given test (defined by {@link #getTestUrl()}, optionally with
* @return The browsers to run the test on
*/
public List<DesiredCapabilities> getBrowsersToTest() {
- return Collections.singletonList(BrowserUtil
- .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
-
+ return Collections.singletonList(Browser.FIREFOX
+ .getDesiredCapabilities());
}
/**
* @return true if the capabilities refer to IE8, false otherwise
*/
public static boolean isIE8(DesiredCapabilities capabilities) {
- return BrowserType.IE.equals(capabilities.getBrowserName())
- && "8".equals(capabilities.getVersion());
+ return isIE(capabilities) && "8".equals(capabilities.getVersion());
+ }
+
+ /**
+ * @param capabilities
+ * The capabilities to check
+ * @return true if the capabilities refer to Internet Explorer, false
+ * otherwise
+ */
+ public static boolean isIE(DesiredCapabilities capabilities) {
+ return BrowserType.IE.equals(capabilities.getBrowserName());
+ }
+
+ /**
+ * @param capabilities
+ * The capabilities to check
+ * @return true if the capabilities refer to Chrome, false otherwise
+ */
+ public static boolean isChrome(DesiredCapabilities capabilities) {
+ return BrowserType.CHROME.equals(capabilities.getBrowserName());
+ }
+
+ /**
+ * @param capabilities
+ * The capabilities to check
+ * @return true if the capabilities refer to Opera, false otherwise
+ */
+ public static boolean isOpera(DesiredCapabilities capabilities) {
+ return BrowserType.OPERA.equals(capabilities.getBrowserName());
+ }
+
+ /**
+ * @param capabilities
+ * The capabilities to check
+ * @return true if the capabilities refer to Safari, false otherwise
+ */
+ public static boolean isSafari(DesiredCapabilities capabilities) {
+ return BrowserType.SAFARI.equals(capabilities.getBrowserName());
+ }
+
+ /**
+ * @param capabilities
+ * The capabilities to check
+ * @return true if the capabilities refer to Firefox, false otherwise
+ */
+ public static boolean isFirefox(DesiredCapabilities capabilities) {
+ return BrowserType.FIREFOX.equals(capabilities.getBrowserName());
}
/**
*/
public static String getBrowserIdentifier(
DesiredCapabilities capabilities) {
- String browserName = capabilities.getBrowserName();
-
- if (BrowserType.IE.equals(browserName)) {
+ if (isIE(capabilities)) {
return "InternetExplorer";
- } else if (BrowserType.FIREFOX.equals(browserName)) {
+ } else if (isFirefox(capabilities)) {
return "Firefox";
- } else if (BrowserType.CHROME.equals(browserName)) {
+ } else if (isChrome(capabilities)) {
return "Chrome";
- } else if (BrowserType.SAFARI.equals(browserName)) {
+ } else if (isSafari(capabilities)) {
return "Safari";
- } else if (BrowserType.OPERA.equals(browserName)) {
+ } else if (isOpera(capabilities)) {
return "Opera";
}
- return browserName;
+ return capabilities.getBrowserName();
}
/**
*/
public abstract class MultiBrowserTest extends PrivateTB3Configuration {
- public static final int TESTED_SAFARI_VERSION = 7;
- public static final int TESTED_CHROME_VERSION = 29;
- public static final int TESTED_FIREFOX_VERSION = 24;
+ public enum Browser {
+ FIREFOX(BrowserUtil.firefox(24)), CHROME(BrowserUtil.chrome(29)), SAFARI(
+ BrowserUtil.safari(7)), IE8(BrowserUtil.ie(8)), IE9(BrowserUtil
+ .ie(9)), IE10(BrowserUtil.ie(10)), IE11(BrowserUtil.ie(11)), OPERA(
+ BrowserUtil.opera(17));
+ private DesiredCapabilities desiredCapabilities;
+
+ private Browser(DesiredCapabilities desiredCapabilities) {
+ this.desiredCapabilities = desiredCapabilities;
+ }
+
+ public DesiredCapabilities getDesiredCapabilities() {
+ return desiredCapabilities;
+ }
+ }
static List<DesiredCapabilities> allBrowsers = new ArrayList<DesiredCapabilities>();
static {
- allBrowsers.add(BrowserUtil.ie(8));
- allBrowsers.add(BrowserUtil.ie(9));
- allBrowsers.add(BrowserUtil.ie(10));
- allBrowsers.add(BrowserUtil.ie(11));
- allBrowsers.add(BrowserUtil.firefox(TESTED_FIREFOX_VERSION));
+ allBrowsers.add(Browser.IE8.getDesiredCapabilities());
+ allBrowsers.add(Browser.IE9.getDesiredCapabilities());
+ allBrowsers.add(Browser.IE10.getDesiredCapabilities());
+ allBrowsers.add(Browser.IE11.getDesiredCapabilities());
+ allBrowsers.add(Browser.FIREFOX.getDesiredCapabilities());
// Uncomment once we have the capability to run on Safari 6
- // allBrowsers.add(BrowserUtil.safari(TESTED_SAFARI_VERSION));
- allBrowsers.add(BrowserUtil.chrome(TESTED_CHROME_VERSION));
+ // allBrowsers.add(SAFARI);
+ allBrowsers.add(Browser.CHROME.getDesiredCapabilities());
// Re-enable this when it is possible to run on a modern Opera version
- // (15+)
- // allBrowsers.add(BrowserUtil.opera(15));
+ // allBrowsers.add(Browser.OPERA.getDesiredCapabilities());
}
/**
import java.util.Properties;
import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxBinary;
import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.safari.SafariDriver;
import com.vaadin.testbench.TestBench;
@Override
protected String getDeploymentHostname() {
- if (runLocally()) {
+ if (getClass().getAnnotation(RunLocally.class) != null) {
return "localhost";
}
String hostName = getProperty(HOSTNAME_PROPERTY);
* @see com.vaadin.tests.tb3.AbstractTB3Test#setupLocalDriver()
*/
@Override
- protected void setupLocalDriver() {
- String firefoxPath = getProperty("firefox.path");
+ protected void setupLocalDriver(DesiredCapabilities desiredCapabilities) {
WebDriver driver;
- if (firefoxPath != null) {
- driver = new FirefoxDriver(
- new FirefoxBinary(new File(firefoxPath)), null);
+ if (BrowserUtil.isFirefox(desiredCapabilities)) {
+ String firefoxPath = getProperty("firefox.path");
+ if (firefoxPath != null) {
+ driver = new FirefoxDriver(new FirefoxBinary(new File(
+ firefoxPath)), null);
+ } else {
+ driver = new FirefoxDriver();
+ }
+ } else if (BrowserUtil.isChrome(desiredCapabilities)) {
+ System.setProperty("webdriver.chrome.driver",
+ getProperty("chrome.driver.path"));
+ driver = new ChromeDriver();
+ } else if (BrowserUtil.isSafari(desiredCapabilities)) {
+ driver = new SafariDriver();
} else {
- driver = new FirefoxDriver();
+ throw new RuntimeException(
+ "Not implemented support for running locally on "
+ + BrowserUtil
+ .getBrowserIdentifier(desiredCapabilities));
}
setDriver(TestBench.createDriver(driver));
- setDesiredCapabilities(BrowserUtil
- .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
+ setDesiredCapabilities(desiredCapabilities);
}
}
import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.tests.tb3.AbstractTB3Test.BrowserUtil;
+import com.vaadin.tests.tb3.AbstractTB3Test.RunLocally;
/**
* This runner is loosely based on FactoryTestRunner by Ted Young
.getOnlyConstructor().newInstance();
Collection<DesiredCapabilities> desiredCapabilites = testClassInstance
.getBrowsersToTest();
- if (testClassInstance.runLocally()) {
+ if (testClassInstance.getClass().getAnnotation(RunLocally.class) != null) {
desiredCapabilites = new ArrayList<DesiredCapabilities>();
- desiredCapabilites.add(BrowserUtil
- .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
+ desiredCapabilites.add(testClassInstance.getClass()
+ .getAnnotation(RunLocally.class).value()
+ .getDesiredCapabilities());
}
for (DesiredCapabilities capabilities : desiredCapabilites) {
import org.openqa.selenium.remote.DesiredCapabilities;
+import com.vaadin.tests.tb3.MultiBrowserTest.Browser;
+
/**
* A {@link MultiBrowserTest} which restricts the tests to the browsers which
* support websocket
private static List<DesiredCapabilities> websocketBrowsers = new ArrayList<DesiredCapabilities>();
static {
websocketBrowsers.addAll(MultiBrowserTest.getAllBrowsers());
- websocketBrowsers.remove(BrowserUtil.ie(8));
- websocketBrowsers.remove(BrowserUtil.ie(9));
+ websocketBrowsers.remove(Browser.IE8.getDesiredCapabilities());
+ websocketBrowsers.remove(Browser.IE9.getDesiredCapabilities());
}
/**
projects / vaadin-framework.git / commitdiff