diff options
| author | Artur Signell <artur@vaadin.com> | 2013-08-19 17:31:46 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-08-19 17:31:46 +0300 |
| commit | 633e0201cd2a79893d043c77b15062342cfe46e0 (patch) | |
| tree | 19fafa44c16a391e182413609b8ba7cb1f568eab /uitest/src/com/vaadin/tests/components/table | |
| parent | 7ca0ced36217a0783b25c59b58ba31fd5dae1e28 (diff) | |
| parent | 8ba41172216a98a45f82319d9a98d04a26efa52a (diff) | |
| download | vaadin-framework-633e0201cd2a79893d043c77b15062342cfe46e0.tar.gz vaadin-framework-633e0201cd2a79893d043c77b15062342cfe46e0.zip | |
Merge changes from origin/7.1
16d17f9 Fix native scrolling regression in iOS 6 homescreen apps (#12295)
7212e02 Fix race in VaadinService.lockSession() (#12282)
2d5a107 Update "lastRequestedFirstvisible" field value right away (#10666).
325cdf9 Disable failing calendar Actions Menu Test (#12181)
8ba4117 Split UiAccess test (#12332)
Change-Id: I30e7aaacaf0ecbdc1a6dbdf956a6e48f4846de32
Diffstat (limited to 'uitest/src/com/vaadin/tests/components/table')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.html | 43 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java | 112 |
2 files changed, 155 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.html b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.html new file mode 100644 index 0000000000..904f3b0470 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.html @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8888/" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> + +<tr> + <td>open</td> + <td>run/com.vaadin.tests.components.table.SetCurrentPageFirstItemIndex?restartApplication</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableSetCurrentPageFirstItemIndex::/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableSetCurrentPageFirstItemIndex::/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableSetCurrentPageFirstItemIndex::/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td> + <td>6</td> +</tr> + +</tbody></table> +</body> +</html>
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java new file mode 100644 index 0000000000..574f1d1862 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java @@ -0,0 +1,112 @@ +/* + * Copyright 2000-2013 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.table; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Table; +import com.vaadin.ui.Table.ColumnGenerator; +import com.vaadin.ui.Table.ColumnHeaderMode; +import com.vaadin.ui.VerticalLayout; + +/** + * + * @since + * @author Vaadin Ltd + */ +public class SetCurrentPageFirstItemIndex extends AbstractTestUI { + + private int index = 5; + + /* + * (non-Javadoc) + * + * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server. + * VaadinRequest) + */ + @Override + protected void setup(VaadinRequest request) { + VerticalLayout vl = new VerticalLayout(); + setContent(vl); + + final Table imageTable = new Table(); + vl.addComponent(imageTable); + + imageTable.setColumnHeaderMode(ColumnHeaderMode.HIDDEN); + imageTable.setPageLength(1); + imageTable.addGeneratedColumn("image", new ImageGenerator()); + imageTable.setWidth(500, Unit.PIXELS); + + for (int i = 1; i <= 25; i++) { + imageTable.addItem(new Integer(i)); + } + + imageTable.setCurrentPageFirstItemIndex(index); + + vl.addComponent(new Button("Click", new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + try { + Thread.sleep(500); + } catch (InterruptedException e) { + } + if (index != 5) { + index = 5; + imageTable.setCurrentPageFirstItemIndex(index); + } else { + index = 20; + imageTable.setCurrentPageFirstItemIndex(index); + } + } + })); + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription() + */ + @Override + protected String getTestDescription() { + return "Field lastRequestedFirstvisible should be updated out of timer."; + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber() + */ + @Override + protected Integer getTicketNumber() { + return 10666; + } + + public class ImageGenerator implements ColumnGenerator { + + @Override + public Object generateCell(Table source, Object itemId, Object columnId) { + return "" + itemId; + } + } + +} |