diff options
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html | 21 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html | 42 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java (renamed from uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java) | 16 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.html (renamed from uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html) | 8 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java (renamed from uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java) | 2 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customlayout/template.htm (renamed from uitest/src/com/vaadin/tests/components/customcomponent/template.htm) | 0 |
6 files changed, 58 insertions, 31 deletions
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html deleted file mode 100644 index b2806afe5c..0000000000 --- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html +++ /dev/null @@ -1,21 +0,0 @@ -<?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="" /><title>com.vaadin.tests.components.accordion.AccordionInactiveTabSize</title></head><body><table cellpadding="1" cellspacing="1" border="1"><thead><tr><td rowspan="1" colspan="3">com.vaadin.tests.components.accordion.AccordionInactiveTabSize</td></tr></thead><tbody><tr> - <td>open</td> - <td>/run/com.vaadin.tests.components.customcomponent.CustomLayoutUsingTemplate?restartApplication</td> - <td></td> -</tr> -<tr> - <td>screenCapture</td> - <td></td> - <td>initial</td> -</tr> -<tr> - <td>click</td> - <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomLayoutUsingTemplate::/VVerticalLayout[0]/VVerticalLayout[0]/VCustomLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> - <td></td> -</tr> -<tr> - <td>screenCapture</td> - <td></td> - <td>with-text-field</td> -</tr> -</tbody></table></body></html>
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html new file mode 100644 index 0000000000..78a87894c6 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html @@ -0,0 +1,42 @@ +<?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:8070/" /> +<title>CustomLayoutUsingTemplate</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">CustomLayoutUsingTemplate</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.customlayout.CustomLayoutUsingTemplate?restartApplication</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>initial</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentscustomlayoutCustomLayoutUsingTemplate::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentscustomlayoutCustomLayoutUsingTemplate::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VCustomLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>with-text-field</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java index 28e4dfb385..2e1ac21892 100644 --- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java +++ b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.components.customcomponent; +package com.vaadin.tests.components.customlayout; import java.io.IOException; import java.io.InputStream; @@ -15,6 +15,8 @@ public class CustomLayoutUsingTemplate extends TestBase implements ClickListener { CustomLayout layout; + Button button1 = new Button("Add Button to first location", this); + Button button2 = new Button("Add TextField to second location", this); @Override protected void setup() { @@ -25,11 +27,11 @@ public class CustomLayoutUsingTemplate extends TestBase implements String template = thisPackage + "template.htm"; InputStream is = getClass().getClassLoader().getResourceAsStream( template); + + addComponent(button1); + try { layout = new CustomLayout(is); - layout.addComponent(new Button( - "Click to add a TextField to second location", this), - "location1"); addComponent(layout); } catch (IOException e) { addComponent(new Label(e.getMessage())); @@ -56,6 +58,10 @@ public class CustomLayoutUsingTemplate extends TestBase implements @Override public void buttonClick(ClickEvent event) { - layout.addComponent(new TextField("A text field!"), "location2"); + if (event.getButton() == button1) { + layout.addComponent(button2, "location1"); + } else { + layout.addComponent(new TextField("A text field!"), "location2"); + } } } diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.html index 954afb2adb..7fe2e4c07c 100644 --- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html +++ b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.html @@ -1,6 +1,6 @@ <?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="" /><title>com.vaadin.tests.components.accordion.AccordionInactiveTabSize</title></head><body><table cellpadding="1" cellspacing="1" border="1"><thead><tr><td rowspan="1" colspan="3">com.vaadin.tests.components.accordion.AccordionInactiveTabSize</td></tr></thead><tbody><tr> <td>open</td> - <td>/run/com.vaadin.tests.components.customcomponent.CustomLayoutUsingTheme?restartApplication</td> + <td>/run/com.vaadin.tests.components.customlayout.CustomLayoutUsingTheme?restartApplication</td> <td></td> </tr> <tr> @@ -10,7 +10,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomLayoutUsingTheme::/VVerticalLayout[0]/VVerticalLayout[0]/VCustomLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentscustomlayoutCustomLayoutUsingTheme::/VVerticalLayout[0]/VVerticalLayout[0]/VCustomLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -20,7 +20,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomLayoutUsingTheme::/VVerticalLayout[0]/VVerticalLayout[0]/VCustomLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentscustomlayoutCustomLayoutUsingTheme::/VVerticalLayout[0]/VVerticalLayout[0]/VCustomLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -28,4 +28,4 @@ <td></td> <td>button</td> </tr> -</tbody></table></body></html>
\ No newline at end of file +</tbody></table></body></html> diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java index 06dd39ac38..db5e81febf 100644 --- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java +++ b/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.components.customcomponent; +package com.vaadin.tests.components.customlayout; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.LoremIpsum; diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/template.htm b/uitest/src/com/vaadin/tests/components/customlayout/template.htm index fa023050da..fa023050da 100644 --- a/uitest/src/com/vaadin/tests/components/customcomponent/template.htm +++ b/uitest/src/com/vaadin/tests/components/customlayout/template.htm |