diff options
| author | Artur Signell <artur@vaadin.com> | 2014-08-06 15:30:05 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-08-11 19:21:41 +0000 |
| commit | 1e7b64901e014f6d3336045616df9dba1df97c25 (patch) | |
| tree | 34c49f6477a2fd10feb5f4be841cb7ce863a77f3 /uitest | |
| parent | 5ffd6f3da371d0d8d8054bb9ccf6f65f6fd3d2cb (diff) | |
| download | vaadin-framework-1e7b64901e014f6d3336045616df9dba1df97c25.tar.gz vaadin-framework-1e7b64901e014f6d3336045616df9dba1df97c25.zip | |
SingleBrowserTest for testing browser-unrelated functionality
Change-Id: Ife2ce000cae1386334596a99592263bd489a5204
Diffstat (limited to 'uitest')
5 files changed, 51 insertions, 33 deletions
diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.html b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.html deleted file mode 100644 index 40ac075d53..0000000000 --- a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.html +++ /dev/null @@ -1,26 +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>New Test</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">New Test</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/run/com.vaadin.tests.VerifyAssertionsEnabled?restartApplication</td> - <td></td> -</tr> -<tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestsVerifyAssertionsEnabled::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]</td> - <td>Assertions are enabled</td> -</tr> -</tbody></table> -</body> -</html> diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java index 84ea3a0def..aa757e5f24 100644 --- a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java +++ b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java @@ -17,18 +17,17 @@ package com.vaadin.tests; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.Label; +import com.vaadin.tests.components.AbstractTestUIWithLog; -public class VerifyAssertionsEnabled extends AbstractTestUI { +public class VerifyAssertionsEnabled extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { try { assert false; - addComponent(new Label("Assertions are not enabled")); + log("Assertions are not enabled"); } catch (AssertionError e) { - addComponent(new Label("Assertions are enabled")); + log("Assertions are enabled"); } } diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabledTest.java b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabledTest.java new file mode 100644 index 0000000000..1180cc8332 --- /dev/null +++ b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabledTest.java @@ -0,0 +1,14 @@ +package com.vaadin.tests; + +import org.junit.Assert; +import org.junit.Test; + +import com.vaadin.tests.tb3.SingleBrowserTest; + +public class VerifyAssertionsEnabledTest extends SingleBrowserTest { + @Test + public void verifyServerAssertions() throws Exception { + openTestURL(); + Assert.assertEquals("1. Assertions are enabled", getLogRow(0)); + } +} diff --git a/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java b/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java index 0203423787..b78a4ad314 100644 --- a/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java +++ b/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java @@ -21,9 +21,9 @@ import static org.hamcrest.core.Is.is; import org.junit.Test; import org.openqa.selenium.WebElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import com.vaadin.tests.tb3.SingleBrowserTest; -public class VerifyJreVersionTest extends MultiBrowserTest { +public class VerifyJreVersionTest extends SingleBrowserTest { @Test public void verifyJreVersion() { diff --git a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java new file mode 100644 index 0000000000..f5dc337138 --- /dev/null +++ b/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java @@ -0,0 +1,31 @@ +/* + * 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.tb3; + +import java.util.Collections; +import java.util.List; + +import org.openqa.selenium.remote.DesiredCapabilities; + +public abstract class SingleBrowserTest extends PrivateTB3Configuration { + @Override + public List<DesiredCapabilities> getBrowsersToTest() { + return Collections.unmodifiableList(Collections + .singletonList(MultiBrowserTest.Browser.PHANTOMJS + .getDesiredCapabilities())); + } + +} |