summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-05-04 13:13:00 +0300
committerHenri Sara <hesara@vaadin.com>2015-05-11 12:15:32 +0300
commitfed46c94da9a0dc44342577330b5316924a50e61 (patch)
treeaec0df7faa3c47070c6437179536f053b7c87d30
parentc8498b8b61f2a0c1b586250e600603f75f8aa5c1 (diff)
downloadvaadin-framework-fed46c94da9a0dc44342577330b5316924a50e61.tar.gz
vaadin-framework-fed46c94da9a0dc44342577330b5316924a50e61.zip
Convert InitialFragmentEvent test from TB2 to TB4
Change-Id: Ia3cffdb54e49bc85880f60c12c93201abb8ff3a4
-rw-r--r--uitest/src/com/vaadin/tests/components/ui/InitialFragmentEventTest.java39
-rw-r--r--uitest/tb2/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html37
2 files changed, 39 insertions, 37 deletions
diff --git a/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEventTest.java b/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
new file mode 100644
index 0000000000..f52797dd63
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
@@ -0,0 +1,39 @@
+/*
+ * 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.ui;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class InitialFragmentEventTest extends MultiBrowserTest {
+
+ @Test
+ public void testChangeFragmentOnServerToMatchClient() {
+ openTestURL("#foo");
+
+ assertEquals("Log should not contain any text initially", " ",
+ getLogRow(0));
+
+ $(ButtonElement.class).caption("Set fragment to 'foo'").first().click();
+
+ assertEquals("Log should not contain any text after clicking button",
+ " ", getLogRow(0));
+ }
+}
diff --git a/uitest/tb2/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html b/uitest/tb2/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html
deleted file mode 100644
index 8276f0fd89..0000000000
--- a/uitest/tb2/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html
+++ /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="http://arturwin.office.itmill.com:9999/" />
-<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.InitialFragmentEvent?restartApplication#foo</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsuiInitialFragmentEvent::PID_SLog_row_0</td>
- <td></td>
-</tr>
-<!--Changing the fragment to the initial fragment should not cause an event-->
-<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestscomponentsuiInitialFragmentEvent::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsuiInitialFragmentEvent::PID_SLog_row_0</td>
- <td></td>
-</tr>
-</tbody></table>
-</body>
-</html>