Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prevent scrolling when expanding a TreeTable item (#18247)
Change-Id: I837ee83a75337eef4338e7206cdd0e366b24f183
- Loading branch information
Mika Murtojarvi
authored and
Vaadin Code Review
committed
Aug 6, 2015
1 parent
55dc0ad
commit 961f108
Showing
3 changed files
with
106 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
uitest/src/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* | ||
* Copyright 2000-2014 Vaadin Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package com.vaadin.tests.components.treetable; | ||
|
||
import com.vaadin.server.VaadinRequest; | ||
import com.vaadin.tests.components.AbstractTestUI; | ||
import com.vaadin.ui.TreeTable; | ||
|
||
public class TreeTableScrollOnExpand extends AbstractTestUI { | ||
|
||
@Override | ||
protected void setup(VaadinRequest request) { | ||
TreeTable t = new TreeTable(); | ||
t.setSelectable(true); | ||
t.setImmediate(true); | ||
t.setSizeFull(); | ||
t.addContainerProperty("Name", String.class, "null"); | ||
for (int i = 1; i <= 100; i++) { | ||
String parentID = "Item " + i; | ||
Object parent = t.addItem(new Object[] { parentID }, parentID); | ||
String childID = "Item " + (100 + i); | ||
Object child = t.addItem(new Object[] { childID }, childID); | ||
t.getContainerDataSource().setParent(childID, parentID); | ||
} | ||
addComponent(t); | ||
} | ||
|
||
@Override | ||
public Integer getTicketNumber() { | ||
return 18247; | ||
} | ||
|
||
@Override | ||
public String getTestDescription() { | ||
return "After selecting an item and scrolling it out of view, TreeTable should not scroll to the " | ||
+ "selected item when expanding an item."; | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
uitest/src/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Copyright 2000-2014 Vaadin Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package com.vaadin.tests.components.treetable; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
|
||
import java.io.IOException; | ||
|
||
import org.junit.Test; | ||
import org.openqa.selenium.By; | ||
import org.openqa.selenium.WebElement; | ||
|
||
import com.vaadin.testbench.elements.TreeTableElement; | ||
import com.vaadin.tests.tb3.MultiBrowserTest; | ||
|
||
public class TreeTableScrollOnExpandTest extends MultiBrowserTest { | ||
|
||
@Test | ||
public void testScrollOnExpand() throws InterruptedException, IOException { | ||
openTestURL(); | ||
TreeTableElement tt = $(TreeTableElement.class).first(); | ||
tt.getRow(0).click(); | ||
tt.scroll(300); | ||
sleep(1000); | ||
tt.getRow(20).toggleExpanded(); | ||
// Need to wait a bit to avoid accepting the case where the TreeTable is | ||
// in the desired state only for a short while. | ||
sleep(1000); | ||
WebElement focusedRow = getDriver().findElement( | ||
By.className("v-table-focus")); | ||
assertEquals("Item 21", focusedRow.getText()); | ||
} | ||
} |