Add missing TestCategory annotations (#13334)

Change-Id: Iebae8ebe7fae01f886440b4f31e3a916c352baa8

6 files changed, 26 insertions, 28 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/GridAddRowTest.java b/uitest/src/com/vaadin/tests/components/grid/GridAddRowTest.java
index 314c0d5566..46f085686d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridAddRowTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridAddRowTest.java
@@ -20,8 +20,10 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.tests.annotations.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
+@TestCategory("grid")
 public class GridAddRowTest extends MultiBrowserTest {
     @Test
     public void testAddRow() {
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java b/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java
index 2e062f36c6..05f6b4b9f7 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java
@@ -15,31 +15,23 @@
  */
 package com.vaadin.tests.components.grid;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-
-import org.junit.Ignore;
+import org.junit.Assert;
 import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.annotations.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 @TestCategory("grid")
 public class GridSingleColumnTest extends MultiBrowserTest {
 
-    /*
-     * TODO unignore once column header captions are reimplemented
-     */
     @Test
-    @Ignore
     public void headerIsVisible() {
         openTestURL();
 
-        WebElement header = getDriver().findElement(
-                By.className("v-grid-header"));
-        WebElement cell = header.findElement(By.className("v-grid-cell"));
-        assertThat(cell.getText(), is("Header"));
+        GridCellElement cell = $(GridElement.class).first().getHeaderCell(0, 0);
+        Assert.assertTrue("No header available", cell.getText()
+                .equalsIgnoreCase("header"));
     }
 }
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWithoutRendererTest.java b/uitest/src/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
index 43f5b73357..5d6ffbd8a7 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
@@ -22,9 +22,10 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.tests.tb3.AbstractTB3Test.RunLocally;
+import com.vaadin.tests.annotations.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 
+@TestCategory("grid")
 public class GridWithoutRendererTest extends SingleBrowserTest {
 
     @Test
diff --git a/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
index 2e5fc4815e..7a6d37d089 100644
--- a/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
@@ -23,8 +23,10 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.tests.annotations.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
+@TestCategory("grid")
 public class InitialFrozenColumnsTest extends MultiBrowserTest {
     @Test
     public void testInitialFrozenColumns() {
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
index 4716cd319e..30d6541344 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
@@ -23,13 +23,14 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.tests.annotations.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
+@TestCategory("grid")
 public class GridClientDataSourcesTest extends MultiBrowserTest {
 
     @Before
@@ -43,8 +44,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
         assertCellPresent("cell 0 #0");
 
         scrollToBottom();
-        assertCellPresent("cell 99 #0");
-        assertCellNotPresent("cell 100 #0");
+        assertCellPresent("cell 199 #0");
+        assertCellNotPresent("cell 200 #0");
     }
 
     @Test
@@ -56,8 +57,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
         /* second scroll needed because of scrollsize change after scrolling */
         scrollToBottom();
 
-        assertCellPresent("cell 109 #1");
-        assertCellNotPresent("cell 110 #1");
+        assertCellPresent("cell 209 #1");
+        assertCellNotPresent("cell 210 #1");
     }
 
     @Test
@@ -86,7 +87,7 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
         assertCellPresent("cell 0 #1");
         assertCellNotPresent("cell 0 #0");
         scrollToBottom();
-        assertCellPresent("cell 109 #1");
+        assertCellPresent("cell 209 #1");
     }
 
     @Test
@@ -95,10 +96,10 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
         scrollToBottom();
 
         selectMenuPath("DataSources", "RESTish", "Push data change -10");
-        assertCellPresent("cell 89 #1");
-        assertCellNotPresent("cell 89 #0");
-        assertCellNotPresent("cell 99 #1");
-        assertCellNotPresent("cell 99 #0");
+        assertCellPresent("cell 189 #1");
+        assertCellNotPresent("cell 189 #0");
+        assertCellNotPresent("cell 199 #1");
+        assertCellNotPresent("cell 199 #0");
     }
 
     private void assertCellPresent(String content) {
@@ -122,9 +123,9 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
     }
 
     private WebElement findByXPath(String string) {
-        try {
+        if (isElementPresent(By.xpath(string))) {
             return findElement(By.xpath(string));
-        } catch (NoSuchElementException e) {
+        } else {
             return null;
         }
     }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
index c829464c12..76a146bfd2 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
@@ -80,7 +80,7 @@ public class GridClientDataSourcesWidget extends
                 public List<String[]> rows;
             }
 
-            private int size = 100;
+            private int size = 200;
             private int modCount = 0;
 
             public Result query(int firstRowIndex, int numberOfRows) {