diff options
Diffstat (limited to 'uitest/src')
3 files changed, 102 insertions, 11 deletions
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html new file mode 100644 index 0000000000..799e844e04 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html @@ -0,0 +1,27 @@ +<?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.tabsheet.TabsheetMinimalClosableTabs?restartApplication</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java new file mode 100644 index 0000000000..ebfee0adb0 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java @@ -0,0 +1,44 @@ +package com.vaadin.tests.components.tabsheet; + +import com.vaadin.server.ExternalResource; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Label; +import com.vaadin.ui.TabSheet; +import com.vaadin.ui.TabSheet.Tab; +import com.vaadin.ui.themes.Reindeer; + +public class TabsheetMinimalClosableTabs extends TestBase { + + @Override + protected void setup() { + TabSheet ts = new TabSheet(); + for (int tab = 0; tab < 5; tab++) { + String tabCaption = "Tab"; + for (int c = 0; c < tab; c++) { + tabCaption += tabCaption; + } + tabCaption += " " + tab; + + Tab t = ts.addTab(new Label("Content " + tab), tabCaption); + t.setClosable(true); + + if (tab % 2 == 0) { + t.setIcon(new ExternalResource( + "/VAADIN/themes/tests-tickets/icons/fi.gif")); + } + } + + ts.addStyleName(Reindeer.TABSHEET_MINIMAL); + addComponent(ts); + } + + @Override + protected String getDescription() { + return "Minimal theme should also show the close button in all browsers"; + } + + @Override + protected Integer getTicketNumber() { + return 10610; + } +} diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html index 499c30c86a..d9366385ce 100644 --- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html +++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html @@ -168,7 +168,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -219,7 +219,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -238,6 +238,11 @@ <td>9,-995</td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::PID_SLog_row_0</td> <td>20. Row Item TestBean [col1=40 (children), col2=AN] expanded. Row index: 39</td> @@ -288,6 +293,11 @@ <td>9,-998</td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::PID_SLog_row_0</td> <td>25. Row Item TestBean [col1=40 (children), col2=AN] collapsed. Row index: 39</td> @@ -313,6 +323,11 @@ <td>27. Button Item TestBean [col1=35, col2=AI]/col3 clicked. Row index: 34</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[42]/VNativeButton[0]</td> + <td></td> +</tr> +<tr> <td>mouseClick</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[42]/VNativeButton[0]</td> <td>98,-998</td> @@ -339,7 +354,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -388,6 +403,11 @@ <td>10,-2461</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[43]/VNativeButton[0]</td> + <td></td> +</tr> +<tr> <td>mouseClick</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[43]/VNativeButton[0]</td> <td>65,-2456</td> @@ -429,7 +449,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -484,13 +504,13 @@ <td>42. Row Item TestBean [col1=99 (children), col2=CU] collapsed. Row index: 98</td> </tr> <tr> - <td>pause</td> + <td>waitForElementPresent</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[40]/VNativeButton[0]</td> <td></td> - <td>300</td> </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[43]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[40]/VNativeButton[0]</td> <td>71,-2465</td> </tr> <tr> @@ -500,7 +520,7 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[44]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[41]/VNativeButton[0]</td> <td>81,-2459</td> </tr> <tr> @@ -510,7 +530,7 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[42]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[39]/VNativeButton[0]</td> <td>80,-2458</td> </tr> <tr> @@ -520,13 +540,13 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[30]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[28]/VNativeButton[0]</td> <td>86,-2462</td> </tr> <tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::PID_SLog_row_0</td> - <td>46. Button Item TestBean [col1=86, col2=CH]/col3 clicked. Row index: 85</td> + <td>46. Button Item TestBean [col1=87, col2=CI]/col3 clicked. Row index: 86</td> </tr> </tbody></table> </body> |