diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-14 15:31:17 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-07-15 06:05:22 +0000 |
| commit | a1978dfa16dbb35ee7ac7ab9026af27624158be7 (patch) | |
| tree | 952ed62e6c193be2b732381bdca50ebeefe4e781 /uitest | |
| parent | a33772e3f5932cf913ac2c67ce0bcda991dd8fc2 (diff) | |
| download | vaadin-framework-a1978dfa16dbb35ee7ac7ab9026af27624158be7.tar.gz vaadin-framework-a1978dfa16dbb35ee7ac7ab9026af27624158be7.zip | |
Convert EmbeddedWithNullSource test to TB4
Change-Id: I495e3b25282aaf7a3122b8503f08bb339a772560
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java | 46 | ||||
| -rw-r--r-- | uitest/tb2/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html | 27 |
2 files changed, 46 insertions, 27 deletions
diff --git a/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java b/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java new file mode 100644 index 0000000000..649ee42986 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java @@ -0,0 +1,46 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.abstractembedded; + +import java.io.IOException; +import java.util.List; + +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.remote.DesiredCapabilities; + +import com.vaadin.testbench.parallel.Browser; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class EmbeddedWithNullSourceTest extends MultiBrowserTest { + + @Override + public List<DesiredCapabilities> getBrowsersToTest() { + // No Flash on PhantomJS, IE 11 has a timeout issue, looks like a + // IEDriver problem, not reproduced running locally. + return getBrowserCapabilities(Browser.IE8, Browser.IE9, Browser.IE10, + Browser.CHROME, Browser.FIREFOX); + } + + @Test + public void testEmbeddedWithNullSource() throws IOException { + openTestURL(); + + waitForElementPresent(By.className("v-image")); + + compareScreen("nullSources"); + } +} diff --git a/uitest/tb2/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html b/uitest/tb2/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html deleted file mode 100644 index 37186bd901..0000000000 --- a/uitest/tb2/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>EmbeddedWithNullSource</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">EmbeddedWithNullSource</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/run/EmbeddedWithNullSource?restartApplication</td> - <td></td> -</tr> -<tr> - <td>screenCapture</td> - <td></td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> |