Convert old theme test to new MultiBrowserThemeTest

Change-Id: Ia99fc3d9474d7cd63402b01e3784ffea7f05a760
vaadin · Sep 3, 2015 · 054cff0 · 054cff0
1 parent bbe811e
commit 054cff0
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 160 deletions.
diff --git a/uitest/src/com/vaadin/tests/components/uitest/BaseThemeTest.java b/uitest/src/com/vaadin/tests/components/uitest/BaseThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ChameleonThemeTest.java b/uitest/src/com/vaadin/tests/components/uitest/ChameleonThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/LiferayThemeTest.java b/uitest/src/com/vaadin/tests/components/uitest/LiferayThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ReindeerThemeTest.java b/uitest/src/com/vaadin/tests/components/uitest/ReindeerThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/RunoThemeTest.java b/uitest/src/com/vaadin/tests/components/uitest/RunoThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/com/vaadin/tests/components/uitest/ThemeTest.java
@@ -13,11 +13,11 @@
 import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 import com.vaadin.testbench.parallel.BrowserUtil;
-import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.MultiBrowserThemeTest;
 import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
 import com.vaadin.tests.tb3.newelements.WindowElement;
 
-public abstract class ThemeTest extends MultiBrowserTest {
+public class ThemeTest extends MultiBrowserThemeTest {
 
     @ServerClass("com.vaadin.ui.DateField")
     public static class DateFieldElement extends
@@ -51,15 +51,9 @@ protected Class<?> getUIClass() {
         return ThemeTestUI.class;
     }
 
-    protected abstract String getTheme();
-
     @Test
     public void testTheme() throws Exception {
-        openTestURL("theme=" + getTheme());
+        openTestURL();
-        runThemeTest();
-    }
-
-    private void runThemeTest() throws IOException {
         TabSheetElement themeTabSheet = $(TabSheetElement.class).first();
 
         // Labels tab
@@ -161,12 +155,26 @@ protected void testWindow(int id, String identifier) throws IOException {
     }
 
     private void testTables() throws IOException {
+
         compareScreen("tables");
-        TableElement table = $(TableElement.class).first();
+        final TableElement table = $(TableElement.class).first();
-        new Actions(driver).moveToElement(table.getCell(0, 1), 5, 5)
+        if (!BrowserUtil.isPhantomJS(getDesiredCapabilities())) {
-                .contextClick().perform();
+            // Context click does not work in phantom js
-        compareScreen("tables-contextmenu");
+            new Actions(driver).moveToElement(table.getCell(0, 1), 5, 5)
-        table.findElement(By.className("v-table-column-selector")).click();
+                    .contextClick().perform();
+            compareScreen("tables-contextmenu");
+
+            // Close context menu before opening collapsemenu
+            // (https://dev.vaadin.com/ticket/18770)
+            WebElement cm = findElement(By.className("v-contextmenu"));
+            cm.findElement(By.xpath("//div[text()='Save']")).click();
+        }
+
+        WebElement columnSelector = table.findElement(By
+                .className("v-table-column-selector"));
+        new Actions(driver).moveToElement(columnSelector, 5, 5).click()
+                .perform();
+
         compareScreen("tables-collapsemenu");
     }
 

diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserThemeTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
@@ -39,6 +39,10 @@ public void setTheme(String theme) {
         this.theme = theme;
     }
 
+    protected String getTheme() {
+        return theme;
+    }
+
     @Parameters
     public static Collection<String> getThemes() {
         return Arrays.asList(new String[] { "valo", "reindeer", "runo",