From af215380ffa86960c3780fe4bc699b879c1cec68 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 3 Jun 2015 11:30:06 +0300
Subject: Reset heartbeat timestamp when reopening UI (#18101)
Change-Id: I288bae95e364277819727a99854d94fbbc98b162
---
.../application/PreserveWithExpiredHeartbeat.java | 36 +++++++++++++++
.../PreserveWithExpiredHeartbeatTest.java | 53 ++++++++++++++++++++++
2 files changed, 89 insertions(+)
create mode 100644 uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
create mode 100644 uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
(limited to 'uitest')
diff --git a/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java b/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
new file mode 100644
index 0000000000..de45d2bccb
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
@@ -0,0 +1,36 @@
+/*
+ * 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.application;
+
+import com.vaadin.annotations.PreserveOnRefresh;
+import com.vaadin.launcher.CustomDeploymentConfiguration;
+import com.vaadin.launcher.CustomDeploymentConfiguration.Conf;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+
+@PreserveOnRefresh
+@CustomDeploymentConfiguration({ @Conf(name = "heartbeatInterval", value = "5") })
+public class PreserveWithExpiredHeartbeat extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ Label label = new Label("UI with id " + getUIId() + " in session "
+ + getSession().getSession().getId());
+ label.setId("idLabel");
+ addComponent(label);
+ }
+}
diff --git a/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java b/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
new file mode 100644
index 0000000000..04dbdca31e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.application;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class PreserveWithExpiredHeartbeatTest extends SingleBrowserTest {
+ @Test
+ public void testNavigateBackAfterMissingHeartbeats()
+ throws InterruptedException {
+ final int heartbeatInterval = 5000;
+
+ openTestURL();
+ String originalId = getUiIdentification();
+
+ long startTime = System.currentTimeMillis();
+
+ while (System.currentTimeMillis() - startTime < heartbeatInterval * 3.1) {
+ // "Close" the tab
+ driver.get("about:blank");
+
+ sleep(heartbeatInterval / 2);
+
+ // "Reopen" tab
+ openTestURL();
+
+ // Verify that that we still get the same UI
+ Assert.assertEquals("Original UI has been closed", originalId,
+ getUiIdentification());
+ }
+ }
+
+ private String getUiIdentification() {
+ return $(LabelElement.class).id("idLabel").getText();
+ }
+}
--
cgit v1.2.3