summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrik <patrik@vaadin.com>2015-06-22 11:03:54 +0300
committerVaadin Code Review <review@vaadin.com>2015-06-22 10:56:56 +0000
commit1ccb5290e49ec31ef3afc3f84c0061bfe83b13b6 (patch)
treed89aac9c6c456f6585209e20dd8d541002436ecd
parentca15c5bb99703d73687e2fba56d1b18f74937acc (diff)
downloadvaadin-framework-1ccb5290e49ec31ef3afc3f84c0061bfe83b13b6.tar.gz
vaadin-framework-1ccb5290e49ec31ef3afc3f84c0061bfe83b13b6.zip
Port JavaScriptResizeListenerTest from TB2 to TB4
Change-Id: I6282658c47eb0196f6158064c18a21fa4a6627dc
-rw-r--r--uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java92
-rw-r--r--uitest/tb2/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html81
2 files changed, 92 insertions, 81 deletions
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
new file mode 100644
index 0000000000..92ebc3a335
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.components.javascriptcomponent;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.AbstractJavaScriptComponentElement;
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.parallel.TestCategory;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * Re-implementation of Javascript Resize Listener TB2 Test in TB4.
+ */
+@TestCategory("javascript")
+public class JavaScriptResizeListenerTest extends MultiBrowserTest {
+
+ @Test
+ public void testResizeListener() throws InterruptedException {
+ openTestURL();
+
+ // Get handles to relevant elements in page
+ AbstractJavaScriptComponentElement jsComponent = $(
+ AbstractJavaScriptComponentElement.class).first();
+
+ ButtonElement sizeToggleButton = $(ButtonElement.class).first();
+
+ CheckBoxElement listenerToggleBox = $(CheckBoxElement.class).first();
+
+ // Make sure we're initialized correctly
+ assertEquals("Initial state", jsComponent.getText());
+
+ // Try to use the toggle button - nothing should happen
+ sizeToggleButton.click();
+ Thread.sleep(1000);
+ assertEquals("Initial state", jsComponent.getText());
+
+ // Enable the JavaScript resize listener
+ listenerToggleBox.click();
+
+ // Vaadin doesn't do a server round-trip here, which means that
+ // waitForVaadin will fail to Do The Right Thing. Instead, we'll have to
+ // wait for a bit before resuming execution
+ Thread.sleep(2500);
+
+ // The listener should change the text to reflect current component size
+ sizeToggleButton.click();
+ Thread.sleep(1000);
+ assertEquals("Current size is 100 x 100", jsComponent.getText());
+
+ // Click button to change size
+ sizeToggleButton.click();
+ Thread.sleep(1000);
+ assertEquals("Current size is 200 x 50", jsComponent.getText());
+
+ // Click it again to revert to previous state
+ sizeToggleButton.click();
+ Thread.sleep(1000);
+ assertEquals("Current size is 100 x 100", jsComponent.getText());
+
+ // Disable the listener
+ listenerToggleBox.click();
+
+ // Again, we'll need to sleep for a bit due to waitForVaadin not doing
+ // the right thing
+ Thread.sleep(2500);
+ assertEquals("Listener disabled", jsComponent.getText());
+
+ // Check that nothing happens when clicking the button again
+ sizeToggleButton.click();
+ Thread.sleep(1000);
+ assertEquals("Listener disabled", jsComponent.getText());
+
+ }
+
+}
diff --git a/uitest/tb2/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html b/uitest/tb2/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html
deleted file mode 100644
index 53af1d4ceb..0000000000
--- a/uitest/tb2/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html
+++ /dev/null
@@ -1,81 +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.javascriptcomponent.JavaScriptResizeListener?restartApplication&amp;debug</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VCssLayout[0]/JavaScriptWidget[0]</td>
- <td>Initial state</td>
-</tr>
-<!--Changing size has no effect without listener-->
-<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VCssLayout[0]/JavaScriptWidget[0]</td>
- <td>Initial state</td>
-</tr>
-<!--Reports the size when the listener is added-->
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
- <td>52,4</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VCssLayout[0]/JavaScriptWidget[0]</td>
- <td>Current size is 200 x 50</td>
-</tr>
-<!--Size change is detected when listener is active-->
-<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VCssLayout[0]/JavaScriptWidget[0]</td>
- <td>Current size is 100 x 100</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
- <td>69,2</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VCssLayout[0]/JavaScriptWidget[0]</td>
- <td>Listener disabled</td>
-</tr>
-<!--Nothing happens when changing size after removing listener-->
-<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentJavaScriptResizeListener::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VCssLayout[0]/JavaScriptWidget[0]</td>
- <td>Listener disabled</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>