diff options
| author | Marc Englund <marc@vaadin.com> | 2012-10-15 12:32:31 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-15 12:32:31 +0000 |
| commit | f04b6cbe134d3f1f66c885cd8ad9febef300a31c (patch) | |
| tree | 8eca7e4b0a37592e3a25fdd61235700ae18be7e7 /uitest | |
| parent | 754cf6a33685507cc3a7d5afeb761f227df66fb8 (diff) | |
| parent | 20c21ac90633b05061c81aadcbbd6d7aa1b938ce (diff) | |
| download | vaadin-framework-f04b6cbe134d3f1f66c885cd8ad9febef300a31c.tar.gz vaadin-framework-f04b6cbe134d3f1f66c885cd8ad9febef300a31c.zip | |
Merge "Fixed primary stylename handling in Form #9904"
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.html | 87 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.java | 47 |
2 files changed, 134 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.html b/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.html new file mode 100644 index 0000000000..a4b738a36d --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.html @@ -0,0 +1,87 @@ +<?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.form.FormPrimaryStyleName?restartApplication</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]</td> + <td>v-form</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]</td> + <td>my-form</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[1]</td> + <td>my-form-description</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[2]</td> + <td>my-form-content</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[3]</td> + <td>my-form-errormessage</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[4]</td> + <td>my-form-footer</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]</td> + <td>my-form</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]</td> + <td>my-second-form</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[1]</td> + <td>my-second-form-description</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[2]</td> + <td>my-second-form-content</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[3]</td> + <td>my-second-form-errormessage</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsformFormPrimaryStyleName::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VForm[0]/domChild[0]/domChild[4]</td> + <td>my-second-form-footer</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.java b/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.java new file mode 100644 index 0000000000..241c39d449 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.java @@ -0,0 +1,47 @@ +package com.vaadin.tests.components.form; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Form; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.TextField; + +public class FormPrimaryStyleName extends TestBase { + + @Override + protected void setup() { + final Form form = new Form(); + form.addField("aaa", new TextField()); + form.setDescription("This is a form description"); + form.setCaption("This is a form caption"); + form.setPrimaryStyleName("my-form"); + + HorizontalLayout formFooter = new HorizontalLayout(); + formFooter.addComponent(new Label("Form footer")); + form.setFooter(formFooter); + + addComponent(form); + + addComponent(new Button("Set primary stylename", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + form.setPrimaryStyleName("my-second-form"); + } + })); + + } + + @Override + protected String getDescription() { + return "Form should handle primary stylenames both initially and dynamically"; + } + + @Override + protected Integer getTicketNumber() { + return 9904; + } + +} |