New Test

From 1e7b64901e014f6d3336045616df9dba1df97c25 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 6 Aug 2014 15:30:05 +0300 Subject: SingleBrowserTest for testing browser-unrelated functionality Change-Id: Ife2ce000cae1386334596a99592263bd489a5204 --- .../com/vaadin/tests/VerifyAssertionsEnabled.html | 26 ------------------ .../com/vaadin/tests/VerifyAssertionsEnabled.java | 9 +++---- .../vaadin/tests/VerifyAssertionsEnabledTest.java | 14 ++++++++++ .../src/com/vaadin/tests/VerifyJreVersionTest.java | 4 +-- .../com/vaadin/tests/tb3/SingleBrowserTest.java | 31 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 33 deletions(-) delete mode 100644 uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.html create mode 100644 uitest/src/com/vaadin/tests/VerifyAssertionsEnabledTest.java create mode 100644 uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java (limited to 'uitest') 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 @@ - - - - - - -New Test - - - - - - - - - - - - - - - - -

New Test
open	/run/com.vaadin.tests.VerifyAssertionsEnabled?restartApplication
assertText	vaadin=runcomvaadintestsVerifyAssertionsEnabled::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]	Assertions are enabled

- - 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 getBrowsersToTest() { + return Collections.unmodifiableList(Collections + .singletonList(MultiBrowserTest.Browser.PHANTOMJS + .getDesiredCapabilities())); + } + +} -- cgit v1.2.3