Test tweaks (#12169) (#12174)

- Divided HeaderFooterClickLeftRightMiddleTest tests to separate methods
based on click type
- Updated screenshot

diff --git a/uitest/reference-screenshots/chrome/AccordionClipsContentTest-testAccordionClipsContent_ANY_Chrome__button-clicked.png b/uitest/reference-screenshots/chrome/AccordionClipsContentTest-testAccordionClipsContent_ANY_Chrome__button-clicked.png
index 9071cf2cee766a40895de434d4db7c6ee18f6d48..383f50d00841cb5cb18b2972c60f85858179f1de 100755 (executable)
Binary files a/uitest/reference-screenshots/chrome/AccordionClipsContentTest-testAccordionClipsContent_ANY_Chrome__button-clicked.png and b/uitest/reference-screenshots/chrome/AccordionClipsContentTest-testAccordionClipsContent_ANY_Chrome__button-clicked.png differ

diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
index 1d7d440b2dd517f3249d6293176e7591ae797426..c449c68d88c1404053cd891063d589364a7256bd 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
@@ -16,10 +16,11 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  *
  * @author Vaadin Ltd
  */
+@SuppressWarnings("deprecation")
 public class HeaderFooterClickLeftRightMiddleTest extends MultiBrowserTest {
 
     @Test
-    public void testFooter() throws IOException {
+    public void testSingleClick() throws IOException {
         openTestURL();
 
         waitForElementPresent(By.className("v-table"));
@@ -29,25 +30,41 @@ public class HeaderFooterClickLeftRightMiddleTest extends MultiBrowserTest {
         table.getHeaderCell(0).click();
         assertAnyLogText("1. Click on header col1 using left");
 
-        table.getHeaderCell(0).contextClick();
-        assertAnyLogText("2. Click on header col1 using right");
+        table.getFooterCell(1).click();
+        assertAnyLogText("2. Click on footer col2 using left");
+    }
 
-        table.getHeaderCell(0).doubleClick();
-        assertAnyLogText("4. Double click on header col1 using left",
-                "5. Double click on header col1 using left");
+    @Test
+    public void testContextClick() {
+        openTestURL();
 
-        table.getFooterCell(1).click();
-        assertAnyLogText("5. Click on footer col2 using left",
-                "6. Click on footer col2 using left");
+        waitForElementPresent(By.className("v-table"));
+
+        TableElement table = $(TableElement.class).first();
+
+        table.getHeaderCell(0).contextClick();
+        assertAnyLogText("1. Click on header col1 using right");
 
         table.getFooterCell(1).contextClick();
-        assertAnyLogText("6. Click on footer col2 using right",
-                "7. Click on footer col2 using right");
+        assertAnyLogText("2. Click on footer col2 using right");
+    }
+
+    @Test
+    public void testDoubleClick() {
+        openTestURL();
+
+        waitForElementPresent(By.className("v-table"));
+
+        TableElement table = $(TableElement.class).first();
+
+        table.getHeaderCell(0).doubleClick();
+        assertAnyLogText("2. Double click on header col1 using left",
+                "3. Double click on header col1 using left");
 
         table.getFooterCell(1).doubleClick();
-        assertAnyLogText("8. Double click on footer col2 using left",
-                "9. Double click on footer col2 using left",
-                "10. Double click on footer col2 using left");
+        assertAnyLogText("4. Double click on footer col2 using left",
+                "5. Double click on footer col2 using left",
+                "6. Double click on footer col2 using left");
     }
 
     private void assertAnyLogText(String... texts) {