From f488825d46c984cea841534178b094be3a562eea Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 7 Oct 2013 18:12:06 +0300 Subject: Update TB3+ convention to use a separate *Test file For any issue there should be a UI class, e.g. LabelSomething and a Test class which has the name of the UI + Test, e.g. LabelSomethingTest. The LabelSomethingTest contains ALL tests which depend on LabelSomething and are named accordingly to what they test. For special and legacy cases also LegacyApplication and UIProvider are supported in addition to UI classes Change-Id: Ifc0180b377284bbd029202494ad194d324f8213b --- .../src/com/vaadin/tests/VerifyBrowserVersion.java | 48 ---- .../com/vaadin/tests/VerifyBrowserVersionTest.java | 66 ++++++ .../vaadin/tests/components/label/LabelModes.java | 10 - .../tests/components/label/LabelModesTest.java | 30 +++ ...orizontalLayoutFullsizeContentWithErrorMsg.java | 34 +-- ...ontalLayoutFullsizeContentWithErrorMsgTest.java | 49 ++++ .../components/panel/PanelChangeContentsTest.java | 53 +++++ .../tests/components/slider/SliderDisable.java | 19 -- .../tests/components/slider/SliderDisableTest.java | 36 +++ .../com/vaadin/tests/components/ui/UIAccess.java | 28 --- .../vaadin/tests/components/ui/UIAccessTest.java | 45 ++++ uitest/src/com/vaadin/tests/push/BarInUIDL.java | 28 --- .../src/com/vaadin/tests/push/BarInUIDLTest.java | 45 ++++ uitest/src/com/vaadin/tests/push/BasicPush.java | 75 ------- .../com/vaadin/tests/push/BasicPushStreaming.java | 3 - .../vaadin/tests/push/BasicPushStreamingTest.java | 19 ++ .../src/com/vaadin/tests/push/BasicPushTest.java | 92 ++++++++ .../com/vaadin/tests/push/BasicPushWebsocket.java | 12 - .../vaadin/tests/push/BasicPushWebsocketTest.java | 29 +++ .../com/vaadin/tests/push/PushConfiguration.java | 117 ++++++++++ .../vaadin/tests/push/PushConfigurationTest.java | 246 ++++++--------------- uitest/src/com/vaadin/tests/push/PushFromInit.java | 33 --- .../com/vaadin/tests/push/PushFromInitTest.java | 50 +++++ .../vaadin/tests/push/PushReattachedComponent.java | 63 ------ uitest/src/com/vaadin/tests/push/TogglePush.java | 95 -------- .../src/com/vaadin/tests/push/TogglePushTest.java | 112 ++++++++++ .../com/vaadin/tests/push/TrackMessageSizeUI.java | 152 +++++++++++++ .../vaadin/tests/push/TrackMessageSizeUITest.java | 30 +++ .../tests/push/TrackMessageSizeUnitTests.java | 164 -------------- .../src/com/vaadin/tests/tb3/AbstractTB3Test.java | 43 +++- 30 files changed, 1039 insertions(+), 787 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java create mode 100644 uitest/src/com/vaadin/tests/components/label/LabelModesTest.java create mode 100644 uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java create mode 100644 uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java create mode 100644 uitest/src/com/vaadin/tests/components/slider/SliderDisableTest.java create mode 100644 uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java create mode 100644 uitest/src/com/vaadin/tests/push/BarInUIDLTest.java create mode 100644 uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java create mode 100644 uitest/src/com/vaadin/tests/push/BasicPushTest.java create mode 100644 uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java create mode 100644 uitest/src/com/vaadin/tests/push/PushConfiguration.java create mode 100644 uitest/src/com/vaadin/tests/push/PushFromInitTest.java delete mode 100644 uitest/src/com/vaadin/tests/push/PushReattachedComponent.java create mode 100644 uitest/src/com/vaadin/tests/push/TogglePushTest.java create mode 100644 uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java create mode 100644 uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java delete mode 100644 uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java index 47c09bdfd7..1b21f08aa7 100644 --- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java +++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java @@ -1,59 +1,11 @@ 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 expectedUserAgent = new HashMap(); - - { - 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.ie(11), - "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko"); - 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() { - openTestURL(); - Assert.assertEquals( - expectedUserAgent.get(getDesiredCapabilities()), - vaadinElementById("userAgent").getText()); - Assert.assertEquals("Touch device? No", - vaadinElementById("touchDevice").getText()); - } - } - @Override protected void setup() { WebBrowser browser = getBrowser(); diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java new file mode 100644 index 0000000000..6704f55226 --- /dev/null +++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java @@ -0,0 +1,66 @@ +/* + * Copyright 2000-2013 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; + +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.tests.tb3.MultiBrowserTest; +import com.vaadin.tests.tb3.AbstractTB3Test.BrowserUtil; + +public class VerifyBrowserVersionTest extends MultiBrowserTest { + + private Map expectedUserAgent = new HashMap(); + + { + 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.ie(11), + "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko"); + 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() { + openTestURL(); + Assert.assertEquals( + expectedUserAgent.get(getDesiredCapabilities()), + vaadinElementById("userAgent").getText()); + Assert.assertEquals("Touch device? No", + vaadinElementById("touchDevice").getText()); + } +} \ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java index 9e51978743..e5bc539f36 100644 --- a/uitest/src/com/vaadin/tests/components/label/LabelModes.java +++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java @@ -2,20 +2,10 @@ package com.vaadin.tests.components.label; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.ComponentTestCase; -import com.vaadin.tests.tb3.SimpleMultiBrowserTest; import com.vaadin.ui.Label; public class LabelModes extends ComponentTestCase