summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-06-03 23:15:43 +0300
committerVaadin Code Review <review@vaadin.com>2013-06-05 12:17:10 +0000
commitb0574f7b33c4d3d437c8c11cd53389e5522f6999 (patch)
treec7cf8acae992d345fd0b274cb39d6857f5858d26 /uitest
parentedca4095d2e75d73f9d6a5acb2da9009129b4db2 (diff)
downloadvaadin-framework-b0574f7b33c4d3d437c8c11cd53389e5522f6999.tar.gz
vaadin-framework-b0574f7b33c4d3d437c8c11cd53389e5522f6999.zip
Add transport parameter to @Push (#11966)
Change-Id: Ic47e68a41ba407917a990ef82a98c1526a9510ef
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/push/BasicPushStreaming.java12
-rw-r--r--uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java8
-rw-r--r--uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html46
3 files changed, 66 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
new file mode 100644
index 0000000000..37a8afd819
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
@@ -0,0 +1,12 @@
+package com.vaadin.tests.push;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.shared.ui.ui.Transport;
+
+@Push(transport = Transport.STREAMING)
+public class BasicPushStreaming extends BasicPush {
+ @Override
+ protected void setup(com.vaadin.server.VaadinRequest request) {
+ addComponent(new PushConfigurator(this));
+ }
+}
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
new file mode 100644
index 0000000000..6fc27e8974
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
@@ -0,0 +1,8 @@
+package com.vaadin.tests.push;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.shared.ui.ui.Transport;
+
+@Push(transport = Transport.WEBSOCKET)
+public class BasicPushWebsocket extends BasicPush {
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html b/uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html
new file mode 100644
index 0000000000..854dd458bb
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html
@@ -0,0 +1,46 @@
+<?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/" />
+<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.push.BasicPushStreaming?debug&amp;restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Push connection established using streaming</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextNotPresent</td>
+ <td>Push connection established using websocket</td>
+ <td></td>
+</tr>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.push.BasicPushWebsocket?debug&amp;restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextNotPresent</td>
+ <td>Push connection established using streaming</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Push connection established using websocket</td>
+ <td></td>
+</tr>
+</tbody></table>
+</body>
+</html>