Test fixes & split failsafe integration test runs into smaller batches (#12103)

4 files changed, 92 insertions, 4 deletions

diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index cd5eb5d17e..c822901b1f 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -136,10 +136,6 @@ public abstract class AbstractTB3Test extends ParallelTest {
         int h = SCREENSHOT_HEIGHT;
 
         try {
-            if (BrowserUtil.isChrome(getDesiredCapabilities())) {
-                // Chrome 85 keeps failing in this task...
-                sleep(200);
-            }
             testBench().resizeViewPortTo(w, h);
         } catch (UnsupportedOperationException e) {
             // Opera does not support this...
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsComponentsGridOnly.java b/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsComponentsGridOnly.java
new file mode 100644
index 0000000000..9c071401f6
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsComponentsGridOnly.java
@@ -0,0 +1,30 @@
+package com.vaadin.tests.tb3;
+
+import java.io.IOException;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.model.InitializationError;
+
+import com.vaadin.tests.tb3.LimitedTB3TestsComponentsGridOnly.LimitedTB3TestsComponentsGridOnlySuite;
+
+/**
+ * Test consisting of all TB3 tests within package
+ * com.vaadin.tests.components.grid (classes extending AbstractTB3Test).
+ *
+ * @author Vaadin Ltd
+ */
+@RunWith(LimitedTB3TestsComponentsGridOnlySuite.class)
+public class LimitedTB3TestsComponentsGridOnly {
+
+    public static class LimitedTB3TestsComponentsGridOnlySuite
+            extends TB3TestSuite {
+
+        public LimitedTB3TestsComponentsGridOnlySuite(Class<?> klass)
+                throws InitializationError, IOException {
+            super(klass, AbstractTB3Test.class,
+                    "com.vaadin.tests.components.grid", new String[] {});
+        }
+
+    }
+
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsComponentsNoGrid.java b/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsComponentsNoGrid.java
new file mode 100644
index 0000000000..e719c5ea03
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsComponentsNoGrid.java
@@ -0,0 +1,31 @@
+package com.vaadin.tests.tb3;
+
+import java.io.IOException;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.model.InitializationError;
+
+import com.vaadin.tests.tb3.LimitedTB3TestsComponentsNoGrid.LimitedTB3TestsComponentsNoGridSuite;
+
+/**
+ * Test consisting of all TB3 tests within package com.vaadin.tests.components
+ * except those within package com.vaadin.tests.components.grid (classes
+ * extending AbstractTB3Test).
+ *
+ * @author Vaadin Ltd
+ */
+@RunWith(LimitedTB3TestsComponentsNoGridSuite.class)
+public class LimitedTB3TestsComponentsNoGrid {
+
+    public static class LimitedTB3TestsComponentsNoGridSuite
+            extends TB3TestSuite {
+
+        public LimitedTB3TestsComponentsNoGridSuite(Class<?> klass)
+                throws InitializationError, IOException {
+            super(klass, AbstractTB3Test.class, "com.vaadin.tests.components",
+                    new String[] { "com.vaadin.tests.components.grid" });
+        }
+
+    }
+
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsNonComponent.java b/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsNonComponent.java
new file mode 100644
index 0000000000..2537389354
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/LimitedTB3TestsNonComponent.java
@@ -0,0 +1,31 @@
+package com.vaadin.tests.tb3;
+
+import java.io.IOException;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.model.InitializationError;
+
+import com.vaadin.tests.tb3.LimitedTB3TestsNonComponent.LimitedTB3TestsNonComponentSuite;
+
+/**
+ * Test consisting of all TB3 tests except integration tests and component tests
+ * (classes extending AbstractTB3Test, excludes packages
+ * com.vaadin.test.integration and com.vaadin.tests.components).
+ *
+ * @author Vaadin Ltd
+ */
+@RunWith(LimitedTB3TestsNonComponentSuite.class)
+public class LimitedTB3TestsNonComponent {
+
+    public static class LimitedTB3TestsNonComponentSuite extends TB3TestSuite {
+
+        public LimitedTB3TestsNonComponentSuite(Class<?> klass)
+                throws InitializationError, IOException {
+            super(klass, AbstractTB3Test.class, "com.vaadin.tests",
+                    new String[] { "com.vaadin.tests.integration",
+                            "com.vaadin.tests.components" });
+        }
+
+    }
+
+}