Converted broken test to TB3

Change-Id: Ic30db7584a65c944eb45c576e12b7671399d1965

diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
index 8d04ceae71404515b99587531f6c2312375d9cce..9db2c2f0d339802bc35ddeee7fc1aad341dba22a 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
@@ -15,11 +15,16 @@
  */
 package com.vaadin.tests.components.ui;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
+import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class UIAccessTest extends MultiBrowserTest {
@@ -30,8 +35,7 @@ public class UIAccessTest extends MultiBrowserTest {
         getCurrentInstanceWhenPushingButton().click();
         waitUntil(ExpectedConditions.textToBePresentInElement(
                 vaadinLocatorById("Log_row_0"), "1."));
-        Assert.assertEquals(
-                "0. Current UI matches in beforeResponse? true",
+        Assert.assertEquals("0. Current UI matches in beforeResponse? true",
                 vaadinElementById("Log_row_1").getText());
         Assert.assertEquals(
                 "1. Current session matches in beforeResponse? true",
@@ -39,6 +43,161 @@ public class UIAccessTest extends MultiBrowserTest {
 
     }
 
+    @Test
+    public void testAccessMethod() throws Exception {
+        openTestURL();
+
+        vaadinElement(
+                "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]")
+                .click();
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                .getText()
+                .matches(
+                        "^0\\. Access from UI thread future is done[\\s\\S] false$"));
+        assertEquals(
+                "1. Access from UI thread is run",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                .getText()
+                .matches(
+                        "^2\\. beforeClientResponse future is done[\\s\\S] true$"));
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. Initial background message",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                .getText()
+                .matches("^1\\. Thread has current response[\\s\\S] false$"));
+        for (int second = 0;; second++) {
+            if (second >= 30) {
+                fail("timeout");
+            }
+            try {
+                if ("0. Initial background message"
+                        .equals(driver
+                                .findElement(
+                                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                                .getText())) {
+                    break;
+                }
+            } catch (Exception e) {
+            }
+            Thread.sleep(1000);
+        }
+
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                .getText()
+                .matches(
+                        "^2\\. Thread got lock, inital future done[\\s\\S] true$"));
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. Throwing exception in access",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                .getText().matches("^1\\. firstFuture is done[\\s\\S] true$"));
+        assertEquals(
+                "2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. future was cancled, should not start",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[4]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. Waiting for thread to start",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertEquals(
+                "1. Thread started, waiting for interruption",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                        .getText());
+        assertEquals(
+                "2. I was interrupted",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_3"))
+                .getText()
+                .matches("^0\\. accessSynchronously has request[\\s\\S] true$"));
+        assertEquals(
+                "1. Test value in accessSynchronously: Set before accessSynchronosly",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                .getText()
+                .matches(
+                        "^2\\. has request after accessSynchronously[\\s\\S] true$"));
+        assertEquals(
+                "3. Test value after accessSynchornously: Set in accessSynchronosly",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_3"))
+                .getText().matches("^0\\. access has request[\\s\\S] false$"));
+        assertEquals(
+                "1. Test value in access: Set before access",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                .getText()
+                .matches("^2\\. has request after access[\\s\\S] true$"));
+        assertEquals(
+                "3. Test value after access: Set before run pending",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+
+    }
+
     private WebElement getCurrentInstanceWhenPushingButton() {
         return vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[7]/VButton[0]");
     }

diff --git a/uitest/src/com/vaadin/tests/components/ui/UiAccess.html b/uitest/src/com/vaadin/tests/components/ui/UiAccess.html
deleted file mode 100644 (file)
index 6136916..0000000
--- a/uitest/src/com/vaadin/tests/components/ui/UiAccess.html
+++ /dev/null
@@ -1,166 +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.components.ui.UiAccess?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-       <td>exact:0. Access from UI thread future is done? false</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-       <td>1. Access from UI thread is run</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>exact:2. beforeClientResponse future is done? true</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-       <td>0. Initial background message</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>exact:1. Thread has current response? false</td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-       <td>0. Initial background message</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>exact:2. Thread got lock, inital future done? true</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-       <td>0. Throwing exception in access</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-       <td>exact:1. firstFuture is done? true</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>0. future was cancled, should not start</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[4]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-       <td>0. Waiting for thread to start</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-       <td>1. Thread started, waiting for interruption</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>2. I was interrupted</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_3</td>
-       <td>0. accessSynchronously has request? true</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-       <td>1. Test value in accessSynchronously: Set before accessSynchronosly</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-       <td>2. has request after accessSynchronously? true</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>3. Test value after accessSynchornously: Set in accessSynchronosly</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_3</td>
-       <td>0. access has request? false</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-       <td>1. Test value in access: Set before access</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-       <td>2. has request after access? true</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-       <td>3. Test value after access: Set before run pending</td>
-</tr>
-</tbody></table>
-</body>
-</html>