]> source.dussan.org Git - vaadin-framework.git/commitdiff
Migrate TB2 test from application package to TB4
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Fri, 20 Feb 2015 09:57:22 +0000 (11:57 +0200)
committerVaadin Code Review <review@vaadin.com>
Thu, 12 Mar 2015 14:55:37 +0000 (14:55 +0000)
RefreshFragmentChangeTest
RefreshStatePreserveTest
RefreshStatePreserveTitleTest
TerminalErrorNotificationTest
ThreadLocalInstancesTest
WebBrowserSizeTest
WebBrowserTest

Change-Id: I5c95905b4999ebefc7b170057952b09780174627

19 files changed:
uitest/src/com/vaadin/tests/application/RefreshFragmentChangeTest.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java
uitest/src/com/vaadin/tests/application/RefreshStatePreserveTest.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitle.java
uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitleTest.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/application/TerminalErrorNotificationTest.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/application/ThreadLocalInstancesTest.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/application/WebBrowserSize.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.java
uitest/src/com/vaadin/tests/application/WebBrowserTest.java [deleted file]
uitest/src/com/vaadin/tests/application/WebBrowserTimeZone.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/application/WebBrowserTimeZoneTest.java [new file with mode: 0644]
uitest/tb2/com/vaadin/tests/application/RefreshFragmentChange.html [deleted file]
uitest/tb2/com/vaadin/tests/application/RefreshStatePreserve.html [deleted file]
uitest/tb2/com/vaadin/tests/application/RefreshStatePreserveTitle.html [deleted file]
uitest/tb2/com/vaadin/tests/application/TerminalErrorNotification.html [deleted file]
uitest/tb2/com/vaadin/tests/application/ThreadLocalInstances.html [deleted file]
uitest/tb2/com/vaadin/tests/application/WebBrowserSizeTest.html [deleted file]
uitest/tb2/com/vaadin/tests/application/WebBrowserTest.html [deleted file]

diff --git a/uitest/src/com/vaadin/tests/application/RefreshFragmentChangeTest.java b/uitest/src/com/vaadin/tests/application/RefreshFragmentChangeTest.java
new file mode 100644 (file)
index 0000000..ea415bc
--- /dev/null
@@ -0,0 +1,29 @@
+package com.vaadin.tests.application;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class RefreshFragmentChangeTest extends MultiBrowserTest {
+    @Override
+    protected Class<?> getUIClass() {
+        return com.vaadin.tests.application.RefreshStatePreserve.class;
+    }
+
+    @Test
+    public void testFragmentChange() throws Exception {
+        openTestURL();
+        assertLogText("1. Initial fragment: null");
+        getDriver().get(getTestUrl() + "#asdf");
+        assertLogText("2. Fragment changed to asdf");
+        openTestURL();
+        assertLogText("3. Fragment changed to null");
+    }
+
+    private void assertLogText(String expected) {
+        waitForElementPresent(By.className("v-label"));
+        Assert.assertEquals("Incorrect log text,", expected, getLogRow(0));
+    }
+}
index e66e8b97525dcb40bc8f0ba244a766d18148ddec..e7f81167d9410960f7fa115df921dfbcb4735488 100644 (file)
@@ -4,28 +4,24 @@ import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.server.Page.UriFragmentChangedEvent;
 import com.vaadin.server.Page.UriFragmentChangedListener;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.util.Log;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Label;
 
 @PreserveOnRefresh
-public class RefreshStatePreserve extends AbstractTestUI {
-
-    private Log log = new Log(5);
+public class RefreshStatePreserve extends AbstractTestUIWithLog {
 
     @Override
     protected void setup(VaadinRequest request) {
         // Internal parameter sent by vaadinBootstrap.js,
         addComponent(new Label("window.name: " + request.getParameter("v-wn")));
         addComponent(new Label("UI id: " + getUIId()));
-        addComponent(log);
 
-        log.log("Initial fragment: " + getPage().getUriFragment());
+        log("Initial fragment: " + getPage().getUriFragment());
         getPage().addUriFragmentChangedListener(
                 new UriFragmentChangedListener() {
                     @Override
                     public void uriFragmentChanged(UriFragmentChangedEvent event) {
-                        log.log("Fragment changed to " + event.getUriFragment());
+                        log("Fragment changed to " + event.getUriFragment());
                     }
                 });
     }
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTest.java b/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTest.java
new file mode 100644 (file)
index 0000000..a54d8b4
--- /dev/null
@@ -0,0 +1,29 @@
+package com.vaadin.tests.application;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class RefreshStatePreserveTest extends MultiBrowserTest {
+    private static String UI_ID_TEXT = "UI id: 0";
+
+    @Test
+    public void testPreserveState() throws Exception {
+        openTestURL();
+        assertCorrectState();
+        // URL needs to be different or some browsers don't count it as history
+        openTestURL("debug");
+        assertCorrectState();
+        executeScript("history.back()");
+        assertCorrectState();
+    }
+
+    private void assertCorrectState() {
+        waitForElementPresent(By.className("v-label"));
+        LabelElement uiIdLabel = $(LabelElement.class).get(7);
+        Assert.assertEquals("Incorrect UI id,", UI_ID_TEXT, uiIdLabel.getText());
+    }
+}
index 524091aff6f8e29c2f0120d978158a9dfa9c3559..ff9c84a20aa01fb463ee8c66a44c52018123dcb8 100644 (file)
@@ -3,14 +3,11 @@ package com.vaadin.tests.application;
 import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Label;
 
 @PreserveOnRefresh
 public class RefreshStatePreserveTitle extends AbstractTestUI {
 
-    private Log log = new Log(5);
-
     @Override
     protected void setup(VaadinRequest request) {
         getPage().setTitle("TEST");
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitleTest.java b/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitleTest.java
new file mode 100644 (file)
index 0000000..e2740f9
--- /dev/null
@@ -0,0 +1,20 @@
+package com.vaadin.tests.application;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class RefreshStatePreserveTitleTest extends MultiBrowserTest {
+    @Test
+    public void testReloadingPageDoesNotResetTitle() throws Exception {
+        openTestURL();
+        assertTitleText();
+        openTestURL();
+        assertTitleText();
+    }
+
+    private void assertTitleText() {
+        Assert.assertEquals("Incorrect page title,", "TEST", driver.getTitle());
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/application/TerminalErrorNotificationTest.java b/uitest/src/com/vaadin/tests/application/TerminalErrorNotificationTest.java
new file mode 100644 (file)
index 0000000..ac7d55b
--- /dev/null
@@ -0,0 +1,20 @@
+package com.vaadin.tests.application;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
+
+public class TerminalErrorNotificationTest extends MultiBrowserTest {
+    @Test
+    public void tb2test() throws Exception {
+        openTestURL();
+        $(ButtonElement.class).first().click();
+        Assert.assertTrue(isElementPresent(NotificationElement.class));
+        Assert.assertEquals("Got an exception: You asked for it",
+                $(FixedNotificationElement.class).first().getCaption());
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstancesTest.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstancesTest.java
new file mode 100644 (file)
index 0000000..9498413
--- /dev/null
@@ -0,0 +1,35 @@
+package com.vaadin.tests.application;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class ThreadLocalInstancesTest extends MultiBrowserTest {
+    @Test
+    public void tb2test() throws Exception {
+        openTestURL();
+        $(ButtonElement.class).first().click();
+        assertLogText("1. some app in class init", 15);
+        assertLogText("2. null root in class init", 14);
+        assertLogText("3. some app in app constructor", 13);
+        assertLogText("4. null root in app constructor", 12);
+        assertLogText("5. some app in app init", 11);
+        assertLogText("6. null root in app init", 10);
+        assertLogText("7. some app in root init", 9);
+        assertLogText("8. this root in root init", 8);
+        assertLogText("9. some app in root paint", 7);
+        assertLogText("10. this root in root paint", 6);
+        assertLogText("11. some app in background thread", 5);
+        assertLogText("12. this root in background thread", 4);
+        assertLogText("13. some app in resource handler", 3);
+        assertLogText("14. this root in resource handler", 2);
+        assertLogText("15. some app in button listener", 1);
+        assertLogText("16. this root in button listener", 0);
+    }
+
+    private void assertLogText(String expected, int index) {
+        Assert.assertEquals("Incorrect log text,", expected, getLogRow(index));
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserSize.java b/uitest/src/com/vaadin/tests/application/WebBrowserSize.java
new file mode 100644 (file)
index 0000000..0ce8e95
--- /dev/null
@@ -0,0 +1,47 @@
+package com.vaadin.tests.application;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Label;
+
+public class WebBrowserSize extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        final Label screenSizeLabel = new Label("n/a");
+        screenSizeLabel.setCaption("Screen size");
+
+        final Label browserSizeLabel = new Label("n/a");
+        browserSizeLabel.setCaption("Client (browser window) size");
+
+        final Button update = new Button("Refresh", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x "
+                        + getBrowser().getScreenHeight());
+                browserSizeLabel.setValue(getPage().getBrowserWindowWidth()
+                        + " x " + getPage().getBrowserWindowHeight());
+            }
+        });
+
+        addComponent(update);
+        addComponent(screenSizeLabel);
+        addComponent(browserSizeLabel);
+
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Verifies that browser sizes are reported correctly. Note that client width differs depending on browser decorations.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 5655;
+    }
+
+}
index 817acf20b5a564a2ca208c0ee2885bcd5c80f260..b06d8e438815bd6ba8b77fa794b9406006992553 100644 (file)
@@ -1,48 +1,20 @@
 package com.vaadin.tests.application;
 
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Label;
-
-public class WebBrowserSizeTest extends TestBase {
-
-    @Override
-    protected void setup() {
-
-        final Label screenSizeLabel = new Label("n/a");
-        screenSizeLabel.setCaption("Screen size");
-
-        final Label browserSizeLabel = new Label("n/a");
-        browserSizeLabel.setCaption("Client (browser window) size");
-
-        final Button update = new Button("Refresh", new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x "
-                        + getBrowser().getScreenHeight());
-                browserSizeLabel.setValue(getMainWindow()
-                        .getBrowserWindowWidth()
-                        + " x "
-                        + getMainWindow().getBrowserWindowHeight());
-            }
-        });
-
-        addComponent(update);
-        addComponent(screenSizeLabel);
-        addComponent(browserSizeLabel);
-
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Verifies that browser sizes are reported correctly. Note that client width differs depending on browser decorations.";
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class WebBrowserSizeTest extends MultiBrowserTest {
+    @Test
+    public void testBrowserSize() {
+        openTestURL();
+        $(ButtonElement.class).first().click();
+        // Thanks to selenium the browser size should always be 1500 x 850
+        assertEquals("Browser size is not correct.", "1500 x 850",
+                $(LabelElement.class).get(2).getText());
     }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 5655;
-    }
-
 }
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserTest.java b/uitest/src/com/vaadin/tests/application/WebBrowserTest.java
deleted file mode 100644 (file)
index 004c8f1..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.vaadin.tests.application;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.TimeZone;
-
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Label;
-
-public class WebBrowserTest extends TestBase {
-
-    @Override
-    protected void setup() {
-
-        final Label offsetLabel = new Label("n/a");
-        offsetLabel.setCaption("Browser offset");
-
-        final Label rawOffsetLabel = new Label("n/a");
-        rawOffsetLabel.setCaption("Browser raw offset");
-
-        final Label dstDiffLabel = new Label("n/a");
-        dstDiffLabel.setCaption("Difference between raw offset and DST");
-
-        final Label dstInEffectLabel = new Label("n/a");
-        dstInEffectLabel.setCaption("Is DST currently active?");
-
-        final Label curDateLabel = new Label("n/a");
-        curDateLabel.setCaption("Current date in the browser");
-
-        final Label diffLabel = new Label("n/a");
-        diffLabel.setCaption("Browser to Europe/Helsinki offset difference");
-
-        final Label containsLabel = new Label("n/a");
-        containsLabel.setCaption("Browser could be in Helsinki");
-
-        final Button update = new Button("Get TimeZone from browser",
-                new Button.ClickListener() {
-
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        TimeZone hkiTZ = TimeZone
-                                .getTimeZone("Europe/Helsinki");
-                        int hkiOffset = hkiTZ.getOffset(new Date().getTime());
-
-                        int browserOffset = getBrowser().getTimezoneOffset();
-                        int browserRawOffset = getBrowser()
-                                .getRawTimezoneOffset();
-                        String[] tzs = TimeZone
-                                .getAvailableIDs(browserRawOffset);
-
-                        boolean contains = Arrays.asList(tzs).contains(
-                                hkiTZ.getID());
-
-                        offsetLabel.setValue(String.valueOf(browserOffset));
-
-                        rawOffsetLabel.setValue(String
-                                .valueOf(browserRawOffset));
-
-                        diffLabel.setValue(String.valueOf(browserOffset
-                                - hkiOffset));
-
-                        containsLabel.setValue(contains ? "Yes" : "No");
-
-                        dstDiffLabel.setValue(String.valueOf(getBrowser()
-                                .getDSTSavings()));
-
-                        dstInEffectLabel
-                                .setValue(getBrowser().isDSTInEffect() ? "Yes"
-                                        : "No");
-
-                        curDateLabel.setValue(getBrowser().getCurrentDate()
-                                .toString());
-
-                    }
-                });
-
-        addComponent(update);
-        addComponent(offsetLabel);
-        addComponent(rawOffsetLabel);
-        addComponent(dstDiffLabel);
-        addComponent(dstInEffectLabel);
-        addComponent(curDateLabel);
-        addComponent(diffLabel);
-        addComponent(containsLabel);
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Verifies that browser TimeZone offset works - should be same as server in our case (NOTE assumes server+browser in same TZ)";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 6691;
-    }
-
-}
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserTimeZone.java b/uitest/src/com/vaadin/tests/application/WebBrowserTimeZone.java
new file mode 100644 (file)
index 0000000..5253b0b
--- /dev/null
@@ -0,0 +1,71 @@
+package com.vaadin.tests.application;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.TimeZone;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.testbench.annotations.RunLocally;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Label;
+
+@RunLocally
+public class WebBrowserTimeZone extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        final Label offsetLabel = addLabel("Browser offset");
+        final Label rawOffsetLabel = addLabel("Browser raw offset");
+        final Label dstDiffLabel = addLabel("Difference between raw offset and DST");
+        final Label dstInEffectLabel = addLabel("Is DST currently active?");
+        final Label curDateLabel = addLabel("Current date in the browser");
+        final Label diffLabel = addLabel("Browser to Europe/Helsinki offset difference");
+        final Label containsLabel = addLabel("Browser could be in Helsinki");
+
+        addButton("Get TimeZone from browser", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                TimeZone hkiTZ = TimeZone.getTimeZone("Europe/Helsinki");
+                int hkiOffset = hkiTZ.getOffset(new Date().getTime());
+
+                int browserOffset = getBrowser().getTimezoneOffset();
+                int browserRawOffset = getBrowser().getRawTimezoneOffset();
+                String[] tzs = TimeZone.getAvailableIDs(browserRawOffset);
+
+                boolean contains = Arrays.asList(tzs).contains(hkiTZ.getID());
+
+                offsetLabel.setValue(String.valueOf(browserOffset));
+                rawOffsetLabel.setValue(String.valueOf(browserRawOffset));
+                diffLabel.setValue(String.valueOf(browserOffset - hkiOffset));
+                containsLabel.setValue(contains ? "Yes" : "No");
+                dstDiffLabel.setValue(String.valueOf(getBrowser()
+                        .getDSTSavings()));
+                dstInEffectLabel.setValue(getBrowser().isDSTInEffect() ? "Yes"
+                        : "No");
+                curDateLabel.setValue(getBrowser().getCurrentDate().toString());
+            }
+        });
+    }
+
+    private Label addLabel(String caption) {
+        final Label label = new Label("n/a");
+        label.setCaption(caption);
+        addComponent(label);
+        return label;
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Verifies that browser TimeZone offset works - should be same as server in our case (NOTE assumes server+browser in same TZ)";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 6691;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserTimeZoneTest.java b/uitest/src/com/vaadin/tests/application/WebBrowserTimeZoneTest.java
new file mode 100644 (file)
index 0000000..10b6dfb
--- /dev/null
@@ -0,0 +1,27 @@
+package com.vaadin.tests.application;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class WebBrowserTimeZoneTest extends MultiBrowserTest {
+    @Test
+    public void testBrowserTimeZoneInfo() throws Exception {
+        openTestURL();
+        $(ButtonElement.class).first().click();
+        assertLabelText("Browser raw offset", "7200000");
+        assertLabelText("Browser to Europe/Helsinki offset difference", "0");
+        assertLabelText("Browser could be in Helsinki", "Yes");
+    }
+
+    private void assertLabelText(String caption, String expected) {
+        String actual = $(LabelElement.class).caption(caption).first()
+                .getText();
+        Assert.assertEquals(
+                String.format("Unexpected text in label '%s',", caption),
+                expected, actual);
+    }
+}
diff --git a/uitest/tb2/com/vaadin/tests/application/RefreshFragmentChange.html b/uitest/tb2/com/vaadin/tests/application/RefreshFragmentChange.html
deleted file mode 100644 (file)
index 147e67f..0000000
+++ /dev/null
@@ -1,37 +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.application.RefreshStatePreserve?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationRefreshStatePreserve::PID_SLog_row_0</td>
-       <td>1. Initial fragment: null</td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.application.RefreshStatePreserve#asdf</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationRefreshStatePreserve::PID_SLog_row_0</td>
-       <td>2. Fragment changed to asdf</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserve.html b/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserve.html
deleted file mode 100644 (file)
index ea8c0c9..0000000
+++ /dev/null
@@ -1,51 +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.application.RefreshStatePreserve?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationRefreshStatePreserve::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[1]</td>
-       <td>UI id: 0</td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.application.RefreshStatePreserve</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationRefreshStatePreserve::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[1]</td>
-       <td>UI id: 0</td>
-</tr>
-<tr>
-       <td>runScript</td>
-       <td>history.back()</td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td></td>
-       <td>1000</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationRefreshStatePreserve::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[1]</td>
-       <td>UI id: 0</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserveTitle.html b/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserveTitle.html
deleted file mode 100644 (file)
index f366054..0000000
+++ /dev/null
@@ -1,36 +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="http://localhost:8888/run/com.vaadin.tests.application.RefreshStatePreserveTitle?restartApplication" />
-<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.application.RefreshStatePreserveTitle?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertTitle</td>
-       <td>TEST</td>
-       <td></td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.application.RefreshStatePreserveTitle</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertTitle</td>
-       <td>TEST</td>
-       <td></td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/tb2/com/vaadin/tests/application/TerminalErrorNotification.html b/uitest/tb2/com/vaadin/tests/application/TerminalErrorNotification.html
deleted file mode 100644 (file)
index e7d437e..0000000
+++ /dev/null
@@ -1,36 +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>TabSheetWithDisappearingContent</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">TabSheetWithDisappearingContent</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.application.TerminalErrorNotification?restartApplication&amp;debug</td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestsapplicationTerminalErrorNotification::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertElementPresent</td>
-       <td>vaadin=runcomvaadintestsapplicationTerminalErrorNotification::Root/VNotification[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationTerminalErrorNotification::Root/VNotification[0]/HTML[0]/domChild[1]</td>
-       <td>Got an exception: You asked for it</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/tb2/com/vaadin/tests/application/ThreadLocalInstances.html b/uitest/tb2/com/vaadin/tests/application/ThreadLocalInstances.html
deleted file mode 100644 (file)
index 0d3a746..0000000
+++ /dev/null
@@ -1,111 +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.application.ThreadLocalInstances?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementHeight</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::/VVerticalLayout[0]/ChildComponentContainer[1]/VEmbedded[0]/domChild[0]</td>
-       <td>11</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_15</td>
-       <td>1. some app in class init</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_14</td>
-       <td>2. null root in class init</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_13</td>
-       <td>3. some app in app constructor</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_12</td>
-       <td>4. null root in app constructor</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_11</td>
-       <td>5. some app in app init</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_10</td>
-       <td>6. null root in app init</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_9</td>
-       <td>7. some app in root init</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_8</td>
-       <td>8. this root in root init</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_7</td>
-       <td>9. some app in root paint</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_6</td>
-       <td>10. this root in root paint</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_5</td>
-       <td>11. some app in background thread</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_4</td>
-       <td>12. this root in background thread</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_3</td>
-       <td>13. some app in resource handler</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_2</td>
-       <td>14. this root in resource handler</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_1</td>
-       <td>15. some app in button listener</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationThreadLocalInstances::PID_SLog_row_0</td>
-       <td>16. this root in button listener</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/tb2/com/vaadin/tests/application/WebBrowserSizeTest.html b/uitest/tb2/com/vaadin/tests/application/WebBrowserSizeTest.html
deleted file mode 100644 (file)
index 3c59c7a..0000000
+++ /dev/null
@@ -1,31 +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.application.WebBrowserSizeTest?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestsapplicationWebBrowserSizeTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>size</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/uitest/tb2/com/vaadin/tests/application/WebBrowserTest.html b/uitest/tb2/com/vaadin/tests/application/WebBrowserTest.html
deleted file mode 100644 (file)
index f04dd56..0000000
+++ /dev/null
@@ -1,44 +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.application.WebBrowserTest?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<!-- Raw offset -->
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td>
-       <td>7200000</td>
-</tr>
-<!-- offset to Helsinki -->
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[6]/VLabel[0]</td>
-       <td>0</td>
-</tr>
-<!-- in Helsinki? -->
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VLabel[0]</td>
-       <td>Yes</td>
-</tr>
-</tbody></table>
-</body>
-</html>