diff options
| author | Artur Signell <artur@vaadin.com> | 2013-09-23 19:57:08 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-09-24 10:46:33 +0000 |
| commit | a7583c616e3365d698da99ef1cd66de34e2954b2 (patch) | |
| tree | 37d21449f368a34445ff82007950fcf77e0852d7 | |
| parent | 21af0c343180acf008b3a04b8997ff67292e9d9f (diff) | |
| download | vaadin-framework-a7583c616e3365d698da99ef1cd66de34e2954b2.tar.gz vaadin-framework-a7583c616e3365d698da99ef1cd66de34e2954b2.zip | |
TB3 test for browsers (#12572)
Change-Id: I1011aed7b3a7f4a339199be4e598b02b27500307
| -rw-r--r-- | uitest/src/com/vaadin/tests/VerifyBrowserVersion.java | 54 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java | 1 |
2 files changed, 51 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java index 022a343196..59663a78d6 100644 --- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java +++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java @@ -1,17 +1,65 @@ package com.vaadin.tests; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.remote.DesiredCapabilities; + import com.vaadin.server.WebBrowser; import com.vaadin.tests.components.TestBase; +import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.ui.Label; public class VerifyBrowserVersion extends TestBase { + public static class BrowserVersionTest extends MultiBrowserTest { + + private Map<DesiredCapabilities, String> expectedUserAgent = new HashMap<DesiredCapabilities, String>(); + + { + expectedUserAgent + .put(BrowserUtil.firefox(24), + "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0"); + expectedUserAgent + .put(BrowserUtil.ie(8), + "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), + "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)"); + expectedUserAgent + .put(BrowserUtil.ie(10), + "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)"); + expectedUserAgent + .put(BrowserUtil.chrome(29), + "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36"); + expectedUserAgent + .put(BrowserUtil.opera(12), + "Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.15"); + + } + + @Test + public void verifyUserAgent() { + Assert.assertEquals( + expectedUserAgent.get(getDesiredCapabilities()), + vaadinElementById("userAgent").getText()); + Assert.assertEquals("Touch device? No", + vaadinElementById("touchDevice").getText()); + } + } + @Override protected void setup() { WebBrowser browser = getBrowser(); - addComponent(new Label(browser.getBrowserApplication())); - addComponent(new Label("Touch device? " - + (browser.isTouchDevice() ? "YES" : "No"))); + Label userAgent = new Label(browser.getBrowserApplication()); + userAgent.setId("userAgent"); + addComponent(userAgent); + Label touchDevice = new Label("Touch device? " + + (browser.isTouchDevice() ? "YES" : "No")); + touchDevice.setId("touchDevice"); + addComponent(touchDevice); } @Override diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java index b3520e5326..63819e5f07 100644 --- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -16,7 +16,6 @@ package com.vaadin.tests.tb3; -import java.net.MalformedURLException; import java.net.URL; import org.junit.After; |