aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-05-16 15:53:49 +0300
committerAleksi Hietanen <aleksi@vaadin.com>2017-05-16 15:53:49 +0300
commitda773250ca4b50a2994ef07dbb0b4cf1fa9da4ac (patch)
tree819db6d8d32668efb8e23213b745843e1ded0c08 /uitest/src
parentbac4c82d5258202caa3dfde2554e726a26439adc (diff)
downloadvaadin-framework-da773250ca4b50a2994ef07dbb0b4cf1fa9da4ac.tar.gz
vaadin-framework-da773250ca4b50a2994ef07dbb0b4cf1fa9da4ac.zip
Remove unnecessary rowmode prefix from TreeGrid focus styles (#9327)
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeaturesTest.java34
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridHugeTreeNavigationTest.java8
2 files changed, 21 insertions, 21 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeaturesTest.java
index a766490017..c73418675a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeaturesTest.java
@@ -137,20 +137,20 @@ public class TreeGridBasicFeaturesTest extends MultiBrowserTest {
assertEquals(6, grid.getRowCount());
assertCellTexts(1, 0, new String[] { "1 | 0", "1 | 1", "1 | 2" });
assertTrue(
- grid.getRow(0).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(0).hasClassName("v-treegrid-row-focused"));
assertFalse(
- grid.getRow(1).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(1).hasClassName("v-treegrid-row-focused"));
// Should navigate 2 times down to "1 | 1"
new Actions(getDriver()).sendKeys(Keys.DOWN, Keys.DOWN).perform();
assertEquals(6, grid.getRowCount());
assertCellTexts(1, 0, new String[] { "1 | 0", "1 | 1", "1 | 2" });
assertFalse(
- grid.getRow(0).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(0).hasClassName("v-treegrid-row-focused"));
assertFalse(
- grid.getRow(1).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(1).hasClassName("v-treegrid-row-focused"));
assertTrue(
- grid.getRow(2).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(2).hasClassName("v-treegrid-row-focused"));
// Should expand "1 | 1" without moving focus
new Actions(getDriver()).sendKeys(Keys.RIGHT).perform();
@@ -158,14 +158,14 @@ public class TreeGridBasicFeaturesTest extends MultiBrowserTest {
assertCellTexts(2, 0,
new String[] { "1 | 1", "2 | 0", "2 | 1", "2 | 2", "1 | 2" });
assertTrue(
- grid.getRow(2).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(2).hasClassName("v-treegrid-row-focused"));
// Should collapse "1 | 1"
new Actions(getDriver()).sendKeys(Keys.LEFT).perform();
assertEquals(6, grid.getRowCount());
assertCellTexts(2, 0, new String[] { "1 | 1", "1 | 2", "0 | 1" });
assertTrue(
- grid.getRow(2).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(2).hasClassName("v-treegrid-row-focused"));
// Should navigate to "0 | 0"
new Actions(getDriver()).sendKeys(Keys.LEFT).perform();
@@ -173,21 +173,21 @@ public class TreeGridBasicFeaturesTest extends MultiBrowserTest {
assertCellTexts(0, 0,
new String[] { "0 | 0", "1 | 0", "1 | 1", "1 | 2", "0 | 1" });
assertTrue(
- grid.getRow(0).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(0).hasClassName("v-treegrid-row-focused"));
// Should collapse "0 | 0"
new Actions(getDriver()).sendKeys(Keys.LEFT).perform();
assertEquals(3, grid.getRowCount());
assertCellTexts(0, 0, new String[] { "0 | 0", "0 | 1", "0 | 2" });
assertTrue(
- grid.getRow(0).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(0).hasClassName("v-treegrid-row-focused"));
// Nothing should happen
new Actions(getDriver()).sendKeys(Keys.LEFT).perform();
assertEquals(3, grid.getRowCount());
assertCellTexts(0, 0, new String[] { "0 | 0", "0 | 1", "0 | 2" });
assertTrue(
- grid.getRow(0).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(0).hasClassName("v-treegrid-row-focused"));
assertNoErrorNotifications();
}
@@ -206,11 +206,11 @@ public class TreeGridBasicFeaturesTest extends MultiBrowserTest {
assertEquals(6, grid.getRowCount());
assertCellTexts(1, 0, new String[] { "1 | 0", "1 | 1", "1 | 2" });
assertFalse(
- grid.getRow(0).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(0).hasClassName("v-treegrid-row-focused"));
assertFalse(
- grid.getRow(1).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(1).hasClassName("v-treegrid-row-focused"));
assertTrue(
- grid.getRow(2).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(2).hasClassName("v-treegrid-row-focused"));
// Should select "1 | 1" without moving focus
new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
@@ -219,18 +219,18 @@ public class TreeGridBasicFeaturesTest extends MultiBrowserTest {
// Should move focus but not selection
new Actions(getDriver()).sendKeys(Keys.UP).perform();
assertTrue(
- grid.getRow(1).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(1).hasClassName("v-treegrid-row-focused"));
assertFalse(
- grid.getRow(2).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(2).hasClassName("v-treegrid-row-focused"));
assertFalse(grid.getRow(1).hasClassName("v-treegrid-row-selected"));
assertTrue(grid.getRow(2).hasClassName("v-treegrid-row-selected"));
// Should select "1 | 0" without moving focus
new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
assertTrue(
- grid.getRow(1).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(1).hasClassName("v-treegrid-row-focused"));
assertFalse(
- grid.getRow(2).hasClassName("v-treegrid-rowmode-row-focused"));
+ grid.getRow(2).hasClassName("v-treegrid-row-focused"));
assertTrue(grid.getRow(1).hasClassName("v-treegrid-row-selected"));
assertFalse(grid.getRow(2).hasClassName("v-treegrid-row-selected"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridHugeTreeNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridHugeTreeNavigationTest.java
index f64591df53..19e8daef2e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridHugeTreeNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treegrid/TreeGridHugeTreeNavigationTest.java
@@ -143,18 +143,18 @@ public class TreeGridHugeTreeNavigationTest extends MultiBrowserTest {
}
private WebElement findFocusedRow() {
- return grid.findElement(By.className("v-treegrid-rowmode-row-focused"));
+ return grid.findElement(By.className("v-treegrid-row-focused"));
}
private void checkRowFocused(int index) {
if (index > 0) {
assertFalse(grid.getRow(index - 1)
- .hasClassName("v-treegrid-rowmode-row-focused"));
+ .hasClassName("v-treegrid-row-focused"));
}
assertTrue(grid.getRow(index)
- .hasClassName("v-treegrid-rowmode-row-focused"));
+ .hasClassName("v-treegrid-row-focused"));
assertFalse(grid.getRow(index + 1)
- .hasClassName("v-treegrid-rowmode-row-focused"));
+ .hasClassName("v-treegrid-row-focused"));
}
private void assertCellTexts(int startRowIndex, int cellIndex,