Extracted test to separate class

Change-Id: Ibfad0180e93e7f74b91427761b40c86938044c50

2 files changed, 72 insertions, 55 deletions

diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java b/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
index 50dab43667..ac37e75fea 100644
--- a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
+++ b/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
@@ -1,74 +1,19 @@
 package com.vaadin.tests.push;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.UIDetachedException;
 
 public class EnableDisablePush extends AbstractTestUI {
 
-    public static class EnableDisablePushTest extends MultiBrowserTest {
-        @Test
-        public void testEnablePushWhenUsingPolling() throws Exception {
-            openTestURL();
-
-            assertEquals("1. Push enabled", getLogRow(0));
-
-            getDisablePushButton().click();
-            assertEquals("3. Push disabled", getLogRow(0));
-
-            getEnablePollButton().click();
-            assertEquals("5. Poll enabled", getLogRow(0));
-
-            getEnablePushButton().click();
-            assertEquals("7. Push enabled", getLogRow(0));
-
-            getDisablePollButton().click();
-            assertEquals("9. Poll disabled", getLogRow(0));
-
-            getDisablePushButtonAndReenableFromBackground().click();
-            Thread.sleep(2500);
-            assertEquals("16. Polling disabled, push enabled", getLogRow(0));
-
-            getDisablePushButton().click();
-            assertEquals("18. Push disabled", getLogRow(0));
-        }
-
-        private WebElement getDisablePushButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
-        }
-
-        private WebElement getEnablePushButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]");
-        }
-
-        private WebElement getDisablePollButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]");
-        }
-
-        private WebElement getEnablePollButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]");
-        }
-
-        private WebElement getDisablePushButtonAndReenableFromBackground() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
-        }
-
-    }
-
     private int c = 0;
 
     private Log log = new Log(15);
diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java b/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
new file mode 100644
index 0000000000..275b6d5b53
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2000-2013 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 static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class EnableDisablePushTest extends MultiBrowserTest {
+    @Test
+    public void testEnablePushWhenUsingPolling() throws Exception {
+        openTestURL();
+
+        assertEquals("1. Push enabled", getLogRow(0));
+
+        getDisablePushButton().click();
+        assertEquals("3. Push disabled", getLogRow(0));
+
+        getEnablePollButton().click();
+        assertEquals("5. Poll enabled", getLogRow(0));
+
+        getEnablePushButton().click();
+        assertEquals("7. Push enabled", getLogRow(0));
+
+        getDisablePollButton().click();
+        assertEquals("9. Poll disabled", getLogRow(0));
+
+        getDisablePushButtonAndReenableFromBackground().click();
+        Thread.sleep(2500);
+        assertEquals("16. Polling disabled, push enabled", getLogRow(0));
+
+        getDisablePushButton().click();
+        assertEquals("18. Push disabled", getLogRow(0));
+    }
+
+    private WebElement getDisablePushButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
+    }
+
+    private WebElement getEnablePushButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]");
+    }
+
+    private WebElement getDisablePollButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]");
+    }
+
+    private WebElement getEnablePollButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]");
+    }
+
+    private WebElement getDisablePushButtonAndReenableFromBackground() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
+    }
+
+}
\ No newline at end of file