aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-05-20 13:04:53 +0300
committerVaadin Code Review <review@vaadin.com>2014-05-20 13:31:42 +0000
commitd91b0b1417f9731a1e8dc2acc93f610a2581543c (patch)
treefe9335f232805ad122a4a1e37f70037478de8db8
parent1ac972f2bb7d92604a89abf5e08e4343726fbd01 (diff)
downloadvaadin-framework-d91b0b1417f9731a1e8dc2acc93f610a2581543c.tar.gz
vaadin-framework-d91b0b1417f9731a1e8dc2acc93f610a2581543c.zip
Remove unnecessary javadoc and add TestCategory annotation to Grid tests
Change-Id: Ibc8da060e5592dfa6af7e1fc9af83dea7119b387
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/grid/GridColumnGroups.java5
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java4
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/BasicEscalatorTest.java2
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridBasicFeatures.java4
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridBasicFeaturesTest.java7
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridColumnGroups.java5
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridScrolling.java3
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java2
8 files changed, 8 insertions, 24 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnGroups.java b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnGroups.java
index 4350bf1a7b..3cc1c5f0d7 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnGroups.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnGroups.java
@@ -35,11 +35,6 @@ import com.vaadin.ui.components.grid.ColumnGroup;
import com.vaadin.ui.components.grid.ColumnGroupRow;
import com.vaadin.ui.components.grid.Grid;
-/**
- *
- * @since
- * @author Vaadin Ltd
- */
public class GridColumnGroups {
private Grid grid;
diff --git a/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java b/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java
index 61d263f433..79e1da3786 100644
--- a/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java
+++ b/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java
@@ -30,10 +30,6 @@ import com.vaadin.ui.Layout;
import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TextField;
-/**
- * @since 7.2
- * @author Vaadin Ltd
- */
@Widgetset(TestingWidgetSet.NAME)
public class BasicEscalator extends AbstractTestUI {
public static final String ESCALATOR = "escalator";
diff --git a/uitest/src/com/vaadin/tests/components/grid/BasicEscalatorTest.java b/uitest/src/com/vaadin/tests/components/grid/BasicEscalatorTest.java
index bd1a580c73..3cb4d83063 100644
--- a/uitest/src/com/vaadin/tests/components/grid/BasicEscalatorTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/BasicEscalatorTest.java
@@ -26,8 +26,10 @@ import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
+import com.vaadin.tests.annotations.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+@TestCategory("grid")
public class BasicEscalatorTest extends MultiBrowserTest {
@Test
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridBasicFeatures.java b/uitest/src/com/vaadin/tests/components/grid/GridBasicFeatures.java
index 0faabff88a..9aafaa4f1b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridBasicFeatures.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridBasicFeatures.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.components.grid.GridColumn;
/**
* Tests the basic features like columns, footers and headers
*
- * @since 7.2
+ * @since 7.4
* @author Vaadin Ltd
*/
public class GridBasicFeatures extends AbstractComponentTest<Grid> {
@@ -334,7 +334,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
}, null);
}
- @SuppressWarnings("boxing")
+ @SuppressWarnings("boxing")
protected void addHeightByRowActions() {
createCategory("Height by Rows", "Size");
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridBasicFeaturesTest.java b/uitest/src/com/vaadin/tests/components/grid/GridBasicFeaturesTest.java
index 73bef67c32..0f4a899750 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridBasicFeaturesTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridBasicFeaturesTest.java
@@ -30,13 +30,10 @@ 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;
-/**
- *
- * @since
- * @author Vaadin Ltd
- */
+@TestCategory("grid")
public class GridBasicFeaturesTest extends MultiBrowserTest {
@Test
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnGroups.java b/uitest/src/com/vaadin/tests/components/grid/GridColumnGroups.java
index 66e7651f76..423e521939 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnGroups.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridColumnGroups.java
@@ -27,11 +27,6 @@ import com.vaadin.ui.components.grid.ColumnGroupRow;
import com.vaadin.ui.components.grid.Grid;
import com.vaadin.ui.components.grid.GridColumn;
-/**
- *
- * @since
- * @author Vaadin Ltd
- */
public class GridColumnGroups extends AbstractTestUI {
private final int COLUMNS = 4;
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridScrolling.java b/uitest/src/com/vaadin/tests/components/grid/GridScrolling.java
index d514fbd0c5..bf46851fe0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridScrolling.java
@@ -27,9 +27,6 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.components.grid.Grid;
-/**
- *
- */
@SuppressWarnings("serial")
public class GridScrolling extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java b/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java
index 9c1ec88df7..8e81ed3e05 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java
@@ -22,8 +22,10 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
+import com.vaadin.tests.annotations.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+@TestCategory("grid")
public class GridSingleColumnTest extends MultiBrowserTest {
@Test