3 files changed, 124 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index e2b93ab7d2..5c2e58d3a2 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -402,9 +402,12 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                         try {
                             VaadinServletService service = (VaadinServletService) VaadinService
                                     .getCurrent();
-                            session = service
-                                    .findVaadinSession(new VaadinServletRequest(
-                                            currentRequest, service));
+                            if (service != null) {
+                                session = service
+                                        .findVaadinSession(new VaadinServletRequest(
+                                                currentRequest, service));
+                            }
+
                         } finally {
                             /*
                              * Clear some state set by findVaadinSession to
diff --git a/uitest/src/com/vaadin/tests/push/PushPath.java b/uitest/src/com/vaadin/tests/push/PushPath.java
new file mode 100644
index 0000000000..20771bd84f
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushPath.java
@@ -0,0 +1,77 @@
+/*
+ * 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.push;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+
+@Push(transport = Transport.WEBSOCKET)
+public class PushPath extends AbstractTestUI {
+
+    public static final String PUSH_PATH_LABEL_ID = "push-path-label-id";
+    public static final String PUSH_PATH_LABEL_TEXT = "Label by push";
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        // use only websockets
+        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+
+        String pushPath = request.getService().getDeploymentConfiguration()
+                .getPushPath();
+        String transport = getPushConfiguration().getTransport().name();
+        Label pushPathLabel = new Label(String.format(
+                "Waiting for push from path '%s' using %s in 3 seconds.",
+                pushPath, transport));
+        addComponent(pushPathLabel);
+
+        new PushThread().start();
+    }
+
+    public class PushThread extends Thread {
+
+        @Override
+        public void run() {
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException e) {
+            }
+            access(new Runnable() {
+
+                @Override
+                public void run() {
+                    Label pushLabel = new Label(PUSH_PATH_LABEL_TEXT);
+                    pushLabel.setId(PUSH_PATH_LABEL_ID);
+                    addComponent(pushLabel);
+                }
+            });
+
+        }
+    }
+
+    @Override
+    public Integer getTicketNumber() {
+        return 14432;
+    }
+
+    @Override
+    public String getDescription() {
+        return "Push path should be configurable since some servers can't serve both websockets and long polling from same URL.";
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushPathTest.java b/uitest/src/com/vaadin/tests/push/PushPathTest.java
new file mode 100644
index 0000000000..6357c281f6
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushPathTest.java
@@ -0,0 +1,41 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.WebsocketTest;
+
+public class PushPathTest extends WebsocketTest {
+
+    private static final int TEN_SECONDS_IN_MS = 10 * 1000;
+
+    @Test
+    public void testCustomPushPath() throws InterruptedException {
+        openTestURL();
+        sleep(TEN_SECONDS_IN_MS);
+        Assert.assertEquals(vaadinElementById(PushPath.PUSH_PATH_LABEL_ID)
+                .getText(), PushPath.PUSH_PATH_LABEL_TEXT);
+    }
+
+    @Override
+    public String getDeploymentPath() {
+        Class<?> uiClass = getUIClass();
+        return "/run-pushpath/" + uiClass.getCanonicalName();
+    }
+
+}